Merge branch 'feat/fam-auth-1-2-signin' into feat/fam-auth-1-3-rolegate

Author: gpascucci

.github/workflows/analysis.yml

@@ -40,10 +40,14 @@ jobs:
           java-cache: maven
           java-distribution: temurin
           java-version: "21"
-          # cpd.exclusions: RoadGroupLookup is a verbatim port of the legacy RMG tables
-          # (RoadGroupUtil.setRmgByTfaTsbNumberCode/setRmgByTflNumberCode), where ~18 of the
-          # TSA cases are token-identical apart from their literals. CPD reads that as 174
-          # duplicated lines; the table is the business rule and must not be de-duplicated.
+          # cpd.exclusions: both RoadGroup lookups are verbatim ports of the legacy RMG tables,
+          # where ~18 of the TSA cases are token-identical apart from their literals. CPD reads
+          # that as ~174 duplicated lines each; the tables ARE the business rule and must not be
+          # de-duplicated. schedule6 ports setRmgByTfaTsbNumberCode/setRmgByTflNumberCode;
+          # schedule10 ports setRG10ByTsaTsbNumberCode/setRG10ByTflNumberCode.
+          # They are NOT interchangeable: the same inputs map to DIFFERENT road groups (TSA 01 ->
+          # 15 vs 11, TSA 08 -> 10 vs 7, TFL 08 -> 7 vs 10), so "resolving" the duplication by
+          # merging them would silently corrupt one schedule's derived, user-visible Road Group.
           # xmlReportPaths: with the ITs running, the pom's jacoco `merge`/`report-merged` executions
           # produce the union of surefire and failsafe coverage. Sonar would otherwise keep reading
           # the unit-only report and still count IT-covered lines as uncovered.
@@ -52,7 +56,7 @@ jobs:
             -Dsonar.projectKey=bcgov-sonarcloud_nr-ilcr_backend
             -Dsonar.host.url=https://sonarcloud.io
             -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco-merged/jacoco.xml
-            -Dsonar.cpd.exclusions=**/schedule6/RoadGroupLookup.java
+            -Dsonar.cpd.exclusions=**/schedule6/RoadGroupLookup.java,**/schedule10/RoadGroup10Lookup.java
           sonar_token: ${{ secrets.sonar_token_backend }}
           triggers: ('backend/')
 

.github/workflows/reusable-tests.yml

@@ -68,6 +68,13 @@ jobs:
     # raw-Playwright frontend/e2e). Only the DATA-INDEPENDENT `@smoke` project runs here: it aborts /api,
     # so it needs neither the seeded delivery Oracle nor the pinned fixtures the deployed env lacks. The
     # full data-backed suite (setup + chromium — SCH1/SEC) is a LOCAL/manual gate; see frontend/e2e/README.md.
+    #
+    # The smoke runs against a LOCAL Vite server on localhost, NOT the deployed PR URL. Since Story 1.2
+    # turned auth on, mock auth is (by design) disabled off-localhost — `isMockAuth()` double-gates on
+    # `isLocalHost()` (src/env.ts) — so an anonymous visit to a deployed host correctly bounces to the
+    # FAM/Cognito Hosted UI and never renders the shell. On localhost with the repo-default
+    # `{ mockUser: true }` config the shell renders client-side, keeping this smoke auth- AND
+    # backend-independent (the scenarios still abort every /api call).
     defaults:
       run:
         working-directory: frontend/e2e
@@ -82,17 +89,28 @@ jobs:
           node-version: 24
           cache: "npm"
           cache-dependency-path: frontend/e2e/package-lock.json
-      - name: Install dependencies
+      - name: Install e2e dependencies
         run: |
           npm ci
           npx playwright install --with-deps chromium
 
-      - name: Run smoke (data-independent)
+      - name: Install frontend
+        working-directory: frontend
+        run: npm ci
+
+      - name: Run smoke (data-independent, localhost mock auth)
+        working-directory: frontend
         env:
-          E2E_BASE_URL: https://${{ env.PREFIX }}.${{ env.DOMAIN }}/
           CI: "true"
         run: |
