Migrate SCMS Status Endpoint

resources/sql_scripts/update_scripts/scms_health_index.sql

@@ -0,0 +1,2 @@
+CREATE INDEX IF NOT EXISTS idx_scms_health_timestamp
+    ON scms_health(timestamp);

services/api/src/main.py

@@ -17,7 +17,6 @@
 from rsu_geo_query import RsuGeoQuery
 from wzdx_feed import WzdxFeed
 from rsu_geo_msg_query import RsuGeoData
-from iss_scms_status import IssScmsStatus
 from rsu_ssm_srm import RsuSsmSrmData
 from admin_new_user import AdminNewUser
 from admin_new_org import AdminNewOrg
@@ -66,7 +65,6 @@ def apply_cors_header(response):
     api.add_resource(RsuCommandRequest, "/rsu-command")
     api.add_resource(RsuGeoQuery, "/rsu-config-geo-query")
     api.add_resource(RsuGeoData, "/rsu-geo-msg-data")
-    api.add_resource(IssScmsStatus, "/iss-scms-status")
     api.add_resource(RsuSsmSrmData, "/rsu-ssm-srm-data")
     api.add_resource(RSUErrorSummaryResource, "/rsu-error-summary")
 if api_environment.ENABLE_WZDX_FEATURES:

services/api/src/middleware.py

@@ -57,7 +57,6 @@ def get_user_role(token) -> UserInfo | None:
     "/rsucounts": True,
     "/rsu-msgfwd-query": True,
     "/rsu-command": True,
-    "/iss-scms-status": True,
     "/wzdx-feed": False,
     "/rsu-geo-msg-data": False,
     "/rsu-ssm-srm-data": False,
@@ -86,7 +85,6 @@ def get_user_role(token) -> UserInfo | None:
     "/rsu-msgfwd-query": FEATURE_KEYS_LITERAL.RSU,
     "/rsu-command": FEATURE_KEYS_LITERAL.RSU,
     "/rsu-map-info": FEATURE_KEYS_LITERAL.RSU,
-    "/iss-scms-status": FEATURE_KEYS_LITERAL.RSU,
     "/wzdx-feed": FEATURE_KEYS_LITERAL.WZDX,
     "/rsu-geo-msg-data": FEATURE_KEYS_LITERAL.RSU,
     "/rsu-ssm-srm-data": FEATURE_KEYS_LITERAL.RSU,

services/intersection-api/api/src/main/java/us/dot/its/jpo/ode/api/controllers/scms/ScmsHealthController.java

@@ -0,0 +1,49 @@
+package us.dot.its.jpo.ode.api.controllers.scms;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import us.dot.its.jpo.ode.api.mappers.ScmsHealthMapper;
+import us.dot.its.jpo.ode.api.models.scms.ScmsHealthResponse;
+import us.dot.its.jpo.ode.api.services.ScmsHealthService;
+
+@Slf4j
+@RestController
+@ConditionalOnProperty(name = "enable.api", havingValue = "true")
+@RequestMapping("/devices/scms")
+@RequiredArgsConstructor
+@Tag(name = "SCMS Health Status", description = "Manage SCMS health status for RSUs")
+public class ScmsHealthController {
+
+    private final ScmsHealthService scmsHealthService;
+    private final ScmsHealthMapper scmsHealthMapper;
+
+    @Operation(
+            summary = "Retrieve SCMS health status for RSUs in the given organization",
+            description = """
+                    Returns a map of RSU IDs to their health status for the specified organization.
+                    The Organization header is required for all users, including super users.
+                    """
+    )
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "Success"),
+            @ApiResponse(responseCode = "400", description = "Organization header is missing"),
+            @ApiResponse(responseCode = "403", description = "Forbidden - Requires SUPER_USER or USER role in the specified organization"),
+            @ApiResponse(responseCode = "404", description = "Organization not found"),
+    })
+    @GetMapping(value = "/status", produces = "application/json")
+    @PreAuthorize("@PermissionService.isSuperUser() || @PermissionService.hasRoleInOrg(#organization, 'USER')")
+    public ScmsHealthResponse getAllStatuses(@RequestHeader(name = "Organization") String organization) {
+        log.info("GET /devices/scms/status. organization: {}", organization);
+        return scmsHealthMapper.toResponse(scmsHealthService.getScmsStatuses(organization));
+    }
+}

services/intersection-api/api/src/main/java/us/dot/its/jpo/ode/api/mappers/ScmsHealthMapper.java

@@ -0,0 +1,58 @@
+package us.dot.its.jpo.ode.api.mappers;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.ReportingPolicy;
+import us.dot.its.jpo.ode.api.models.postgres.projections.ScmsHealthRsuProjection;
+import us.dot.its.jpo.ode.api.models.scms.ScmsHealthDto;
+import us.dot.its.jpo.ode.api.models.scms.ScmsHealthResponse;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MapStruct mapper for SCMS health data.
+ *
+ * <p>MapStruct generates {@link #toDto(ScmsHealthRsuProjection)} with compile-time field checking.
+ * If a field is added to {@link ScmsHealthDto} without a corresponding mapping, MapStruct emits
+ * a compile error (see {@code unmappedTargetPolicy}).</p>
+ *
+ * <p>{@link #toResponse(List)} is manually implemented because MapStruct does not yet support
+ * {@code List → Map} conversions keyed by a property. It delegates to the generated {@code toDto()}
+ * to preserve compile-time field checking.</p>
+ *
+ * <p>The {@code expiration} field is mapped directly as {@link java.time.Instant}. Jackson's
+ * {@code JavaTimeModule} (auto-registered by Spring Boot) serializes it as ISO-8601 UTC.</p>
+ *
+ * @see <a href="https://github.com/mapstruct/mapstruct/discussions/3263">MapStruct Discussion #3263</a>
+ * @see <a href="https://github.com/mapstruct/mapstruct/issues/3580">MapStruct Issue #3580</a>
+ */
+@Mapper(
+        componentModel = MappingConstants.ComponentModel.SPRING,
+        unmappedTargetPolicy = ReportingPolicy.ERROR
+)
+public interface ScmsHealthMapper {
+
+    /**
+     * Maps a single projection to DTO. MapStruct generates this method.
+     */
+    ScmsHealthDto toDto(ScmsHealthRsuProjection projection);
+
+    /**
+     * Converts projections to a response keyed by IP address.
+     * Delegates to {@link #toDto} to preserve compile-time field checking.
+     */
+    default ScmsHealthResponse toResponse(List<ScmsHealthRsuProjection> projections) {
+        if (projections == null) {
+            return null;
+        }
+        Map<String, ScmsHealthDto> scmsHealthByIp = new HashMap<>();
+        for (ScmsHealthRsuProjection projection : projections) {
+            String ip = projection.getIpv4Address().getHostAddress();
+            ScmsHealthDto dto = projection.getHealth() != null ? toDto(projection) : null;
+            scmsHealthByIp.put(ip, dto);
+        }
+        return new ScmsHealthResponse(scmsHealthByIp);
+    }
+}