moved the mapping part of List<WebUserOverview> getOverview(WebUserQueryForm form) to WebUserService

Author: fnkbsi

src/main/java/de/rwth/idsg/steve/repository/WebUserRepository.java

@@ -19,9 +19,12 @@
 package de.rwth.idsg.steve.repository;
 
 import jooq.steve.db.tables.records.WebUserRecord;
-import de.rwth.idsg.steve.repository.dto.WebUserOverview;
+import de.rwth.idsg.steve.service.dto.WebUserOverview;
 import de.rwth.idsg.steve.web.dto.WebUserQueryForm;
 import java.util.List;
+import org.jooq.JSON;
+import org.jooq.Record4;
+import org.jooq.Result;
 
 public interface WebUserRepository  {
 
@@ -44,6 +47,7 @@ public interface WebUserRepository  {
     WebUserRecord loadUserByUsePk(Integer webUserPk);
     WebUserRecord loadUserByUsername(String username);
 
-    List<WebUserOverview> getOverview(WebUserQueryForm form);
+    //List<WebUserOverview> getOverview(WebUserQueryForm form);
+    Result<Record4<Integer, String, Boolean, JSON>> getOverview(WebUserQueryForm form);
 
 }

src/main/java/de/rwth/idsg/steve/repository/impl/WebUserRepositoryImpl.java

@@ -18,12 +18,8 @@
  */
 package de.rwth.idsg.steve.repository.impl;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import de.rwth.idsg.steve.repository.WebUserRepository;
-import de.rwth.idsg.steve.repository.dto.WebUserOverview;
 import de.rwth.idsg.steve.web.dto.WebUserQueryForm;
-import java.util.List;
 import jooq.steve.db.tables.records.WebUserRecord;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -48,7 +44,6 @@
 public class WebUserRepositoryImpl implements WebUserRepository {
 
     private final DSLContext ctx;
-    private final ObjectMapper jacksonObjectMapper;
 
     @Override
     public void createUser(WebUserRecord user) {
@@ -141,29 +136,9 @@ public WebUserRecord loadUserByUsePk(Integer webUserPk) {
             .where(WEB_USER.WEB_USER_PK.eq(webUserPk))
             .fetchOne();
     }
-
+    
     @Override
-    public List<WebUserOverview> getOverview(WebUserQueryForm form) {
-        return getOverviewInternal(form)
-                .map(r -> WebUserOverview.builder()
-                        .webUserPk(r.value1())
-                        .webusername(r.value2())
-                        .enabled(r.value3())
-                        .autorithies(fromJson(r.value4()))
-                        .build()
-                );
-    }
-
-     private String[] fromJson(JSON jsonArray) {
-        try {
-            return jacksonObjectMapper.readValue(jsonArray.data(), String[].class);
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private Result<Record4<Integer, String, Boolean, JSON>> getOverviewInternal(WebUserQueryForm form) {
+    public Result<Record4<Integer, String, Boolean, JSON>> getOverview(WebUserQueryForm form) {
         SelectQuery selectQuery = ctx.selectQuery();
         selectQuery.addFrom(WEB_USER);
         selectQuery.addSelect(
@@ -174,7 +149,7 @@ private Result<Record4<Integer, String, Boolean, JSON>> getOverviewInternal(WebU
         );
 
         if (form.isSetWebusername()) {
-            selectQuery.addConditions(WEB_USER.USERNAME.eq(form.getWebusername()));
+            selectQuery.addConditions(WEB_USER.USERNAME.eq(form.getWebUsername()));
         }
 
         if (form.isSetEnabled()) {
@@ -184,8 +159,8 @@ private Result<Record4<Integer, String, Boolean, JSON>> getOverviewInternal(WebU
         if (form.isSetRoles()) {
             String[] roles = form.getRoles().split(","); //Semicolon seperated String to StringArray
             for (String role : roles) {
-                JSON authValue = JSON.json("\"" + role.strip() + "\"");
-                selectQuery.addConditions(condition("json_contains({0}, {1})", WEB_USER.AUTHORITIES, authValue)); // strip--> No Withspace
+                JSON authValue = JSON.json("\"" + role.strip() + "\""); // strip --> No Withspace
+                selectQuery.addConditions(condition("json_contains({0}, {1})", WEB_USER.AUTHORITIES, authValue)); 
             }
         }
 

src/main/java/de/rwth/idsg/steve/service/WebUserService.java

@@ -23,7 +23,7 @@
 import de.rwth.idsg.steve.SteveConfiguration;
 import de.rwth.idsg.steve.SteveException;
 import de.rwth.idsg.steve.repository.WebUserRepository;
-import de.rwth.idsg.steve.repository.dto.WebUserOverview;
+import de.rwth.idsg.steve.service.dto.WebUserOverview;
 import de.rwth.idsg.steve.web.dto.WebUserForm;
 import de.rwth.idsg.steve.web.dto.WebUserQueryForm;
 import java.util.ArrayList;
@@ -171,24 +171,32 @@ public void add(WebUserForm form) {
     public void update(WebUserForm form) {
         updateUser(toUserDetails(form));
     }
-
+    
     public List<WebUserOverview> getOverview(WebUserQueryForm form) {
-        return webUserRepository.getOverview(form);
+        return webUserRepository.getOverview(form)
+                .map(r -> WebUserOverview.builder()
+                        .webUserPk(r.value1())
+                        .webUsername(r.value2())
+                        .enabled(r.value3())
+                        .authorities(fromJson(r.value4()))
+                        .build()
+                );
     }
 
-    public WebUserForm getDetails(Integer webuserpk) {
-        WebUserRecord ur = webUserRepository.loadUserByUsePk(webuserpk);
+
+    public WebUserForm getDetails(Integer webUserPk) {
+        WebUserRecord ur = webUserRepository.loadUserByUsePk(webUserPk);
 
         if (ur == null) {
-            throw new SteveException("There is no user with id '%d'", webuserpk);
+            throw new SteveException("There is no user with id '%d'", webUserPk);
         }
 
         WebUserForm form = new WebUserForm();
 
         form.setEnabled(ur.getEnabled());
-        form.setWebusername(ur.getUsername());
+        form.setWebUsername(ur.getUsername());
         form.setPassword(ur.getPassword());
-        form.setApitoken(ur.getApiToken());
+        form.setApiToken(ur.getApiToken());
         form.setAuthorities(rolesStr(fromJson(ur.getAuthorities())));
 
         return form;
@@ -224,15 +232,14 @@ private UserDetails toUserDetails(WebUserForm form) {
             encPw = encoder.encode(form.getPassword());
         }
         var user = User
-                .withUsername(form.getWebusername())
+                .withUsername(form.getWebUsername())
                 .password(encPw)
                 .disabled(!form.getEnabled())
                 .authorities(toAuthorities(form.getAuthorities()))
                 .build();
         return user;
     }
 
-
     private String[] fromJson(JSON jsonArray) {
         try {
             return jacksonObjectMapper.readValue(jsonArray.data(), String[].class);