-          npm test -- --project=smoke --reporter=html
+          # Serve the app on localhost so mock auth engages (isMockAuth() requires localhost); the
+          # @smoke scenarios abort /api, so no backend is needed. No E2E_BASE_URL → the Playwright
+          # config defaults baseURL to http://localhost:3000.
+          npm run dev -- --port 3000 &
+          DEV_PID=$!
+          npx --yes wait-on -t 120000 http://localhost:3000
+          ( cd e2e && npm test -- --project=smoke --reporter=html )
+          kill "$DEV_PID" 2>/dev/null || true
 
       - uses: actions/upload-artifact@v7
         if: (! cancelled())

backend/src/main/java/ca/bc/gov/nrs/ilcr/configuration/SpringDataJdbcConfiguration.java

@@ -3,6 +3,7 @@
 import ca.bc.gov.nrs.ilcr.assignment.MillUserProfileXrefRepository;
 import ca.bc.gov.nrs.ilcr.millcontext.MillContextRepository;
 import ca.bc.gov.nrs.ilcr.schedule1.Schedule1Repository;
+import ca.bc.gov.nrs.ilcr.schedule10.Schedule10Repository;
 import ca.bc.gov.nrs.ilcr.schedule11.Schedule11Repository;
 import ca.bc.gov.nrs.ilcr.schedule2.Schedule2Repository;
 import ca.bc.gov.nrs.ilcr.schedule3.Schedule3Repository;
@@ -47,6 +48,7 @@
       Schedule7bRepository.class,
       Schedule8Repository.class,
       Schedule9Repository.class,
+      Schedule10Repository.class,
       Schedule11Repository.class,
       MillContextRepository.class,
       MillUserProfileXrefRepository.class

backend/src/main/java/ca/bc/gov/nrs/ilcr/schedule10/RoadConstructionReportDetailEntity.java

@@ -0,0 +1,56 @@
+package ca.bc.gov.nrs.ilcr.schedule10;
+
+import java.math.BigDecimal;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+/**
+ * One Schedule 10 road-detail row — a {@code THE.ROAD_CONSTRUCTION_REPRT_DTL} row.
+ *
+ * <p>Shape is delivery-verified (Story 11.1 Task 1 gate (i)). Costs are NOT columns here: they are
+ * keyed rows in {@code THE.ILCR_COST_REPORT_DETAIL} joined by
+ * {@code ROAD_CONSTRUCTION_REPRT_DTL_ID} (BR-08), reassembled by {@link Schedule10Repository}.
+ *
+ * <p><strong>Three delivery columns are deliberately absent</strong> — business-directed departures
+ * LD-1/LD-2/LD-3 remove ASM Code ({@code RELATIVE_SOIL_MOISTUR_RGM_CODE}), Soil Moisture Code
+ * ({@code ILCR_SOIL_MOISTURE_CODE}) and Boulder Area % ({@code BOULDER_AREA_PCT}). They still exist
+ * in the table and the first two are {@code NOT NULL} there, which is a hard problem for the Story
+ * 11.2 write path but none at all for this read: we simply never select them.
+ *
+ * <p><strong>{@code REL_SOIL_MOIST_RGM_CLS_CODE} (RSMR Class) is nullable</strong> despite the
+ * legacy view marking it required — it is populated in only 18 of 66 real delivery rows.
+ *
+ * <p>All numerics are boxed. Oracle {@code NUMBER} arrives as {@code BigDecimal} and null is a
+ * first-class value throughout Schedule 10 (see {@link Schedule10Amounts}).
+ */
+@Table(name = "ROAD_CONSTRUCTION_REPRT_DTL", schema = "THE")
+public record RoadConstructionReportDetailEntity(
+    @Id @Column("ROAD_CONSTRUCTION_REPRT_DTL_ID") Integer roadConstructionReprtDtlId,
+    @Column("ROAD_CONSTRUCTION_REPRT_ID") Integer roadConstructionReprtId,
+    @Column("ROAD_NAME") String roadName,
+    @Column("SIDE_SLOPE_PCT") Integer sideSlopePct,
+    @Column("ILCR_ROAD_LIFETIME_CODE") String ilcrRoadLifetimeCode,
+    @Column("RIPPABLE_ROCK_PCT") Integer rippableRockPct,
+    @Column("SOLID_ROCK_PCT") Integer solidRockPct,
+    @Column("COARSE_MATERIAL_PCT") Integer coarseMaterialPct,
+    @Column("BECBIOGEO_CATALOGUE_ID") Integer becbiogeoCatalogueId,
+    @Column("FINE_MATERIAL_PCT") Integer fineMaterialPct,
+    @Column("ORGANIC_MATERIAL_PCT") Integer organicMaterialPct,
+    @Column("SUB_GRADE_LENGTH") BigDecimal subGradeLength,
+    @Column("DETAIL_ENGINEERING_COST_IND") String detailEngineeringCostInd,
+    @Column("END_HAUL_DISTANCE") BigDecimal endHaulDistance,
+    @Column("END_HAUL_VOLUME") BigDecimal endHaulVolume,
+    @Column("OVERLAND_DISTANCE") BigDecimal overlandDistance,
+    @Column("OVERLAND_VOLUME") BigDecimal overlandVolume,
+    @Column("ILCR_ROAD_BALLAST_METHOD_CODE") String ilcrRoadBallastMethodCode,
+    @Column("SUB_GRADE_SURFACE_WIDTH") BigDecimal subGradeSurfaceWidth,
+    @Column("ILCR_ROAD_BALLAST_MATERL_CODE") String ilcrRoadBallastMaterlCode,
+    @Column("STABILIZING_LENGTH") BigDecimal stabilizingLength,
+    @Column("STABILIZING_SURFACE_WIDTH") BigDecimal stabilizingSurfaceWidth,
+    @Column("STABILIZING_DEPTH") BigDecimal stabilizingDepth,
+    @Column("STABILIZING_DISTANCE_TO_SOURCE") BigDecimal stabilizingDistanceToSource,
+    @Column("REL_SOIL_MOIST_RGM_CLS_CODE") String relSoilMoistRgmClsCode,
+    @Column("COMMENTS") String comments,
+    @Column("REVISION_COUNT") Integer revisionCount) {
+}

