Merge remote-tracking branch 'origin/main' into feat/epic11-3-schedule10-page

Author: Rylan-cgi

.github/workflows/analysis.yml

@@ -68,7 +68,12 @@ jobs:
       checks: write
       security-events: write
     runs-on: ubuntu-24.04
-    timeout-minutes: 5
+    # Covers all four commands below — npm ci, lint, format:check AND a coverage run — not the tests
+    # alone. Raised from 5 after PR #317 was cancelled at 4m58s with zero test failures: the same job
+    # had passed at 3m22s one commit earlier, so the 5-minute budget was already two thirds spent and
+    # a growing component suite left no room for runner variance. 10 restores headroom without
+    # hiding a genuine hang.
+    timeout-minutes: 10
     steps:
       - uses: bcgov/action-test-and-analyse@8f699e3fd3fadd9a6adf6f4b1f2638ef7ecfefb9 # v2.0.0
         env:

.github/workflows/merge.yml

@@ -29,11 +29,7 @@ jobs:
       # Get PR number for squash merges to main
       - id: pr
         uses: bcgov/action-get-pr@28b0adf8e4d40720d41f9c87356ce24b0a4bd6af # v0.3.1
-  # TEST deploys run on every merge and fail visibly if misconfigured. PROD
-  # stays behind ENABLE_OPENSHIFT_DEPLOY until its environment is ready (it
-  # still lacks prod ORACLEDB_* secrets/vars and would fall back to the
-  # repo-level test-database values); set the repo variable to "true" once
-  # they're in place.
+  # TEST deploys run on every merge and fail visibly if misconfigured.
   deploy-test:
     name: TEST Deploys (${{ needs.init.outputs.pr }})
     needs: [init]
@@ -52,60 +48,63 @@ jobs:
     with:
       target: test
 
-  deploy-prod:
-    name: PROD Deploys (${{ needs.init.outputs.pr }})
-    if: ${{ vars.ENABLE_OPENSHIFT_DEPLOY == 'true' }}
-    needs: [tests, init]
-    uses: ./.github/workflows/reusable-deploy.yml
-    secrets: inherit
-    with:
-      environment: prod
-      target: prod
-      tag: ${{ needs.init.outputs.pr }}
-
-  # Sync Sysdig email alerts for PROD. No-ops cleanly if SYSDIG_API_TOKEN is
-  # unset or monitoring/alerts/ is empty — adoption is gradual. Alert
-  # templates live in monitoring/alerts/ in this repo; add or remove files
-  # there to customize the alert set.
-  monitor-prod:
-    name: Sysdig Monitor (PROD)
-    if: ${{ vars.ENABLE_OPENSHIFT_DEPLOY == 'true' }}
-    needs: [deploy-prod]
-    runs-on: ubuntu-24.04
-    environment: prod
-    permissions:
-      contents: read
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@v7
-      - uses: bcgov/actions/sysdig-monitor@4ad61a784f1c17765b03d8d6de9737c1d3f4c0f2 # v0.5.0
-        with:
-          sysdig_api_token: ${{ secrets.SYSDIG_API_TOKEN }}
-          oc_namespace: ${{ secrets.oc_namespace }}
-          app: ${{ github.event.repository.name }}
-
-  promote:
-    name: Promote Images
-    if: ${{ vars.ENABLE_OPENSHIFT_DEPLOY == 'true' }}
-    needs: [deploy-prod, init]
-    runs-on: ubuntu-slim
-    permissions:
-      packages: write
-    strategy:
-      matrix:
-        package: [backend, frontend]
-    timeout-minutes: 1
-    steps:
-      - uses: shrink/actions-docker-registry-tag@e6aaef25c595b6e0edd18bf4c7dbfea3abd43299 # v5
-        with:
-          registry: ghcr.io
-          repository: ${{ github.repository }}/${{ matrix.package }}
-          target: ${{ needs.init.outputs.pr }}
-          tags: prod
+  # ── PROD pipeline: commented out until the prod environment is ready ──
+  # It still lacks prod-scoped ORACLEDB_* secrets and would silently fall
+  # back to the repo-level TEST database values. Once those are set, restore
+  # the jobs below and add deploy-prod + promote back to the results job's
+  # `needs` list.
+  #
+  # deploy-prod:
+  #   name: PROD Deploys (${{ needs.init.outputs.pr }})
+  #   needs: [tests, init]
+  #   uses: ./.github/workflows/reusable-deploy.yml
+  #   secrets: inherit
+  #   with:
+  #     environment: prod
+  #     target: prod
+  #     tag: ${{ needs.init.outputs.pr }}
+  #
+  # # Sync Sysdig email alerts for PROD. No-ops cleanly if SYSDIG_API_TOKEN is
+  # # unset or monitoring/alerts/ is empty — adoption is gradual. Alert
+  # # templates live in monitoring/alerts/ in this repo; add or remove files
+  # # there to customize the alert set.
+  # monitor-prod:
+  #   name: Sysdig Monitor (PROD)
+  #   needs: [deploy-prod]
+  #   runs-on: ubuntu-24.04
+  #   environment: prod
+  #   permissions:
+  #     contents: read
+  #   timeout-minutes: 5
+  #   steps:
+  #     - uses: actions/checkout@v7
+  #     - uses: bcgov/actions/sysdig-monitor@4ad61a784f1c17765b03d8d6de9737c1d3f4c0f2 # v0.5.0
+  #       with:
+  #         sysdig_api_token: ${{ secrets.SYSDIG_API_TOKEN }}
+  #         oc_namespace: ${{ secrets.oc_namespace }}
+  #         app: ${{ github.event.repository.name }}
+  #
+  # promote:
+  #   name: Promote Images
+  #   needs: [deploy-prod, init]
+  #   runs-on: ubuntu-slim
+  #   permissions:
+  #     packages: write
+  #   strategy:
+  #     matrix:
+  #       package: [backend, frontend]
+  #   timeout-minutes: 1
+  #   steps:
+  #     - uses: shrink/actions-docker-registry-tag@e6aaef25c595b6e0edd18bf4c7dbfea3abd43299 # v5
+  #       with:
+  #         registry: ghcr.io
+  #         repository: ${{ github.repository }}/${{ matrix.package }}
+  #         target: ${{ needs.init.outputs.pr }}
+  #         tags: prod
 
   results:
     name: Merge Results
