FF-73 added default users

* fixed tests.

* Updated to 0.0.2, added unknown role, added UserBusinessService, added user count to SystemHealth

* removed integrations test due to upcoming feature tests.

* Update feature_branch_tests.yml

Author: open-schnick

.github/workflows/feature_branch_tests.yml

@@ -1,6 +1,7 @@
 name: Feature Branch Release
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - 'feature/**'
@@ -44,5 +45,7 @@ jobs:
         run: |
           IMAGE_ID=$(docker images rest -q)
           VERSION=${{ steps.vars.outputs.branch }}
+          IFS=';' read -ra ADDR <<< "$VERSION"
+          VERSION=ADDR[1]
           docker tag $IMAGE_ID filefighter/rest:$VERSION
-          docker push filefighter/rest:$VERSION
+          docker push filefighter/rest:$VERSION

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>de.filefighter</groupId>
     <artifactId>rest</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>0.0.2</version>
     <name>rest</name>
     <description>RestApi</description>
 

src/main/java/de/filefighter/rest/configuration/PrepareDataBaseProd.java

@@ -0,0 +1,29 @@
+package de.filefighter.rest.configuration;
+
+import de.filefighter.rest.domain.user.data.persistance.UserEntitiy;
+import de.filefighter.rest.domain.user.data.persistance.UserRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("dev")
+public class PrepareDataBaseProd {
+
+    private static final Logger LOG = LoggerFactory.getLogger(PrepareDataBaseProd.class);
+
+    @Bean
+    CommandLineRunner initUserDataBase(UserRepository repository) {
+
+        //Note: when the admin user changes his/her password, a new refreshToken will be created.
+        return args -> {
+            LOG.info("Starting with clean user collection.");
+            repository.deleteAll();
+            LOG.info("Preloading default admin user: " + repository.save(new UserEntitiy(0L, "admin", "admin", "refreshToken1234", 0, 1)));
+            LOG.info("Loading Users" + (repository.findAll().size() == 1 ? " was successful." : " failed."));
+        };
+    }
+}

src/main/java/de/filefighter/rest/config/RestConfiguration.java renamed to src/main/java/de/filefighter/rest/configuration/RestConfiguration.java

@@ -1,4 +1,4 @@
-package de.filefighter.rest.config;
+package de.filefighter.rest.configuration;
 
 import org.jetbrains.annotations.NotNull;
 import org.springframework.context.annotation.Bean;

src/main/java/de/filefighter/rest/config/SwaggerConfiguration.java renamed to src/main/java/de/filefighter/rest/configuration/SwaggerConfiguration.java

@@ -1,4 +1,4 @@
-package de.filefighter.rest.config;
+package de.filefighter.rest.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/de/filefighter/rest/domain/filesystem/rest/FileSystemRestController.java

@@ -10,7 +10,7 @@
 import org.springframework.hateoas.EntityModel;
 import org.springframework.web.bind.annotation.*;
 
-import static de.filefighter.rest.config.RestConfiguration.*;
+import static de.filefighter.rest.configuration.RestConfiguration.*;
 
 @RestController
 @Api(value = "FileSystem Rest Controller", tags = {"FileSystem"})

src/main/java/de/filefighter/rest/domain/health/business/SystemHealthBusinessService.java

@@ -1,23 +1,27 @@
 package de.filefighter.rest.domain.health.business;
 
 import de.filefighter.rest.domain.health.data.SystemHealth;
+import de.filefighter.rest.domain.user.business.UserBusinessService;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
 
 @Service
 public class SystemHealthBusinessService {
 
+    private final UserBusinessService userBusinessService;
     private final long serverStartedAt;
 
-    public SystemHealthBusinessService() {
+    public SystemHealthBusinessService(UserBusinessService userBusinessService) {
+        this.userBusinessService = userBusinessService;
         this.serverStartedAt = this.getCurrentEpochSeconds();
     }
 
     public SystemHealth getCurrentSystemHealthInfo(){
         long currentEpoch = getCurrentEpochSeconds();
         return SystemHealth.builder()
                 .uptimeInSeconds(currentEpoch - serverStartedAt)
+                .userCount(userBusinessService.getUserCount())
                 .create();
     }
 

src/main/java/de/filefighter/rest/domain/health/data/SystemHealth.java

@@ -11,4 +11,5 @@
 @Builder(buildMethodName = "create")
 public class SystemHealth {
     private final long uptimeInSeconds;
+    private final long userCount;
 }

src/main/java/de/filefighter/rest/domain/permission/rest/PermissionRestController.java

@@ -7,7 +7,7 @@
 import org.springframework.hateoas.EntityModel;
 import org.springframework.web.bind.annotation.*;
 
-import static de.filefighter.rest.config.RestConfiguration.*;
+import static de.filefighter.rest.configuration.RestConfiguration.*;
 
 @RestController
 @Api(value = "Permissions Controller", tags = {"Permissions"})

src/main/java/de/filefighter/rest/domain/user/business/UserBusinessService.java

@@ -0,0 +1,17 @@
+package de.filefighter.rest.domain.user.business;
+
+import de.filefighter.rest.domain.user.data.persistance.UserRepository;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserBusinessService {
+    private final UserRepository userRepository;
+
+    public UserBusinessService(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    public long getUserCount(){
+        return userRepository.count();
+    }
+}