backend/src/main/java/ca/bc/gov/nrs/ilcr/schedule10/RoadConstructionReportEntity.java

@@ -0,0 +1,36 @@
+package ca.bc.gov.nrs.ilcr.schedule10;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Column;
+import org.springframework.data.relational.core.mapping.Table;
+
+/**
+ * A Schedule 10 construction page — one {@code THE.ROAD_CONSTRUCTION_REPRT} row.
+ *
+ * <p>Shape is delivery-verified (Story 11.1 Task 1 gate (i)). Two things to note:
+ *
+ * <p><strong>There is no Road Group column.</strong> {@code RMG} is derived on every read from the
+ * TSA/TSB or TFL tables via {@link RoadGroup10Lookup}, never stored.
+ *
+ * <p><strong>{@code CONSTRUCTION_DIVISION_NAME} is {@code VARCHAR2(20)}</strong> even though
+ * {@code schedule10.xhtml:140} sets {@code maxlength="30"} — a real defect recorded for Story 11.2.
+ * This read story is unaffected.
+ *
+ * <p>Numeric columns are boxed: ojdbc maps Oracle {@code NUMBER} to {@code BigDecimal} and a
+ * primitive would NPE on a null. {@code REPORT_YEAR} and {@code ILCR_MILL_ID} are {@code NOT NULL}
+ * in delivery but stay boxed for consistency with the shipped schedules.
+ */
+@Table(name = "ROAD_CONSTRUCTION_REPRT", schema = "THE")
+public record RoadConstructionReportEntity(
+    @Id @Column("ROAD_CONSTRUCTION_REPRT_ID") Integer roadConstructionReprtId,
+    @Column("REPORT_YEAR") Integer reportYear,
+    @Column("ILCR_MILL_ID") Long ilcrMillId,
+    @Column("ILCR_CATEGORY_ID") String ilcrCategoryId,
+    @Column("CONSTRUCTION_PERIOD") String constructionPeriod,
+    @Column("CONSTRUCTION_DIVISION_NAME") String constructionDivisionName,
+    @Column("ILCR_FOREST_REGION_CODE") String ilcrForestRegionCode,
+    @Column("TSB_NUMBER_CODE") String tsbNumberCode,
+    @Column("TSA_NUMBER") String tsaNumber,
+    @Column("TFL_NUMBER_CODE") String tflNumberCode,
+    @Column("REVISION_COUNT") Integer revisionCount) {
+}