Allow retiring a DRAFT version directly; block only re-retiring so the audit trail stays intact

Author: shivasaidonthulapal

Java/validation/src/main/java/com/lantanagroup/link/validation/controllers/RubricController.java

@@ -241,11 +241,11 @@ public ResponseEntity<ApiResponse<RubricVersionSummaryDto>> publish(
                 RubricVersionSummaryDto.from(version, objectMapper)));
     }
 
-    @Operation(summary = "Mark a PUBLISHED version RETIRED (the only legal transition into RETIRED)")
+    @Operation(summary = "Mark a version RETIRED. Both DRAFT (abandon without publishing) and PUBLISHED versions can be retired")
     @ApiResponses({
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200"),
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404"),
-            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "409", description = "Version is already retired, or still a draft")
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "409", description = "Version is already retired")
     })
     @PostMapping("/{rubricId}/versions/{semver}/$retire")
     public ResponseEntity<ApiResponse<RubricVersionSummaryDto>> retire(

Java/validation/src/main/java/com/lantanagroup/link/validation/services/RubricRegistryService.java

@@ -180,9 +180,11 @@ public RubricVersion publish(String rubricId, String semver, String publishedBy)
     public RubricVersion retire(String rubricId, String semver, String retiredBy) {
         RubricVersion v = rubricVersionRepository.findByRubricIdAndSemver(rubricId, semver)
                 .orElseThrow(() -> new RubricVersionNotFoundException(rubricId, semver));
-//        if (v.getStatus() != RubricVersionStatus.PUBLISHED) {
-//            throw new RubricLifecycleException(rubricId, semver, v.getStatus(), "retire");
-//        }
+        // drafts can be retired directly (abandoned without ever publishing), only
+        // re-retiring is blocked so retiredAt/retiredBy and the audit trail stay intact
+        if (v.getStatus() == RubricVersionStatus.RETIRED) {
+            throw new RubricLifecycleException(rubricId, semver, v.getStatus(), "retire");
+        }
         v.setStatus(RubricVersionStatus.RETIRED);
         v.setRetiredAt(OffsetDateTime.now());
         v.setRetiredBy(retiredBy);

Java/validation/src/test/java/com/lantanagroup/link/validation/controllers/RubricControllerTest.java

@@ -484,11 +484,11 @@ void retire_notFound() throws Exception {
         }
 
         @Test
-        @DisplayName("still a draft -> 409 (documented)")
+        @DisplayName("already retired -> 409 (documented)")
         void retire_wrongState() throws Exception {
             when(registry.retire(any(), any(), any()))
                     .thenThrow(new RubricLifecycleException("piqi.core", "1.0.0",
-                            RubricVersionStatus.DRAFT, "retire"));
+                            RubricVersionStatus.RETIRED, "retire"));
             expectStatus(post(BASE + "/piqi.core/versions/1.0.0/$retire"), 409);
         }
     }

Java/validation/src/test/java/com/lantanagroup/link/validation/services/RubricRegistryServiceTest.java

@@ -305,6 +305,43 @@ void publish_lifecycleCheckedBeforeDryRun() {
                 .isInstanceOf(RubricLifecycleException.class);
     }
 
+    @Test
+    @DisplayName("retire a DRAFT -> allowed, version goes straight to RETIRED")
+    void retire_draftAllowed() {
+        stubVersion(draftVersion());
+
+        RubricVersion retired = service().retire("piqi.core", "1.0.0", "qa");
+
+        assertThat(retired.getStatus()).isEqualTo(RubricVersionStatus.RETIRED);
+        assertThat(retired.getRetiredAt()).isNotNull();
+        assertThat(retired.getRetiredBy()).isEqualTo("qa");
+        verify(eventRepository).save(any());
+    }
+
+    @Test
+    @DisplayName("retire a PUBLISHED version -> RETIRED")
+    void retire_publishedAllowed() {
+        RubricVersion version = draftVersion();
+        version.setStatus(RubricVersionStatus.PUBLISHED);
+        stubVersion(version);
+
+        RubricVersion retired = service().retire("piqi.core", "1.0.0", "qa");
+
+        assertThat(retired.getStatus()).isEqualTo(RubricVersionStatus.RETIRED);
+    }
+
+    @Test
+    @DisplayName("retire an already RETIRED version -> 409 lifecycle error")
+    void retire_alreadyRetiredRejected() {
+        RubricVersion version = draftVersion();
+        version.setStatus(RubricVersionStatus.RETIRED);
+        stubVersion(version);
+
+        assertThatThrownBy(() -> service().retire("piqi.core", "1.0.0", "qa"))
+                .isInstanceOf(RubricLifecycleException.class);
+        verify(eventRepository, never()).save(any());
+    }
+
     private RubricVersion versionOf(String rubricId, String semver, RubricVersionStatus status) {
         return RubricVersion.builder()
                 .rubricVersionId(UUID.randomUUID())