Uptime percentage

.gitignore

@@ -27,3 +27,4 @@ node_modules
 # Nix stuffs
 /.direnv
 result*
+/.m2/

.run/StatusplattformServer.run.xml

@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="StatusplattformServer" type="Application" factoryName="Application" nameIsGenerated="true">
+    <envs>
+      <env name="AZURE_APP_CLIENT_ID" value="local" />
+      <env name="AZURE_APP_CLIENT_SECRET" value="local" />
+      <env name="swagger-api-key" value="key" />
+      <env name="teamkatalogApiUrl" value="https://teamkatalog-api.intern.dev.nav.no" />
+      <env name="ENV" value="dev" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="no.nav.statusplattform.server.StatusplattformServer" />
+    <module name="server" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="no.nav.statusplattform.server.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/docker-compose.yaml.postgres-db_ Compose Deployment (Postgres only).run.xml

@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="docker-compose.yaml.postgres-db: Compose Deployment (Postgres only)" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="envFilePath" value="" />
+        <option name="services">
+          <list>
+            <option value="postgres-db" />
+          </list>
+        </option>
+        <option name="sourceFilePath" value="docker-compose.yaml" />
+        <option name="upNoDeps" value="true" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

Dockerfile

@@ -1,10 +1,9 @@
-FROM library/maven:3-amazoncorretto-21 as maven
+FROM library/maven:3-amazoncorretto-21 AS maven
 
 COPY pom.xml pom.xml
 COPY . .
 
-RUN mvn clean dependency:go-offline -B
-RUN mvn package
+RUN mvn clean dependency:go-offline package -B
 
 
 FROM library/openjdk:21

README.md

@@ -1,12 +1,13 @@
 
 ## Statusportalen api
 Repository inneholder apiet til statusportalen. 
-For å kunne kjøre lokalt trengs en kjørende Postgres server, med databasen navstatus. 
+For å kunne kjøre lokalt trengs en kjørende Postgres server, med databasen navstatus.
 (Se DataSourceTransformer).
 
-Miljøvariable for lokal kjøring: 
+Se [AppConfig.java](config/src/main/java/no/nav/statusplattform/AppConfig.java) for miljøvariabler for lokal kjøring, med defaults.
 
 teamkatalogApiUrl=https://teamkatalog-api.intern.dev.nav.no
 swagger-api-key=key
-DB_PASSWORD=xxxxx
-DB_USERNAME="some username"
+AZURE_APP_CLIENT_ID: local
+AZURE_APP_CLIENT_SECRET: local
+ENV: 

api/pom.xml

@@ -96,6 +96,10 @@
                             <configOptions>
                                 <dateLibrary>java8</dateLibrary>
                             </configOptions>
+                            <!--  ORLENE: Added explicit type mapping from number (e.g. type: number) to BigDecimal, to import in generated files.  -->
+                            <typeMappings>
+                                <typeMapping>number=java.math.BigDecimal</typeMapping>
+                            </typeMappings>
                         </configuration>
                     </execution>
                 </executions>
@@ -113,5 +117,13 @@
                 <version>2.22.2</version>
             </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>target/generated-sources/openapi-java</directory>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
     </build>
 </project>

api/src/main/java/no/nav/statusplattform/api/EntityDtoMappers.java

@@ -17,7 +17,11 @@
 import nav.statusplattform.core.enums.RuleType;
 import nav.statusplattform.core.enums.ServiceStatus;
 import nav.statusplattform.core.enums.ServiceType;
+import nav.statusplattform.core.openingHours.TimeSpan;
+import nav.statusplattform.core.openingHours.UpTimeTotals;
 import no.nav.statusplattform.api.TeamKatalogIntegrasjon.TeamKatalogKlient;
+
+
 import no.nav.statusplattform.generated.api.AreaDto;
 import no.nav.statusplattform.generated.api.DashboardDto;
 import no.nav.statusplattform.generated.api.DashboardNameIdDto;
@@ -32,7 +36,10 @@
 import no.nav.statusplattform.generated.api.ServiceTypeDto;
 import no.nav.statusplattform.generated.api.StatusDto;
 import no.nav.statusplattform.generated.api.SubAreaDto;
+import no.nav.statusplattform.generated.api.UpTimeTotalsDto;
+
 
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
@@ -171,6 +178,7 @@ public static OpsMessageEntity toOpsMessageEntity(OPSmessageDto opsMessageDto) {
         return opsMessageEntity;
     }
 