-    needs: [init, deploy-test, tests, deploy-prod, promote]
+    needs: [init, deploy-test, tests]
     if: always()
     runs-on: ubuntu-slim
     timeout-minutes: 1

README.md

@@ -190,7 +190,7 @@ FAM authentication is tracked separately. The dashboard currently displays the s
 
 ## OpenShift Status
 
-OpenShift Gold is the destination environment, but the Gold project is not required for this local-dev scaffold. Pull requests always deploy a sandbox environment (zone = PR number mod 50). Merges to `main` deploy to TEST and then, if tests pass, to PROD in the same workflow run — but only while the `ENABLE_OPENSHIFT_DEPLOY` repository variable is `true`; it is left unset until the code is ready for those environments.
+OpenShift Gold is the destination environment, but the Gold project is not required for this local-dev scaffold. Pull requests always deploy a sandbox environment (zone = PR number mod 50). Merges to `main` deploy to TEST on every merge. The PROD pipeline (deploy, Sysdig monitor, image promotion) is commented out in `.github/workflows/merge.yml` until the `prod` GitHub environment has its own `ORACLEDB_*` secrets; restore those jobs to open PROD.
 
 Deployed pods fail closed on authentication: JWT enforcement (`ILCR_SECURITY_ENABLED`) and the Oracle datasource (`ILCR_DATASOURCE_ENABLED`) both default to `true` and can be overridden per scope with GitHub variables (environment-first, then repository). The backend refuses to start a deployed pod with security off while the datasource is on (`DeployedSecurityGuard`), so mock auth can never serve real data from a public route; setting both variables to `false` yields a data-less mock-auth smoke deployment.
 

backend/openshift.deploy.yml

@@ -251,8 +251,8 @@ objects:
         apiVersion: apps/v1
         kind: Deployment
         name: ${NAME}-${ZONE}-${COMPONENT}
-      minReplicas: ${MIN_REPLICAS}
-      maxReplicas: ${MAX_REPLICAS}
+      minReplicas: ${{MIN_REPLICAS}}
+      maxReplicas: ${{MAX_REPLICAS}}
       metrics:
         - type: Resource
           resource:

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

@@ -406,6 +406,37 @@ public ResponseEntity<ProblemDetail> handleFieldValuesRequired(
         .body(problem);
   }
 
