FF-251 Delete FileSystemItem API Endpoint (#62)

* FF-251 Added basic structure and exception + handler.

* Cleanup. Reworked custom Exceptions.

* Cleanup. Implemented Change in UnitTests.

* Cleanup. Implemented necessary changes to cucumber steps

* added the .feature file for deleting

* FileSystemItem now includes the User

* fixed copy pesto, added step function

* removed the empty lines

* minor fixes, recusive scenarion for permissions

* Cleanup. Refactored getContentsOfFolder.

* Commented out feature.

* Implemented TODO, updated tests.

* WIP. basic structure, added wip comments

* WIP. added checks for invisible entities.

* WIP. started implementing. Added more comments.

* Fixed Tests.

* FF-251 finished adding logic.

* Added UnitTests (1/2)

* added some comments to understand the recursion

* Fixing, refactoring.

* Added UnitTests (1,95/2)

* Fixing spelling, and minor bugs in feature files.

* Implemented requested changes by @qvalentin

* Some more cleanup.

* Implemented return value, and Cucumber Steps.

* It seems that deleteAll doesnt work, so we need to do that.

* WIP: update tests.

* Fixed broken merge.

* Fixed Tests, finished implementing.

* Added one more scenario

* Bumped Version to v0.0.7

* Implemented changes by @qvalentin

Co-authored-by: qvalentin <[email protected]>

Author: open-schnick

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>de.filefighter</groupId>
     <artifactId>rest</artifactId>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
     <name>RestApi</name>
     <description>RestApi for FileFighter</description>
 

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

@@ -12,21 +12,35 @@
 @Configuration
 public class CorsConfig {
 
-    @Bean
-    @Profile("dev")
-    public CorsFilter corsFilter() {
-        final CorsConfiguration config = new CorsConfiguration().applyPermitDefaultValues();
-        ArrayList<String> allowedOrigins = new ArrayList<>();
-        allowedOrigins.add("*");
-        config.setAllowedOrigins(allowedOrigins);
+    private final ArrayList<String> allowedMethods;
 
-        ArrayList<String> allowedMethods = new ArrayList<>();
+    public CorsConfig() {
+        this.allowedMethods = new ArrayList<>();
         allowedMethods.add("HEAD");
         allowedMethods.add("GET");
         allowedMethods.add("POST");
         allowedMethods.add("PUT");
         allowedMethods.add("DELETE");
         allowedMethods.add("OPTIONS");
+    }
+
+    @Bean
+    @Profile("dev")
+    public CorsFilter corsFilterDev() {
+        final CorsConfiguration config = new CorsConfiguration().applyPermitDefaultValues();
+        ArrayList<String> allowedOrigins = new ArrayList<>();
+        allowedOrigins.add("*");
+        config.setAllowedOrigins(allowedOrigins);
+
+        final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", config);
+        return new CorsFilter(source);
+    }
+
+    @Bean
+    @Profile({"prod","test"})
+    public CorsFilter corsFilterProd() {
+        final CorsConfiguration config = new CorsConfiguration();
         config.setAllowedMethods(allowedMethods);
 
         final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();

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

@@ -77,7 +77,7 @@ CommandLineRunner cleanDataBase(UserRepository userRepository, FileSystemReposit
     CommandLineRunner createRuntimeUser(UserRepository userRepository) {
         return args -> log.info("Preloading system runtime user. {}", userRepository.save(UserEntity
                 .builder()
-                .userId(0L)
+                .userId(RestConfiguration.RUNTIME_USER_ID)
                 .username("FileFighter")
                 .lowercaseUsername("filefighter")
                 .password(null)
@@ -102,7 +102,7 @@ CommandLineRunner initDataBaseProd(UserRepository userRepository, FileSystemRepo
 
             log.info("Preloading default fsStructure: {} {}.", fileSystemRepository.save(FileSystemEntity
                             .builder()
-                            .createdByUserId(0)
+                            .createdByUserId(RestConfiguration.RUNTIME_USER_ID)
                             .fileSystemId(0)
                             .isFile(false)
                             .path("/")
@@ -171,7 +171,7 @@ CommandLineRunner initDataBaseDev(UserRepository userRepository, AccessTokenRepo
 
             log.info("Preloading default fsItems: {} {} {}.",
                     fileSystemRepository.save(FileSystemEntity.builder()
-                            .createdByUserId(0)
+                            .createdByUserId(RestConfiguration.RUNTIME_USER_ID)
                             .fileSystemId(0)
                             .isFile(false)
                             .path("/")
@@ -183,7 +183,7 @@ CommandLineRunner initDataBaseDev(UserRepository userRepository, AccessTokenRepo
                             .visibleForGroupIds(new long[]{FAMILY.getGroupId(), ADMIN.getGroupId()})
                             .build()),
                     fileSystemRepository.save(FileSystemEntity.builder()
-                            .createdByUserId(0)
+                            .createdByUserId(RestConfiguration.RUNTIME_USER_ID)
                             .fileSystemId(1)
                             .isFile(false)
                             .path("/")

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

@@ -10,6 +10,7 @@ public class RestConfiguration {
     public static final String FS_PATH_HEADER = "X-FF-PATH";
     public static final String USER_BASE_URI = "/users/";
     public static final String DEFAULT_ERROR_URI = "/error";
+    public static final long RUNTIME_USER_ID = 0;
 
     private RestConfiguration(){
         // Cannot be instantiated.

src/main/java/de/filefighter/rest/rest/exceptions/DataBaseExceptionAdvise.java renamed to src/main/java/de/filefighter/rest/domain/common/exceptions/DataBaseExceptionAdvise.java

@@ -1,4 +1,4 @@
-package de.filefighter.rest.rest.exceptions;
+package de.filefighter.rest.domain.common.exceptions;
 
 import de.filefighter.rest.domain.health.business.SystemHealthBusinessService;
 import de.filefighter.rest.domain.health.data.SystemHealth;

src/main/java/de/filefighter/rest/domain/common/exceptions/FileFighterDataException.java

@@ -0,0 +1,16 @@
+package de.filefighter.rest.domain.common.exceptions;
+
+import org.springframework.dao.DataAccessException;
+
+public class FileFighterDataException extends DataAccessException implements FileFighterException {
+
+    private static final String ERROR_MESSAGE_PREFIX = "Internal Error occurred.";
+
+    public FileFighterDataException(String msg) {
+        super(ERROR_MESSAGE_PREFIX + " " + msg);
+    }
+
+    public static String getErrorMessagePrefix() {
+        return ERROR_MESSAGE_PREFIX;
+    }
+}

src/main/java/de/filefighter/rest/domain/common/exceptions/FileFighterException.java

@@ -0,0 +1,7 @@
+package de.filefighter.rest.domain.common.exceptions;
+
+public interface FileFighterException {
+    static String getErrorMessagePrefix() {
+        throw new IllegalArgumentException("Custom exception should overwrite this message.");
+    }
+}

src/main/java/de/filefighter/rest/domain/common/InputSanitizerService.java renamed to src/main/java/de/filefighter/rest/domain/common/exceptions/InputSanitizerService.java

@@ -1,6 +1,5 @@
-package de.filefighter.rest.domain.common;
+package de.filefighter.rest.domain.common.exceptions;
 
-import de.filefighter.rest.rest.exceptions.RequestDidntMeetFormalRequirementsException;
 import org.springframework.stereotype.Service;
 
 @Service

src/main/java/de/filefighter/rest/rest/exceptions/RequestDidntMeetFormalRequirementsAdvise.java renamed to src/main/java/de/filefighter/rest/domain/common/exceptions/RequestDidntMeetFormalRequirementsAdvise.java

@@ -1,4 +1,4 @@
-package de.filefighter.rest.rest.exceptions;
+package de.filefighter.rest.domain.common.exceptions;
 
 import de.filefighter.rest.rest.ServerResponse;
 import lombok.extern.log4j.Log4j2;

src/main/java/de/filefighter/rest/domain/common/exceptions/RequestDidntMeetFormalRequirementsException.java

@@ -0,0 +1,18 @@
+package de.filefighter.rest.domain.common.exceptions;
+
+public class RequestDidntMeetFormalRequirementsException extends RuntimeException implements FileFighterException {
+
+    private static final String ERROR_MESSAGE_PREFIX = "Request didnt meet formal requirements.";
+
+    public RequestDidntMeetFormalRequirementsException() {
+        super(ERROR_MESSAGE_PREFIX);
+    }
+
+    public RequestDidntMeetFormalRequirementsException(String reason) {
+        super(ERROR_MESSAGE_PREFIX + " " + reason);
+    }
+
+    public static String getErrorMessagePrefix() {
+        return ERROR_MESSAGE_PREFIX;
+    }
+}