refactor(backend): renamed many things #541

Author: fstreit1

backend/src/main/java/ch/puzzle/pcts/controller/ConfigurationController.java

@@ -5,7 +5,7 @@
 import ch.puzzle.pcts.dto.appconfiguration.AppConfigurationDto;
 import ch.puzzle.pcts.dto.configuration.ConfigurationDto;
 import ch.puzzle.pcts.mapper.AppConfigurationMapper;
-import ch.puzzle.pcts.mapper.ConfigurationMapper;
+import ch.puzzle.pcts.mapper.AuthorizationMapper;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,26 +16,26 @@
 @RequestMapping("/api/v1/configuration")
 @Tag(name = "configuration", description = "Retrieve configuration properties for the application")
 public class ConfigurationController {
-    private final ConfigurationMapper configMapper;
+    private final AuthorizationMapper authMapper;
     private final AuthorizationConfiguration authConfig;
     private final AppConfigurationMapper appConfigMapper;
     private final AppConfiguration appConfig;
 
-    public ConfigurationController(ConfigurationMapper configMapper, AuthorizationConfiguration authConfig,
+    public ConfigurationController(AuthorizationMapper authMapper, AuthorizationConfiguration authConfig,
                                    AppConfigurationMapper appConfigMapper, AppConfiguration appConfig) {
-        this.configMapper = configMapper;
+        this.authMapper = authMapper;
         this.authConfig = authConfig;
         this.appConfigMapper = appConfigMapper;
         this.appConfig = appConfig;
     }
 
     @GetMapping("/authorization")
     public ResponseEntity<ConfigurationDto> getAuthorizationConfiguration() {
-        return ResponseEntity.ok(configMapper.toDto(this.authConfig));
+        return ResponseEntity.ok(authMapper.toDto(this.authConfig));
     }
 
     @GetMapping("/app")
-    public ResponseEntity<AppConfigurationDto> getHelpUrl() {
-        return ResponseEntity.ok(appConfigMapper.toDto(this.appConfig.getHelpUrl()));
+    public ResponseEntity<AppConfigurationDto> getAppConfiguration() {
+        return ResponseEntity.ok(appConfigMapper.toDto(this.appConfig));
     }
 }

backend/src/main/java/ch/puzzle/pcts/dto/appconfiguration/AppConfigurationDto.java

@@ -2,6 +2,7 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-public record AppConfigurationDto(@Schema(description = "Provides the url the help button should lead to") String url) {
+public record AppConfigurationDto(
+        @Schema(description = "Provides the URL the help button should lead to") String helpUrl) {
 
 }

backend/src/main/java/ch/puzzle/pcts/mapper/AppConfigurationMapper.java

@@ -1,11 +1,12 @@
 package ch.puzzle.pcts.mapper;
 
+import ch.puzzle.pcts.configuration.AppConfiguration;
 import ch.puzzle.pcts.dto.appconfiguration.AppConfigurationDto;
 import org.springframework.stereotype.Component;
 
 @Component
 public class AppConfigurationMapper {
-    public AppConfigurationDto toDto(String url) {
-        return new AppConfigurationDto(url);
+    public AppConfigurationDto toDto(AppConfiguration appConfig) {
+        return new AppConfigurationDto(appConfig.getHelpUrl());
     }
 }

backend/src/test/java/ch/puzzle/pcts/controller/ConfigurationControllerIT.java

@@ -10,7 +10,7 @@
 import ch.puzzle.pcts.dto.appconfiguration.AppConfigurationDto;
 import ch.puzzle.pcts.dto.configuration.ConfigurationDto;
 import ch.puzzle.pcts.mapper.AppConfigurationMapper;
-import ch.puzzle.pcts.mapper.ConfigurationMapper;
+import ch.puzzle.pcts.mapper.AuthorizationMapper;
 import ch.puzzle.pcts.util.JsonDtoMatcher;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
@@ -32,7 +32,7 @@ class ConfigurationControllerIT extends ControllerITBase {
     private AppConfiguration appConfiguration;
 
     @MockitoBean
-    private ConfigurationMapper configMapper;
+    private AuthorizationMapper configMapper;
 
     @MockitoBean
     private AppConfigurationMapper appConfigurationMapper;
@@ -68,13 +68,14 @@ void shouldSuccessfullyGetConfiguration() throws Exception {
     @DisplayName("Should successfully get support page url")
     @Test
     void shouldSuccessfullyGetSupportPageUrl() throws Exception {
+        AppConfiguration appConfig = new AppConfiguration(SUPPORT_URL);
         when(appConfiguration.getHelpUrl()).thenReturn(SUPPORT_URL);
-        when(appConfigurationMapper.toDto(SUPPORT_URL)).thenReturn(appConfigurationDto);
+        when(appConfigurationMapper.toDto(appConfig)).thenReturn(appConfigurationDto);
 
         mvc
                 .perform(get(BASEURL + "/app").with(csrf()).accept(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk())
-                .andExpect(JsonDtoMatcher.matchesDto(appConfigurationDto, "$"));
+                .andExpect(JsonDtoMatcher.matchesDto(appConfigurationDto.helpUrl(), "$"));
     }
 
 }