project improvements — config, tests, refactoring, and new features

.gitignore

@@ -5,5 +5,5 @@ target
 logs
 attachments
 *.patch
-
+.env
 

Dockerfile

@@ -0,0 +1,19 @@
+FROM maven:3.9-eclipse-temurin-17 AS build
+
+WORKDIR /build
+COPY pom.xml .
+
+RUN mvn dependency:go-offline
+COPY src ./src
+
+RUN mvn clean package -DskipTests
+
+FROM eclipse-temurin:17-jre-alpine
+WORKDIR /app
+
+COPY --from=build /build/target/jira-1.0.jar app.jar
+COPY resources ./resources
+
+EXPOSE 8081
+
+ENTRYPOINT ["java", "-jar", "app.jar", "--spring.profiles.active=prod"]

README.md

@@ -27,4 +27,11 @@
 - https://habr.com/ru/articles/259055/
 
 Список выполненных задач:
-...
+- Task 2. Remove VK and Yandex social login providers
+- Task 3. Move sensitive config (DB, OAuth, mail) to env variables
+- Task 4. Switch tests to H2 in-memory DB with Spring profile selection
+- Task 5. Add tests for ProfileRestController (success and failure paths)
+- Task 6. Refactor FileUtil#upload to use modern NIO API
+- Task 8. Add task time tracking (in-progress and testing duration)
+- Task 9. Add Dockerfile for the application server
+- Task 10. Add Dockerfile for the application server, DB and nginx

config/_application-prod.yaml

@@ -3,7 +3,7 @@ app:
   host-url: http://localhost
 spring:
   datasource:
-    url: jdbc:postgresql://localhost:5432/jira
+    url: jdbc:postgresql://jira-db:5432/jira
     username: jira
     password: JiraRush
 

config/nginx.conf