+  /**
+   * Handles a business rejection carrying MORE THAN ONE legacy message (AD-8) — resolves each key to
+   * its verbatim text and returns them together in the {@code messages} extension (same shape as the
+   * required-field handler), with the exception's status. Used e.g. by the reporting-year open when
+   * zero active mills exist (INF-001 + ERR-002 together).
+   *
+   * @param ex the exception carrying the ordered message keys and target status
+   * @param request the current HTTP request
+   * @return a {@link ProblemDetail} with the exception's status and a {@code messages} array
+   */
+  @ExceptionHandler(MultiMessageException.class)
+  public ResponseEntity<ProblemDetail> handleMultiMessage(
+      MultiMessageException ex, HttpServletRequest request) {
+    log.info("Multi-message business rejection ({}): {}", ex.getStatus(), ex.getMessageKeys());
+
+    var messages = ex.getMessageKeys().stream()
+        .map(key -> new FieldMessage(
+            key, messageSource.getMessage(key, null, key, LocaleContextHolder.getLocale())))
+        .toList();
+
+    ProblemDetail problem = ProblemDetail.forStatus(ex.getStatus());
+    problem.setTitle(ex.getStatus().getReasonPhrase());
+    problem.setDetail(messages.stream().map(FieldMessage::text).collect(Collectors.joining("; ")));
+    problem.setInstance(URI.create(request.getRequestURI()));
+    problem.setProperty("messages", messages);
+
+    return ResponseEntity.status(ex.getStatus())
+        .contentType(MediaType.APPLICATION_PROBLEM_JSON)
+        .body(problem);
+  }
+
   /**
    * Handles a missing required request parameter (e.g. absent {@code millId}/{@code year}) and
    * returns a 400 problem response. Without this handler these fall through to the generic 500

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

@@ -0,0 +1,31 @@
+package ca.bc.gov.nrs.ilcr.exception;
+
+import java.util.List;
+import org.springframework.http.HttpStatus;
+
+/**
+ * A business rejection that surfaces MORE THAN ONE legacy message at once (AD-8) — for the cases where
+ * legacy emitted several bundle messages together for a single outcome. {@link GlobalExceptionHandler}
+ * resolves each key to its verbatim text and returns them together in the {@code messages} extension
+ * (the same {@code {key, text}} shape as {@link FieldValuesRequiredException}), with the given status.
+ * Keys are non-parameterized (the handler resolves them without arguments).
+ */
+public class MultiMessageException extends RuntimeException {
+
+  private final transient HttpStatus status;
+  private final transient List<String> messageKeys;
+
+  public MultiMessageException(HttpStatus status, List<String> messageKeys) {
+    super("Business rejection: " + (messageKeys == null ? "none" : String.join(", ", messageKeys)));
+    this.status = status;
+    this.messageKeys = messageKeys == null ? List.of() : List.copyOf(messageKeys);
+  }
+
+  public HttpStatus getStatus() {
+    return status;
+  }
+
+  public List<String> getMessageKeys() {
+    return messageKeys;
+  }
+}

backend/src/main/java/ca/bc/gov/nrs/ilcr/homecontent/HomeContentController.java

@@ -0,0 +1,67 @@
+package ca.bc.gov.nrs.ilcr.homecontent;
+
+import ca.bc.gov.nrs.ilcr.dto.base.Role;
+import ca.bc.gov.nrs.ilcr.homecontent.api.HomeContentApi;
+import ca.bc.gov.nrs.ilcr.homecontent.dto.HomeContentEntry;
+import ca.bc.gov.nrs.ilcr.homecontent.dto.HomeContentSaveRequest;
+import ca.bc.gov.nrs.ilcr.homecontent.dto.HomeContentSaveResponse;
+import java.util.List;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Content Editing endpoints (Story 24.2 / UC-CNT-001). {@code list}/{@code save} are gated on the
+ * ADMIN-only {@code EDIT_HOME_CONTENT} action (S13); {@code mine} is authenticated-only so the Home
+ * page can render the viewer's role message. Resolves the verbatim success text here (AD-8).
+ */
+@RestController
+@ConditionalOnProperty(name = "ilcr.datasource.enabled", havingValue = "true")
+public class HomeContentController implements HomeContentApi {
+
+  private static final String MSG_SAVED = "dataSavedSuccesfullyInfoMsg";
+
+  private final HomeContentService service;
+  private final MessageSource messageSource;
+
+  public HomeContentController(HomeContentService service, MessageSource messageSource) {
+    this.service = service;
+    this.messageSource = messageSource;
+  }
+
+  @Override
+  @PreAuthorize("@permissions.hasPermission(authentication, 'EDIT_HOME_CONTENT')")
+  public ResponseEntity<List<HomeContentEntry>> list(Authentication authentication) {
+    return ResponseEntity.ok(service.readAll());
+  }
+
+  @Override
+  @PreAuthorize("isAuthenticated()")
+  public ResponseEntity<HomeContentEntry> mine(Authentication authentication) {
+    return ResponseEntity.ok(service.readForRole(contentRoleOf(authentication)));
+  }
+
+  @Override
+  @PreAuthorize("@permissions.hasPermission(authentication, 'EDIT_HOME_CONTENT')")
+  public ResponseEntity<HomeContentSaveResponse> save(
+      HomeContentSaveRequest request, Authentication authentication) {
+    service.saveAll(request, authentication.getName());
+    String message =
+        messageSource.getMessage(MSG_SAVED, null, MSG_SAVED, LocaleContextHolder.getLocale());
+    return ResponseEntity.ok(new HomeContentSaveResponse(MSG_SAVED, message, service.readAll()));
+  }
+
+  /** ILCR_ADMIN → the Administrator message; everyone else (Licensee/submitter) → the Licensee one. */
+  private static String contentRoleOf(Authentication authentication) {
+    boolean admin = authentication != null && authentication.getAuthorities().stream()
+        .map(GrantedAuthority::getAuthority)
+        .map(Role::fromValue)
+        .anyMatch(role -> role == Role.ADMIN);
+    return admin ? HomeContentService.ROLE_ADMIN : HomeContentService.ROLE_LICENSEE;
+  }
+}

