Combining migration scripts into one, removing redundant classes, min…

…or renaming and imports notation

src/main/java/org/ohdsi/webapi/tool/Tool.java

@@ -35,7 +35,7 @@ public class Tool extends CommonEntity<Integer> {
     @Column(name = "description")
     private String description;
     @Column(name = "is_enabled")
-    private Boolean isEnabled;
+    private Boolean enabled;
 
     @Override
     public Integer getId() {
@@ -71,11 +71,11 @@ public void setDescription(String description) {
     }
 
     public Boolean getEnabled() {
-        return isEnabled;
+        return enabled;
     }
 
     public void setEnabled(Boolean enabled) {
-        isEnabled = enabled;
+        this.enabled = enabled;
     }
 
     @Override

src/main/java/org/ohdsi/webapi/tool/ToolController.java

@@ -3,7 +3,14 @@
 import org.ohdsi.webapi.tool.dto.ToolDTO;
 import org.springframework.stereotype.Controller;
 
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.util.List;
 

src/main/java/org/ohdsi/webapi/tool/ToolServiceImpl.java

@@ -1,41 +1,44 @@
 package org.ohdsi.webapi.tool;
 
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.shiro.SecurityUtils;
 import org.ohdsi.webapi.service.AbstractDaoService;
 import org.ohdsi.webapi.shiro.Entities.UserEntity;
-import org.ohdsi.webapi.tool.converter.ToolConvertor;
 import org.ohdsi.webapi.tool.dto.ToolDTO;
 import org.springframework.stereotype.Service;
 
 @Service
 public class ToolServiceImpl extends AbstractDaoService implements ToolService {
+    private static final String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
     private final ToolRepository toolRepository;
-    private final ToolConvertor toolConvertor;
 
-    public ToolServiceImpl(ToolRepository toolRepository, ToolConvertor toolConvertor) {
+    public ToolServiceImpl(ToolRepository toolRepository) {
         this.toolRepository = toolRepository;
-        this.toolConvertor = toolConvertor;
     }
 
     @Override
     public List<ToolDTO> getTools() {
         List<Tool> tools = (isAdmin() || canManageTools()) ? toolRepository.findAll() : toolRepository.findAllByIsEnabled(true);
         return tools.stream()
-                .map(toolConvertor::toDTO).collect(Collectors.toList());
+                .map(this::toDTO).collect(Collectors.toList());
     }
 
     @Override
     public ToolDTO saveTool(ToolDTO toolDTO) {
         Tool tool = saveToolFromDTO(toolDTO, getCurrentUser());
-        return toolConvertor.toDTO(toolRepository.saveAndFlush(tool));
+        return toDTO(toolRepository.saveAndFlush(tool));
     }
 
     private Tool saveToolFromDTO(ToolDTO toolDTO, UserEntity currentUser) {
-        Tool tool = toolConvertor.toEntity(toolDTO);
+        Tool tool = toEntity(toolDTO);
         if (toolDTO.getId() == null) {
             tool.setCreatedBy(currentUser);
         }
@@ -45,7 +48,7 @@ private Tool saveToolFromDTO(ToolDTO toolDTO, UserEntity currentUser) {
 
     @Override
     public ToolDTO getById(Integer id) {
-        return toolConvertor.toDTO(toolRepository.findOne(id));
+        return toDTO(toolRepository.findOne(id));
     }
 
     @Override
@@ -57,4 +60,61 @@ private boolean canManageTools() {
         return Stream.of("tool:put", "tool:post", "tool:*:delete")
                 .allMatch(permission -> SecurityUtils.getSubject().isPermitted(permission));
     }
+
+    Tool toEntity(ToolDTO toolDTO) {
+        boolean isNewTool = toolDTO.getId() == null;
+        Tool tool = isNewTool ? new Tool() : toolRepository.findOne(toolDTO.getId());
+        Instant currentInstant = Instant.now();
+        if (isNewTool) {
+            setCreationDetails(tool, currentInstant);
+        } else {
+            setModificationDetails(tool, currentInstant);
+        }
+        updateToolFromDTO(tool, toolDTO);
+        return tool;
+    }
+
+    private void setCreationDetails(Tool tool, Instant currentInstant) {
+        tool.setCreatedDate(Date.from(currentInstant));
+        tool.setCreatedBy(getCurrentUser());
+    }
+
+    private void setModificationDetails(Tool tool, Instant currentInstant) {
+        tool.setModifiedDate(Date.from(currentInstant));
+        tool.setModifiedBy(getCurrentUser());
+    }
+
+    private void updateToolFromDTO(Tool tool, ToolDTO toolDTO) {
+        Optional.ofNullable(toolDTO.getName()).ifPresent(tool::setName);
+        Optional.ofNullable(toolDTO.getUrl()).ifPresent(tool::setUrl);
+        Optional.ofNullable(toolDTO.getDescription()).ifPresent(tool::setDescription);
+        Optional.ofNullable(toolDTO.getEnabled()).ifPresent(tool::setEnabled);
+    }
+
+    ToolDTO toDTO(Tool tool) {
+        return Optional.ofNullable(tool)
+                .map(t -> {
+                    ToolDTO toolDTO = new ToolDTO();
+                    toolDTO.setId(t.getId());
+                    toolDTO.setName(t.getName());
+                    toolDTO.setUrl(t.getUrl());
+                    toolDTO.setDescription(t.getDescription());
+                    Optional.ofNullable(tool.getCreatedBy())
+                            .map(UserEntity::getId)
+                            .map(userRepository::findOne)
+                            .map(UserEntity::getName)
+                            .ifPresent(toolDTO::setCreatedByName);
+                    Optional.ofNullable(tool.getModifiedBy())
+                            .map(UserEntity::getId)
+                            .map(userRepository::findOne)
+                            .map(UserEntity::getName)
+                            .ifPresent(toolDTO::setModifiedByName);
+                    toolDTO.setCreatedDate(t.getCreatedDate() != null ? new SimpleDateFormat(DATE_TIME_FORMAT).format(t.getCreatedDate()) : null);
+                    toolDTO.setModifiedDate(t.getModifiedDate() != null ? new SimpleDateFormat(DATE_TIME_FORMAT).format(t.getModifiedDate()) : null);
+                    toolDTO.setEnabled(t.getEnabled());
+                    return toolDTO;
+                })
+                .orElse(null);
+    }
+
 }

src/main/resources/db/migration/postgresql/V2.14.0.20240226195200__tools_module_permissions.sql → src/main/resources/db/migration/postgresql/V2.15.0.20231213141052__create_table_tools_and_permissions.sql

@@ -1,3 +1,22 @@
+CREATE TABLE IF NOT EXISTS ${ohdsiSchema}.tool (
+  id BIGINT,
+  name VARCHAR(255) NOT NULL,
+  url VARCHAR(1000) NOT NULL,
+  description VARCHAR(1000),
+  is_enabled BOOLEAN,
+  created_by_id INTEGER,
+  modified_by_id INTEGER,
+  created_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT (now()),
+  modified_date TIMESTAMP WITH TIME ZONE
+);
+
+ALTER TABLE ${ohdsiSchema}.tool ADD CONSTRAINT PK_tool PRIMARY KEY (id);
+
+ALTER TABLE ${ohdsiSchema}.tool ADD CONSTRAINT fk_tool_ser_user_creator FOREIGN KEY (created_by_id) REFERENCES ${ohdsiSchema}.sec_user(id);
+ALTER TABLE ${ohdsiSchema}.tool ADD CONSTRAINT fk_tool_ser_user_updater FOREIGN KEY (modified_by_id) REFERENCES ${ohdsiSchema}.sec_user(id);
+
+CREATE SEQUENCE ${ohdsiSchema}.tool_seq START WITH 1 INCREMENT BY 1 MAXVALUE 9223372036854775807 NO CYCLE;
+
 INSERT INTO ${ohdsiSchema}.sec_permission(id, value, description) VALUES
     (nextval('${ohdsiSchema}.sec_permission_id_seq'), 'tool:post', 'Create Tool');
 INSERT INTO ${ohdsiSchema}.sec_permission(id, value, description) VALUES
@@ -26,4 +45,4 @@ FROM ${ohdsiSchema}.sec_permission SP, ${ohdsiSchema}.sec_role sr
 WHERE sp.value IN (
     'tool:get',
     'tool:*:get'
-    ) AND sr.name IN ('Atlas users');
+    ) AND sr.name IN ('Atlas users');