My feature pr branch

.gitignore

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

Dockerfile

@@ -0,0 +1,28 @@
+# syntax=docker/dockerfile:1.7
+FROM eclipse-temurin:17-jdk-jammy AS builder
+WORKDIR /app
+
+# Copy build files first to leverage Docker layer cache
+COPY .mvn/ .mvn/
+COPY mvnw pom.xml ./
+RUN chmod +x mvnw
+# Speed up builds by caching the Maven repo (BuildKit needed)
+RUN --mount=type=cache,target=/root/.m2 ./mvnw -B -DskipTests dependency:go-offline
+
+# Now add sources and build
+COPY src/ src/
+RUN --mount=type=cache,target=/root/.m2 ./mvnw -B -DskipTests clean package
+
+FROM eclipse-temurin:17-jre-jammy
+WORKDIR /app
+
+# Run as non-root
+RUN useradd -ms /bin/bash appuser
+USER appuser
+
+# Copy the fat jar
+COPY --from=builder /app/target/*.jar /app/app.jar
+
+EXPOSE 8080
+
+ENTRYPOINT ["java","-jar","/app/app.jar"]

README.md

@@ -27,4 +27,27 @@
 - https://habr.com/ru/articles/259055/
 
 Список выполненных задач:
-...
+
+# JiraRush Project: My Contributions & Enhancements
+
+This document outlines my key contributions and improvements to the JiraRush project, covering aspects of security, testing, refactoring, new features, and deployment.
+
+## My Contributions to the Project:
+
+Here's a breakdown of the specific tasks and features I implemented:
+
+1.  📘 **Project Structure Onboarding:** I successfully familiarized myself with the existing project structure and architecture, enabling effective subsequent modifications and new feature development.
+2.  🚫 **Removal of Deprecated Social Integrations:** I removed outdated social media integrations (VK, Yandex) from the project, simplifying the codebase and mitigating potential security risks.
+3.  🔑 **Externalization of Sensitive Information:** I moved sensitive data, such as database login credentials, OAuth registration/authorization identifiers, and email settings, into separate property files. These values are now securely loaded from machine environment variables upon server startup, significantly enhancing security and configuration flexibility.
+4.  🧪 **Refactoring Tests for In-Memory H2 Database:** I adapted the test suite to utilize an in-memory H2 database instead of PostgreSQL. This involved defining two distinct Spring beans, with the active Spring profile dictating which database to use. Minor adjustments were also made to test data scripts to ensure compatibility with H2's features.
+5.  ✅ **Comprehensive `ProfileRestController` Test Coverage:** I developed a robust set of unit and integration tests for all public methods of the `ProfileRestController`. These tests meticulously validate both successful and various unsuccessful execution paths to guarantee the API's reliability and resilience.
+6.  🔄 **Refactoring `FileUtil#upload` for Modern File System API:** I refactored the `com.javarush.jira.bugtracking.attachment.FileUtil#upload` method to leverage modern Java file system APIs, enhancing its efficiency, robustness, and maintainability for file operations.
+7.  🏷️ **Implementation of Task Tagging System:** I introduced a new feature allowing users to add tags to tasks. This includes developing the dedicated REST API endpoint and implementing the corresponding service-layer logic, utilizing the existing `task_tag` database table.
+8.  ⏱️ **Adding Task Time Tracking Functionality:** I implemented two service-level methods to calculate the time a task spends in specific operational states:
+  *   **Time in Work:** Calculated as the duration from `in_progress` to `ready_for_review` status.
+  *   **Time in Testing:** Calculated as the duration from `ready_for_review` to `done` status.
+      To support this, I appended three critical `ACTIVITY` entries (with `in_progress`, `ready_for_review`, and `done` statuses) to the `changelog.sql` database initialization script.
+9.  🐳 **Dockerfile for Application Server:** I created a `Dockerfile` to containerize the main application server, ensuring easy and consistent deployment across different environments.
+10. 🚀 **Docker Compose for Full Stack Deployment:** I developed a `docker-compose.yml` file to orchestrate the entire application stack. This setup includes the application server, a PostgreSQL database, and an Nginx reverse proxy, leveraging the `config/nginx.conf` file (which can be modified as needed) for efficient routing and load balancing.
+
+---

compose.yaml

@@ -0,0 +1,47 @@
+services:
+  db:
+    image: postgres
+    container_name: postgres
+    env_file:
+      - ./.env
+    ports:
+      - "5433:5432"
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    networks:
+      - app_network
+
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: app
+    env_file:
+      - ./.env
+    ports:
+      - "8080:8080"
+    depends_on:
+      - db
+    networks:
+      - app_network
+
+  nginx:
+    image: nginx:latest
+    container_name: nginx
+    volumes:
+      - ./config/nginx.conf:/etc/nginx/nginx.conf
+      - ./resources/static:/opt/jirarush/resources/static
+    ports:
+      - "80:80"
+    depends_on:
+      - app
+    networks:
+      - app_network
+
+networks:
+  app_network:
+    driver: bridge
+
+volumes:
+  pgdata:
+    driver: local

config/nginx.conf

@@ -1,40 +1,52 @@
-# https://losst.ru/ustanovka-nginx-ubuntu-16-04
-# https://pai-bx.com/wiki/nginx/2332-useful-redirects-in-nginx/#1
-# sudo iptables -A INPUT ! -s 127.0.0.1 -p tcp -m tcp --dport 8080 -j DROP
-server {
-  listen       80;
-
-  # https://www.digitalocean.com/community/tutorials/how-to-optimize-nginx-configuration
-  gzip            on;
-  gzip_types text/css application/javascript application/json;
-  gzip_min_length 2048;
-
-  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  root  /opt/jirarush/resources;
-
-  if ($request_uri ~ ';') {return 404;}
-
-  #    proxy_cookie_flags ~ secure samesite=none;
-
-  # static
-  location /static/ {
-    expires 30d;
-    access_log off;
-  }
-  location /robots.txt {
-    access_log off;
-  }
-
-  location ~ (/$|/view/|/ui/|/oauth2/) {
-    expires 0m;
-    proxy_pass http://localhost:8080;
-      proxy_connect_timeout 30s;
-  }
-  location ~ (/api/|/doc|/swagger-ui/|/v3/api-docs/) {
-    proxy_pass http://localhost:8080;
-      proxy_connect_timeout 150s;
-  }
-  location / {
-    try_files /view/404.html = 404;
-  }
+# Основний блок налаштувань
+user nginx;
+worker_processes 1;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+
+    # Ваш серверний блок
+    server {
+        listen 80;
+
+        # https://www.digitalocean.com/community/tutorials/how-to-optimize-nginx-configuration
+        gzip on;
+        gzip_types text/css application/javascript application/json;
+        gzip_min_length 2048;
+
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        root /opt/jirarush/resources;
+
+        if ($request_uri ~ ';') { return 404; }
+
+        # Статичні файли
+        location /static/ {
+            expires 30d;
+            access_log off;
+        }
+
+        location /robots.txt {
+            access_log off;
+        }
+
+        location ~ (/$|/view/|/ui/|/oauth2/) {
+            expires 0m;
+            proxy_pass http://localhost:8080;
+            proxy_connect_timeout 30s;
+        }
+
+        location ~ (/api/|/doc|/swagger-ui/|/v3/api-docs/) {
+            proxy_pass http://localhost:8080;
+            proxy_connect_timeout 150s;
+        }
+
+        location / {
+            try_files /view/404.html '=' 404;
+        }
+    }
 }

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.12</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -41,6 +41,19 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.github.cdimascio</groupId>
+            <artifactId>java-dotenv</artifactId>
+            <version>5.2.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-docker-compose</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+
         <!--        jackson-->
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -82,6 +95,12 @@
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -96,7 +115,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <optional>true</optional>
+            <version>1.18.30</version>
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
@@ -146,6 +165,29 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.30</version>
+                        </path>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${mapstruct.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-configuration-processor</artifactId>
+                            <version>3.5.5</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -196,4 +238,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>

resources/static/fontawesome/css/all.css

@@ -8603,10 +8603,6 @@ readers do not read off random characters that represent icons */
     content: "\f3e8";
 }
 
-.fa-vk:before {
-    content: "\f189";
-}
-
 .fa-untappd:before {
     content: "\f405";
 }
@@ -9955,10 +9951,6 @@ readers do not read off random characters that represent icons */
     content: "\f3bc";
 }
 
-.fa-yandex:before {
-    content: "\f413";
-}
-
 .fa-readme:before {
     content: "\f4d5";
 }
@@ -10183,10 +10175,6 @@ readers do not read off random characters that represent icons */
     content: "\f7c6";
 }
 
-.fa-yandex-international:before {
-    content: "\f414";
-}
-
 .fa-cc-amex:before {
     content: "\f1f3";
 }

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

@@ -25,14 +25,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 directory = Path.of(directoryPath);
+            Files.createDirectory(directory);
+            Path targetFile = directory.resolve(fileName);
+            multipartFile.transferTo(targetFile);
+        } catch (IOException e) {
+            throw new IllegalRequestDataException("Failed to upload file" + multipartFile.getOriginalFilename());
         }
     }