Merge remote-tracking branch 'origin/main' into feat/epic20-4-schedule10-print-section

Author: gpascucci

backend/src/main/java/ca/bc/gov/nrs/ilcr/dto/base/MaxByteLength.java

@@ -17,11 +17,11 @@
  * {@code ALL_TAB_COLUMNS} reports {@code CHAR_USED = 'B'} for {@code CAMP_REPORT.CAMP_NAME} (30)
  * and {@code CAMP_REPORT.COMMENTS} (4000). {@code @Size} measures Java characters, so a name of 30
  * accented or CJK characters satisfies it and then overflows a 30-BYTE column: Oracle raises
- * ORA-12899, the service can only map that {@code DataAccessException} to {@code
- * ScheduleNotSavedException}, and the licensee gets an opaque 500 on an ordinary save. This
- * constraint turns that into a clean 400 at the same field. The character cap stays because it is
- * the LEGACY bound (the screen's own {@code maxlength}) and is the tighter one for ASCII input,
- * which is effectively all stored data today.
+ * ORA-12899, the service can only map that {@code DataAccessException} to {@link
+ * ca.bc.gov.nrs.ilcr.exception.ScheduleNotSavedException ScheduleNotSavedException}, and the
+ * licensee gets an opaque 500 on an ordinary save. This constraint turns that into a clean 400 at
+ * the same field. The character cap stays because it is the LEGACY bound (the screen's own {@code
+ * maxlength}) and is the tighter one for ASCII input, which is effectively all stored data today.
  *
  * <p><strong>Message.</strong> Each field reuses its existing per-field length key rather than
  * introducing a new one, so a byte violation and a character violation are indistinguishable to the

backend/src/main/java/ca/bc/gov/nrs/ilcr/dto/base/MessageInfo.java

@@ -0,0 +1,16 @@
+package ca.bc.gov.nrs.ilcr.dto.base;
+
+/**
+ * A user-facing message carried on a mutating/confirming response (AD-8/EQ-M3): the LEGACY {@code
+ * messages.properties} bundle key plus its server-resolved verbatim text. The frontend renders
+ * {@code text} and never hardcodes SUC/WRN strings.
+ *
+ * <p>The canonical, feature-neutral home for this envelope (Story 29.9): it lives in the shared
+ * {@code dto.base} package so no feature module (schedule1..11, millcontext) has to reach into
+ * another for it. Structurally identical across every consumer, so the pinned wire contract stays
+ * uniform (AD-12).
+ *
+ * @param key the legacy {@code messages.properties} key (e.g. {@code dataSavedSuccesfullyInfoMsg})
+ * @param text the resolved verbatim message text (e.g. {@code Data saved successfully})
+ */
+public record MessageInfo(String key, String text) {}

backend/src/main/java/ca/bc/gov/nrs/ilcr/dto/base/MessageResponse.java

@@ -0,0 +1,13 @@
+package ca.bc.gov.nrs.ilcr.dto.base;
+
+/**
+ * Minimal body for a mutating action that returns no document — e.g. {@code DELETE /schedule1},
+ * {@code DELETE /api/v1/schedule3} (AD-8/EQ-M3). Carries only the success {@link MessageInfo} so
+ * the frontend renders server text.
+ *
+ * <p>The canonical, feature-neutral home for this envelope (Story 29.9): shared {@code dto.base} so
+ * no feature module reaches into another for it.
+ *
+ * @param message the success message (key + verbatim text)
+ */
+public record MessageResponse(MessageInfo message) {}

backend/src/main/java/ca/bc/gov/nrs/ilcr/exception/RevisionCountRequiredException.java

@@ -0,0 +1,27 @@
+package ca.bc.gov.nrs.ilcr.exception;
+
+import org.springframework.http.HttpStatus;
+
+/**
+ * Raised when an edit reaches the service without its AR11 optimistic-lock token ({@code
+ * revisionCount}). The HTTP path normally never gets here — the API's {@code PUT} validates
+ * {@code @Validated({Default.class, OnUpdate.class})}, which already rejects a null token as a
+ * clean 400 — but the service unboxes the token to an {@code int}, so this is the belt-and-braces
+ * guard that keeps any future caller bypassing that group from turning a missing token into an
+ * NPE-driven 500 (a validation group protects one entry point, not the method).
+ *
+ * <p>Deliberately a 400, NOT a coerced 409: a missing token is a malformed request, never a stale
+ * one — a coerced 409 (e.g. a {@code -1} sentinel that matches no row) would tell the user to
+ * reload when the real fix is to send the token (the Story 2.1 review lesson). It maps to the same
+ * {@code revisionCountRequiredErrorMsg} the Bean Validation path produces, so the two routes are
+ * indistinguishable to a client.
+ *
+ * <p>Canonical shared copy (Story 29.11) — one definition for every schedule instead of per-module
+ * duplicates. {@code extends BusinessException}, so the single base-type {@code @ExceptionHandler}
+ * maps it unchanged.
+ */
+public class RevisionCountRequiredException extends BusinessException {
+  public RevisionCountRequiredException() {
+    super(HttpStatus.BAD_REQUEST, "revisionCountRequiredErrorMsg");
+  }
+}