backend/src/main/java/ca/bc/gov/nrs/ilcr/homecontent/HomeContentException.java

@@ -0,0 +1,27 @@
+package ca.bc.gov.nrs.ilcr.homecontent;
+
+import ca.bc.gov.nrs.ilcr.exception.BusinessException;
+import org.springframework.http.HttpStatus;
+
+/**
+ * Business failures for Home content editing (Story 24.2 / UC-CNT-001): a role's message record
+ * missing at load/save (404, ERR-002) or a message exceeding the column cap (400). Carries a
+ * {@code messages.properties} key the {@code GlobalExceptionHandler} resolves (AD-8). Blank-editor
+ * rejections use {@code FieldValuesRequiredException} (all blanks reported together, FLD-001).
+ */
+public class HomeContentException extends BusinessException {
+
+  private HomeContentException(HttpStatus status, String messageKey) {
+    super(status, messageKey);
+  }
+
+  /** A role's message record does not exist (S10). */
+  public static HomeContentException contentNotFound() {
+    return new HomeContentException(HttpStatus.NOT_FOUND, "homeContentNotFoundErrorMsg");
+  }
+
+  /** A message exceeds the {@code MESSAGE_TEXT} column cap (4000). */
+  public static HomeContentException tooLong() {
+    return new HomeContentException(HttpStatus.BAD_REQUEST, "homeContentTooLongErrorMsg");
+  }
+}

backend/src/main/java/ca/bc/gov/nrs/ilcr/homecontent/HomeContentRepository.java

@@ -0,0 +1,55 @@
+package ca.bc.gov.nrs.ilcr.homecontent;
+
+import ca.bc.gov.nrs.ilcr.homecontent.dto.HomeContentEntry;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Reads and updates the role-keyed Home messages in the legacy {@code THE.ILCR_ROLE} table (Story 24.2
+ * / UC-CNT-001): PK {@code ILCR_ROLE_NAME} ({@code LICENSEE}/{@code AUDITOR}/{@code ADMIN}), the
+ * rich-text {@code MESSAGE_TEXT VARCHAR2(4000)}, and the NOT NULL audit quartet. Every value is a bound
+ * named parameter; the acting admin + {@code SYSTIMESTAMP} are stamped on each update (AD-11).
+ */
+@Repository
+@ConditionalOnProperty(name = "ilcr.datasource.enabled", havingValue = "true")
+public class HomeContentRepository {
+
+  private static final RowMapper<HomeContentEntry> MAPPER =
+      (rs, rowNum) -> new HomeContentEntry(rs.getString("ILCR_ROLE_NAME"), rs.getString("MESSAGE_TEXT"));
+
+  private final NamedParameterJdbcTemplate jdbc;
+
+  public HomeContentRepository(NamedParameterJdbcTemplate jdbc) {
+    this.jdbc = jdbc;
+  }
+
+  /** All role messages, role-ordered (the Content Editing page loads all three). */
+  public List<HomeContentEntry> findAll() {
+    return jdbc.query(
+        "SELECT ILCR_ROLE_NAME, MESSAGE_TEXT FROM THE.ILCR_ROLE ORDER BY ILCR_ROLE_NAME", MAPPER);
+  }
+
+  /** One role's message (the Home render of the viewer's role), or empty when the row is absent. */
+  public Optional<HomeContentEntry> findByRole(String role) {
+    return jdbc.query(
+        "SELECT ILCR_ROLE_NAME, MESSAGE_TEXT FROM THE.ILCR_ROLE WHERE ILCR_ROLE_NAME = :role",
+        new MapSqlParameterSource("role", role), MAPPER).stream().findFirst();
+  }
+
+  /** Update one role's message + audit columns; returns rows affected (0 when the role is absent). */
+  public int updateMessage(String role, String messageText, String user) {
+    return jdbc.update(
+        "UPDATE THE.ILCR_ROLE SET MESSAGE_TEXT = :text, UPDATE_USERID = :user, "
+            + "UPDATE_TIMESTAMP = SYSTIMESTAMP, REVISION_COUNT = REVISION_COUNT + 1 "
+            + "WHERE ILCR_ROLE_NAME = :role",
+        new MapSqlParameterSource()
+            .addValue("text", messageText)
+            .addValue("user", user)
+            .addValue("role", role));
+  }
+}