@@ -20,18 +20,19 @@ server {
   location /static/ {
     expires 30d;
     access_log off;
+    proxy_pass http://jira-app:8081;
   }
   location /robots.txt {
     access_log off;
   }
 
   location ~ (/$|/view/|/ui/|/oauth2/) {
     expires 0m;
-    proxy_pass http://localhost:8080;
+    proxy_pass http://jira-app:8081;
       proxy_connect_timeout 30s;
   }
   location ~ (/api/|/doc|/swagger-ui/|/v3/api-docs/) {
-    proxy_pass http://localhost:8080;
+    proxy_pass http://jira-app:8081;
       proxy_connect_timeout 150s;
   }
   location / {

docker-compose.yml

@@ -0,0 +1,56 @@
+version: '3.9'
+
+services:
+  jira-db:
+    image: postgres:15-alpine
+    container_name: postgres-db
+    restart: always
+    environment:
+      POSTGRES_USER: jira
+      POSTGRES_PASSWORD: JiraRush
+      POSTGRES_DB: jira
+    ports:
+      - "5434:5432"
+    volumes:
+      - jira-db-data:/var/lib/postgresql/data
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U jira -d jira" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  app:
+    build: .
+    container_name: jira-app
+    restart: always
+    env_file:
+      - .env
+    environment:
+      DB_URL: jdbc:postgresql://jira-db:5432/jira
+#    ports:
+#      - "8080:8081"
+    volumes:
+      - app-logs:/app/logs
+      - app-attachments:/app/attachments
+#      - app-resources:/app/resources
+    depends_on:
+      jira-db:
+        condition: service_healthy
+
+  nginx:
+    image: nginx:alpine
+    container_name: jira-nginx
+    restart: always
+    ports:
+      - "80:80"
+    volumes:
+      - ./config/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+#      - app-resources:/opt/jirarush/resources:ro
+    depends_on:
+      - app
+
+volumes:
+  jira-db-data:
+  app-logs:
+  app-attachments:
+#  app-resources:

pom.xml

@@ -142,6 +142,11 @@
             <artifactId>junit-platform-launcher</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>

resources/view/login.html

@@ -48,14 +48,6 @@ <h3 class="mb-3">Sign in</h3>
                            type="button">
                             <i class="fa-brands fa-google"></i>
                         </a>
-                        <a class="btn btn-primary btn-lg me-2" href="/oauth2/authorization/vk" style="padding-left: 17px; padding-right: 17px;"
-                           type="button">
-                            <i class="fa-brands fa-vk"></i>
-                        </a>
-                        <a class="btn btn-danger btn-lg me-2" href="/oauth2/authorization/yandex" style="padding-left: 21px; padding-right: 21px;"
-                           type="button">
-                            <i class="fa-brands fa-yandex"></i>
-                        </a>
                         <a class="btn btn-dark btn-lg me-2" href="/oauth2/authorization/github" type="button">
                             <i class="fa-brands fa-github"></i>
                         </a>

resources/view/unauth/register.html

@@ -77,14 +77,6 @@ <h3 class="mb-3">Registration</h3>
                            type="button">
                             <i class="fa-brands fa-google"></i>
                         </a>
-                        <a class="btn btn-primary btn-lg me-2" href="/oauth2/authorization/vk" style="padding-left: 17px; padding-right: 17px;"
-                           type="button">
-                            <i class="fa-brands fa-vk"></i>
-                        </a>
-                        <a class="btn btn-danger btn-lg me-2" href="/oauth2/authorization/yandex" style="padding-left: 21px; padding-right: 21px;"
-                           type="button">
-                            <i class="fa-brands fa-yandex"></i>
-                        </a>
                         <a class="btn btn-dark btn-lg me-2" href="/oauth2/authorization/github" type="button">
                             <i class="fa-brands fa-github"></i>
                         </a>

src/main/java/com/javarush/jira/bugtracking/attachment/FileUtil.java

@@ -7,14 +7,12 @@
 import org.springframework.core.io.UrlResource;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 
 @UtilityClass
 public class FileUtil {
@@ -25,14 +23,13 @@ public static void upload(MultipartFile multipartFile, String directoryPath, Str
             throw new IllegalRequestDataException("Select a file to upload.");
         }
 
-        File dir = new File(directoryPath);
-        if (dir.exists() || dir.mkdirs()) {
-            File file = new File(directoryPath + fileName);
-            try (OutputStream outStream = new FileOutputStream(file)) {
-                outStream.write(multipartFile.getBytes());
-            } catch (IOException ex) {
-                throw new IllegalRequestDataException("Failed to upload file" + multipartFile.getOriginalFilename());
-            }
+        try {
+            Path dirPath = Path.of(directoryPath);
+            Files.createDirectories(dirPath);
+            Path filePath = dirPath.resolve(fileName);
+            Files.copy(multipartFile.getInputStream(), filePath, StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException ex) {
+            throw new IllegalRequestDataException("Failed to upload file: " + multipartFile.getOriginalFilename());
         }
     }
 

src/main/java/com/javarush/jira/bugtracking/task/TaskService.java

@@ -19,8 +19,10 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 
 import static com.javarush.jira.bugtracking.ObjectType.TASK;
 import static com.javarush.jira.bugtracking.task.TaskUtil.fillExtraFields;
@@ -140,4 +142,33 @@ private void checkAssignmentActionPossible(long id, String userType, boolean ass
             throw new DataConflictException(String.format(assign ? CANNOT_ASSIGN : CANNOT_UN_ASSIGN, userType, task.getStatusCode()));
         }
     }
+
+    public Duration getInProgressDuration(long taskId) {
+        List<Activity> activities = activityHandler.getRepository().findAllByTaskIdOrderByUpdatedDesc(taskId);
+        LocalDateTime inProgress = getStatusTime(activities, "in_progress");
+        LocalDateTime readyForReview = getStatusTime(activities, "ready_for_review");
+        if (inProgress == null || readyForReview == null) {
+            return null;
+        }
+        return Duration.between(inProgress, readyForReview);
+    }
+
+    public Duration getTestingDuration(long taskId) {
+        List<Activity> activities = activityHandler.getRepository().findAllByTaskIdOrderByUpdatedDesc(taskId);
+        LocalDateTime readyForReview = getStatusTime(activities, "ready_for_review");
+        LocalDateTime done = getStatusTime(activities, "done");
+        if (readyForReview == null || done == null) {
+            return null;
+        }
+        return Duration.between(readyForReview, done);
+    }
+
+    private LocalDateTime getStatusTime(List<Activity> activities, String statusCode) {
+        return activities.stream()
+                .filter(a -> statusCode.equals(a.getStatusCode()))
+                .map(Activity::getUpdated)
+                .filter(Objects::nonNull)
+                .findFirst()
+                .orElse(null);
+    }
 }

src/main/java/com/javarush/jira/common/internal/config/RestAuthenticationEntryPoint.java

@@ -3,7 +3,6 @@
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
@@ -13,12 +12,16 @@
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
 @Component
-@AllArgsConstructor
 public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint {
-    @Qualifier("handlerExceptionResolver")
     private final HandlerExceptionResolver resolver;
     private final RequestMappingHandlerMapping mapping;
 
+    public RestAuthenticationEntryPoint(@Qualifier("handlerExceptionResolver") HandlerExceptionResolver resolver,
+                                        RequestMappingHandlerMapping mapping) {
+        this.resolver = resolver;
+        this.mapping = mapping;
+    }
+
     @Override
     public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws ServletException {
         try {

src/main/java/com/javarush/jira/login/internal/web/RegisterController.java

@@ -4,8 +4,6 @@
 import com.javarush.jira.common.util.validation.View;
 import com.javarush.jira.login.UserTo;
 import com.javarush.jira.login.internal.verification.ConfirmData;
-import com.javarush.jira.login.internal.verification.RegistrationConfirmEvent;
-import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -35,15 +33,13 @@ public String register(Model model) {
     }
 
     @PostMapping
-    public String register(@Validated(View.OnCreate.class) UserTo userTo, BindingResult result, HttpServletRequest request) {
+    public String register(@Validated(View.OnCreate.class) UserTo userTo, BindingResult result) {
         if (result.hasErrors()) {
             return "unauth/register";
         }
         log.info("register {}", userTo);
         checkNew(userTo);
-        ConfirmData confirmData = new ConfirmData(userTo);
-        request.getSession().setAttribute("token", confirmData);
-        eventPublisher.publishEvent(new RegistrationConfirmEvent(userTo, confirmData.getToken()));
+        handler.createFromTo(userTo);
         return "redirect:/view/login";
     }
 

src/main/java/com/javarush/jira/ref/ReferenceService.java

@@ -52,7 +52,7 @@ public static Map<String, RefTo> filterEnabled(Map<String, RefTo> unfilteredRefs
     }
 
     @PostConstruct
-    void initialize() {
+    public void initialize() {
         log.info("init loading");
         List<RefTo> references = mapper.toToList(repository.findAllByOrderByIdAsc());
         refSelect = references.stream()