backend/src/main/java/ca/bc/gov/nrs/ilcr/exception/ScheduleNotEditableException.java

@@ -0,0 +1,18 @@
+package ca.bc.gov.nrs.ilcr.exception;
+
+import org.springframework.http.HttpStatus;
+
+/**
+ * Raised when a write (PUT/DELETE) targets a schedule whose Schedules 1–10 track is not in Draft —
+ * the server-side Draft gate (AD-9). Legacy enforced this only by disabling the UI, so no legacy
+ * message text exists and the key text is a recorded deviation (AD-8). Maps to 409.
+ *
+ * <p>Canonical shared copy (Story 29.11) — one definition for every schedule instead of per-module
+ * duplicates. {@code extends BusinessException}, so the single base-type {@code @ExceptionHandler}
+ * maps it unchanged.
+ */
+public class ScheduleNotEditableException extends BusinessException {
+  public ScheduleNotEditableException() {
+    super(HttpStatus.CONFLICT, "scheduleNotEditableErrorMsg");
+  }
+}

backend/src/main/java/ca/bc/gov/nrs/ilcr/exception/ScheduleNotSavedException.java

@@ -0,0 +1,19 @@
+package ca.bc.gov.nrs.ilcr.exception;
+
+import org.springframework.http.HttpStatus;
+
+/**
+ * Raised when a schedule save/delete fails at the persistence layer (a repository {@code
+ * DataAccessException}). Maps to 500 with the verbatim legacy {@code scheduleNotSavedErrorMsg}
+ * ("Schedule could not be saved."). The {@code @Transactional} write boundary rolls back before
+ * this surfaces, so a retried request can succeed.
+ *
+ * <p>Canonical shared copy (Story 29.11) — one definition for every schedule instead of per-module
+ * duplicates. {@code extends BusinessException}, so the single base-type {@code @ExceptionHandler}
+ * maps it unchanged.
+ */
+public class ScheduleNotSavedException extends BusinessException {
+  public ScheduleNotSavedException() {
+    super(HttpStatus.INTERNAL_SERVER_ERROR, "scheduleNotSavedErrorMsg");
+  }
+}

backend/src/main/java/ca/bc/gov/nrs/ilcr/exception/StaleRevisionException.java

@@ -0,0 +1,20 @@
+package ca.bc.gov.nrs.ilcr.exception;
+
+import org.springframework.http.HttpStatus;
+
+/**
+ * Raised when a mutating request carries a {@code revisionCount} that no longer matches the stored
+ * {@code ILCR_REPORT_SUMMARY.REVISION_COUNT} — a lost-update conflict (AR11 optimistic lock):
+ * another user saved in between, so the optimistic-lock bump matched 0 rows. Maps to 409 with the
+ * verbatim {@code scheduleRevisionConflictErrorMsg}. No legacy message text existed (legacy used
+ * Hibernate {@code @Version}), so the key text is a recorded deviation (AD-8).
+ *
+ * <p>Canonical shared copy (Story 29.11) — one definition for every schedule instead of per-module
+ * duplicates. {@code extends BusinessException}, so the single base-type {@code @ExceptionHandler}
+ * maps it unchanged.
+ */
+public class StaleRevisionException extends BusinessException {
+  public StaleRevisionException() {
+    super(HttpStatus.CONFLICT, "scheduleRevisionConflictErrorMsg");
+  }
+}

backend/src/main/java/ca/bc/gov/nrs/ilcr/messages/MessageApi.java

@@ -1,6 +1,6 @@
 package ca.bc.gov.nrs.ilcr.messages;
 
-import ca.bc.gov.nrs.ilcr.schedule1.dto.MessageInfo;
+import ca.bc.gov.nrs.ilcr.dto.base.MessageInfo;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

backend/src/main/java/ca/bc/gov/nrs/ilcr/messages/MessageController.java

@@ -1,6 +1,6 @@
 package ca.bc.gov.nrs.ilcr.messages;
 
-import ca.bc.gov.nrs.ilcr.schedule1.dto.MessageInfo;
+import ca.bc.gov.nrs.ilcr.dto.base.MessageInfo;
 import java.util.Set;
 import org.springframework.context.MessageSource;
 import org.springframework.context.NoSuchMessageException;

backend/src/main/java/ca/bc/gov/nrs/ilcr/millcontext/MillContextService.java

@@ -1,9 +1,9 @@
 package ca.bc.gov.nrs.ilcr.millcontext;
 
+import ca.bc.gov.nrs.ilcr.dto.base.MessageInfo;
 import ca.bc.gov.nrs.ilcr.exception.FieldValuesRequiredException;
 import ca.bc.gov.nrs.ilcr.millcontext.MillContextRepository.StatusDates;
 import ca.bc.gov.nrs.ilcr.millcontext.MillContextRepository.TrackCodes;
-import ca.bc.gov.nrs.ilcr.millcontext.dto.MessageInfo;
 import ca.bc.gov.nrs.ilcr.millcontext.dto.MillSummary;
 import ca.bc.gov.nrs.ilcr.millcontext.dto.ReportingYear;
 import ca.bc.gov.nrs.ilcr.millcontext.dto.TrackStatus;