+
     public static ServiceDto toServiceDtoDeep(ServiceEntity service ,List<ServiceEntity> dependencies){
         Map<ServiceEntity, List<ServiceEntity>> map = new HashMap<>();
         map.put(service,dependencies);
@@ -257,6 +265,14 @@ public static DashboardDto toDashboardDtoDeep(Map.Entry<DashboardEntity,List<Are
         return dto;
     }
 
+    // Convert a list of entries into a list of DashboardDto objects
+    public static List<DashboardDto> toDashboardDtoDeepList(List<Map.Entry<DashboardEntity, List<AreaWithServices>>> dashboardEntries) {
+        return dashboardEntries.stream()
+                .map(EntityDtoMappers::toDashboardDtoDeep) // Using the existing conversion method for each entry
+                .collect(Collectors.toList());
+    }
+
+
     public static DashboardNameIdDto toDashboardDtoShallow(DashboardEntity entity){
         DashboardNameIdDto dto = new DashboardNameIdDto();
         dto.setId(entity.getId());
@@ -381,4 +397,12 @@ public static HelpTextEntity toHelpTextEntity(HelpTextDto dto){
         entity.setContent(dto.getContent());
         return entity;
     }
+
+    public static UpTimeTotalsDto toUpTimeTotalsDto(final UpTimeTotals upTimeTotals) {
+        //Orlene: Using BigDecimal as expected by the DTO.
+        var dto = new UpTimeTotalsDto();
+        dto.setSumOfActualUptime(BigDecimal.valueOf(upTimeTotals.sumOfActualUptime()));
+        dto.setSumOfExpectedUptime(BigDecimal.valueOf(upTimeTotals.sumOfExpectedUptime()));
+        return dto;
+    }
 }

api/src/main/java/no/nav/statusplattform/api/Helpers/OpeningHoursHelper.java

@@ -13,10 +13,8 @@
 import org.fluentjdbc.DbContext;
 
 import java.time.LocalDate;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
+
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class OpeningHoursHelper {
@@ -119,4 +117,5 @@ public void setOpeningHoursToService(UUID groupId, UUID serviceId) {
         OpeningHoursDailyMap.populateMap(openingHoursRepository);
 
     }
+
 }

api/src/main/java/no/nav/statusplattform/api/Helpers/OpsControllerHelper.java

@@ -86,4 +86,14 @@ public List<OPSmessageDto> getOpsMessagesForDashboard(DashboardDto dashboardDto)
 
         return  result;
     }
+
+    public List<OPSmessageDto> getOpsMessagesByServiceIds(List<String> serviceIds) {
+        // Convert list of service IDs to UUIDs
+        List<UUID> serviceUUIDs = serviceIds.stream().map(UUID::fromString).collect(Collectors.toList());
+
+        // Fetch messages from the repository
+        return opsRepository.findOpsMessagesByServiceIds(serviceUUIDs).stream()
+                .map(EntityDtoMappers::toOpsMessageDtoShallow)
+                .collect(Collectors.toList());
+    }
 }

api/src/main/java/no/nav/statusplattform/api/Helpers/UpTimeHelper.java

@@ -0,0 +1,27 @@
+package no.nav.statusplattform.api.Helpers;
+
+
+import no.nav.statusplattform.generated.api.UpTimeTotalsDto;
+import nav.statusplattform.core.openingHours.TimeSpan;
+import nav.statusplattform.core.openingHours.UpTimeCalculator;
+import nav.statusplattform.core.repositories.OpeningHoursRepository;
+import nav.statusplattform.core.repositories.RecordRepository;
+import no.nav.statusplattform.api.EntityDtoMappers;
+import org.fluentjdbc.DbContext;
+
+
+import java.util.UUID;
+
+public class UpTimeHelper {
+
+    private final UpTimeCalculator upTimeCalculator;
+
+
+    public UpTimeHelper(DbContext dbContext) {
+        this.upTimeCalculator = new UpTimeCalculator(new RecordRepository(dbContext), new OpeningHoursRepository(dbContext));
+    }
+
+    public UpTimeTotalsDto getServiceUpTimeSums(UUID service_id, TimeSpan timeSpan) {
+        return EntityDtoMappers.toUpTimeTotalsDto(upTimeCalculator.calculateUpTimeForService(service_id, timeSpan));
+    }
+}

api/src/main/java/no/nav/statusplattform/api/StatusplattformApi.java

@@ -1,14 +1,6 @@
 package no.nav.statusplattform.api;
 
-import no.nav.statusplattform.api.v3.controllers.AreaController;
-import no.nav.statusplattform.api.v3.controllers.DashboardController;
-import no.nav.statusplattform.api.v3.controllers.HealthCheck;
-import no.nav.statusplattform.api.v3.controllers.OpeningHoursController;
-import no.nav.statusplattform.api.v3.controllers.OpsController;
-import no.nav.statusplattform.api.v3.controllers.RecordController;
-import no.nav.statusplattform.api.v3.controllers.ServiceController;
-import no.nav.statusplattform.api.v3.controllers.UserController;
-import no.nav.statusplattform.api.v3.controllers.WcagController;
+import no.nav.statusplattform.api.v3.controllers.*;
 import no.nav.statusplattform.infrastructure.ApiFilter;
 import no.nav.statusplattform.infrastructure.AuthenticationFilter;
 import no.nav.statusplattform.infrastructure.CORSFilter;
@@ -37,6 +29,7 @@ public StatusplattformApi(String context) {
         corsFilter = new CORSFilter();
         addFilter(new FilterHolder(corsFilter),"/*", EnumSet.of(DispatcherType.REQUEST));
         addServlet(new ServletHolder(new WebJarServlet("swagger-ui")), "/swagger/*");
+        var dbContext = new DbContext();
         addServlet(new ServletHolder(new ApiServlet(List.of(
                 new AreaController(dbContext),
                 new DashboardController(dbContext),
@@ -46,7 +39,9 @@ public StatusplattformApi(String context) {
                 new OpeningHoursController(dbContext),
                 new HealthCheck(dbContext),
                 new UserController(),
-                new WcagController()
+                new WcagController(),
+                new UpTimeController(dbContext),
+                new TeamKatalogController()
         ))), "/*");
 
         addFilter(new FilterHolder( new AuthenticationFilter()), "/*", EnumSet.of(DispatcherType.REQUEST));