completed task

.env

@@ -0,0 +1,20 @@
+#app:
+APP_HOST_URL=http://localhost:8080
+APP_TEST_MAIL=jira4jr@gmail.com
+APP_TEMPLATES_UPDATE_CACHE=5s
+
+SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/jira
+SPRING_DATASOURCE_USERNAME=jira
+SPRING_DATASOURCE_PASSWORD=JiraRush
+
+SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GITHUB_CLIENT_ID=3d0d8738e65881fff266
+SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GITHUB_CLIENT_SECRET=0f97031ce6178b7dfb67a6af587f37e222a16120
+SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_ID=329113642700-f8if6pu68j2repq3ef6umd5jgiliup60.apps.googleusercontent.com
+SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_SECRET=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
+SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GITLAB_CLIENT_ID=b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494
+SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GITLAB_CLIENT_SECRET=e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004
+#mail:
+SPRING_MAIL_HOST=smtp.gmail.com
+SPRING_MAIL_USERNAME=jira4jr@gmail.com
+SPRING_MAIL_PASSWORD=zdfzsrqvgimldzyj
+SPRING_MAIL_PORT=587

Dockerfile

@@ -0,0 +1,7 @@
+FROM openjdk:17
+COPY config/_application-prod.yaml /config/_application-prod.yaml
+COPY ./resources /resources
+COPY ./src/main/resources /src/main/resources
+COPY target/jira-1.0.jar jira-1.0.jar
+COPY .env .env
+ENTRYPOINT ["java", "-jar", "/jira-1.0.jar", "--spring.profiles.active=prod"]

README.md

@@ -27,4 +27,13 @@
 - https://habr.com/ru/articles/259055/
 
 Список выполненных задач:
-...
+1. Разобраться со структурой проекта (onboarding).
+2. Удалить социальные сети: vk, yandex.
+3. Вынести чувствительную информацию в отдельный проперти файл:
+   - логин
+   - пароль БД
+   - идентификаторы для OAuth регистрации/авторизации
+   - настройки почты
+5. Написать тесты для всех публичных методов контроллера ProfileRestController. Хоть методов только 2, но тестовых методов должно быть больше, т.к. нужно проверить success and unsuccess path.
+6.  Сделать рефакторинг метода com.javarush.jira.bugtracking.attachment.FileUtil#upload чтоб он использовал современный подход для работы с файловой системмой.
+7. Добавить новый функционал: добавления тегов к задаче (REST API + реализация на сервисе). Фронт делать необязательно. Таблица task_tag уже создана.

pom.xml

@@ -18,7 +18,7 @@
     <properties>
         <java.version>17</java.version>
         <springdoc.version>2.0.2</springdoc.version>
-        <mapstruct.version>1.5.3.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.RC1</mapstruct.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
@@ -96,6 +96,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -142,6 +143,20 @@
             <artifactId>junit-platform-launcher</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/io.github.cdimascio/java-dotenv -->
+        <dependency>
+            <groupId>io.github.cdimascio</groupId>
+            <artifactId>java-dotenv</artifactId>
+            <version>5.2.2</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>2.3.230</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -195,5 +210,22 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <spring.profiles.active>test</spring.profiles.active>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>false</skipTests>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </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

@@ -24,18 +24,19 @@ public static void upload(MultipartFile multipartFile, String directoryPath, Str
         if (multipartFile.isEmpty()) {
             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());
+        Path directory = Paths.get(directoryPath);
+        Path file = directory.resolve(fileName);
+        try  {
+            if (!Files.exists(directory)) {
+                Files.createDirectories(directory);
             }
+            Files.write(file, multipartFile.getBytes());
+        } catch (IOException ex) {
+            throw new IllegalRequestDataException("Failed to upload file" + multipartFile.getOriginalFilename());
         }
     }
 
+
     public static Resource download(String fileLink) {
         Path path = Paths.get(fileLink);
         try {

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

@@ -150,7 +150,10 @@ public void update(@Valid @RequestBody ActivityTo activityTo, @PathVariable long
     public void delete(@PathVariable long id) {
         activityService.delete(id);
     }
-
+    @PostMapping("/{id}/tags")
+    public void addTag( @PathVariable long id, @RequestBody String text){
+        taskService.addTag(id, text);
+    }
     private record TaskTreeNode(TaskTo taskTo, List<TaskTreeNode> subNodes) implements ITreeNode<TaskTo, TaskTreeNode> {
         public TaskTreeNode(TaskTo taskTo) {
             this(taskTo, new LinkedList<>());

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

@@ -140,4 +140,10 @@ private void checkAssignmentActionPossible(long id, String userType, boolean ass
             throw new DataConflictException(String.format(assign ? CANNOT_ASSIGN : CANNOT_UN_ASSIGN, userType, task.getStatusCode()));
         }
     }
+    @Transactional
+    public void addTag(long id, String text) {
+        Task task = handler.getRepository().getExisted(id);
+        task.getTags().add(text);
+        handler.getRepository().save(task);
+    }
 }

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

@@ -0,0 +1,21 @@
+package com.javarush.jira.common.internal.config;
+
+import io.github.cdimascio.dotenv.Dotenv;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+
+@Configuration
+@PropertySource(value = "classpath:application.yaml", factory = EnvPropertySourceLoader.class)
+public class EnvConfig {
+    @Bean
+    public Dotenv dotenv() {
+        Dotenv dotenv = Dotenv.configure().load();
+        dotenv.entries().forEach(entry ->
+                System.setProperty(entry.getKey(), entry.getValue())
+        );
+        return dotenv;
+    }
+
+}

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

@@ -0,0 +1,25 @@
+package com.javarush.jira.common.internal.config;
+
+import io.github.cdimascio.dotenv.Dotenv;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.support.EncodedResource;
+import org.springframework.core.io.support.PropertySourceFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class EnvPropertySourceLoader implements PropertySourceFactory {
+
+    @Override
+    public PropertySource<?> createPropertySource(String name, EncodedResource resource){
+        Dotenv dotenv = Dotenv.configure().load();
+        Map<String, Object> envMap = new HashMap<>();
+        dotenv.entries().forEach(entry ->
+                envMap.put(entry.getKey(), entry.getValue())
+        );
+        return new MapPropertySource("dotenvProperties", envMap);
+    }
+
+
+}