Kotovych final project

Dockerfile

@@ -0,0 +1,8 @@
+FROM maven:3.8.5-openjdk-17 AS build
+COPY src /app/src
+COPY pom.xml /app
+COPY resources /resources
+RUN mvn -f /app/pom.xml clean package -Pprod
+RUN rm -rf /app/src
+EXPOSE 8080
+ENTRYPOINT ["java", "-Dspring.profiles.active=prod", "-jar","/app/target/jira-1.0.jar"]

README.md

@@ -27,4 +27,16 @@
 - https://habr.com/ru/articles/259055/
 
 Список выполненных задач:
+
+1. Удалить социальные сети: vk, yandex
+2. Testcontainers
+3. Cделать рефакторинг метода com.javarush.jira.bugtracking.attachment.FileUtil#upload
+4. Вынести чувствительную информацию в отдельный проперти файл
+5. Добавить новый функционал: добавления тегов к задаче (REST API + реализация на сервисе)
+6. Добавить локализацию
+7. Написать Dockerfile
+8. Написать docker-compose файл для запуска контейнера сервера вместе с БД и nginx.
+9. Написать тесты для всех публичных методов контроллера ProfileRestController
+10. Добавить подсчет времени сколько задача находилась в работе и тестировании
+11. JWT
 ...

config/nginx.conf

@@ -10,7 +10,7 @@ server {
   gzip_min_length 2048;
 
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  root  /opt/jirarush/resources;
+  root  /resources;
 
   if ($request_uri ~ ';') {return 404;}
 

docker-compose.env

@@ -0,0 +1,4 @@
+PROD_DATASOURCE_URL=jdbc:postgresql://db:5432/jira
+PROD_DATASOURCE_USERNAME=jira
+PROD_DATASOURCE_PASSWORD=JiraRush
+PROD_HOST_PORT=8080

docker-compose.yml

@@ -0,0 +1,40 @@
+version: "3.8"
+
+services:
+  app:
+    container_name: app
+    build:
+     context: .
+     dockerfile: Dockerfile
+    restart: always
+    env_file: ./docker-compose.env
+    ports:
+      - "8080:8080"
+    depends_on:
+      - db
+      - nginx
+
+
+  db:
+    container_name: db
+    image: postgres:latest
+    restart: always
+    environment:
+      POSTGRES_USER: jira
+      POSTGRES_PASSWORD: JiraRush
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./data/db:/var/lib/postgresql/data/
+
+
+  nginx:
+    container_name: nginx
+    image: nginx:latest
+    restart: always
+    ports:
+      - "80:80"
+    volumes:
+      - ./config/nginx.conf:/etc/nginx/conf.d/nginx.conf
+
+

pom.xml

@@ -15,6 +15,7 @@
     <name>JiraRush</name>
     <description>Mini-JIRA from JavaRush</description>
 
+
     <properties>
         <java.version>17</java.version>
         <springdoc.version>2.0.2</springdoc.version>
@@ -23,7 +24,36 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>1.20.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>0.11.5</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>0.11.5</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <version>0.11.5</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -88,6 +118,24 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
@@ -144,6 +192,7 @@
         </dependency>
     </dependencies>
 
+
     <build>
         <plugins>
             <plugin>

resources/mails/email-confirmation.html

@@ -1,13 +1,13 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale}" lang="en" xmlns:th="http://www.thymeleaf.org">
 <head>
-    <title>JiraRush - подтверждение почты</title>
+    <title th:text="#{mails.confirmation.title}">JiraRush - подтверждение почты</title>
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
 </head>
 <body>
-<p th:text="'Привет, ' + ${user.firstName} + '.'"/>
-<p>Чтобы завершить настройку учетной записи и начать пользоваться JiraRush, подтвердите, что вы правильно указали вашу
+<p th:text="#{hello} + ', ' + ${user.firstName} + '.'"/>
+<p th:text="#{mails.confirmation.text}">Чтобы завершить настройку учетной записи и начать пользоваться JiraRush, подтвердите, что вы правильно указали вашу
     электронную почту.</p>
-<a th:href="${confirmationUrl}">Подтвердить почту</a>
+<a th:text="#{mails.confirmation.confirm_mail}" th:href="${confirmationUrl}">Подтвердить почту</a>
 </body>
 </html>

resources/mails/password-reset.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 <head th:fragment="head">
-    <title>JiraRush - установить новый пароль</title>
+    <title th:text="#{mails.password_reset.title}">JiraRush - установить новый пароль</title>
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
 </head>
 <body>
-<p th:text="'Привет, ' + ${user.firstName} + '.'"/>
-<p th:text="'Мы получили запрос на установку нового пароля JiraRush для учетной записи: ' + ${user.email} + '.'"/>
-<a th:href="${resetUrl}">Установить пароль</a>
+<p th:text="#{hello} + ',' + ${user.firstName} + '.'"/>
+<p th:text="#{mails.password_reset.text}' + ${user.email} + '.'"/>
+<a th:text="#{mails.password_reset.set_password}" th:href="${resetUrl}">Установить пароль</a>
 </body>
 </html>

resources/static/js/attachments.js

@@ -1,3 +1,5 @@
+$.ajaxSetup({headers: {"Authorization": "Bearer " + localStorage.getItem("token")}});
+
 function deleteAtt(attId) {
     $.ajax({
         url: '/api/attachments/' + attId,

resources/static/js/common.js

@@ -23,7 +23,7 @@ function makeEditable(datatableOpts) {
     });
 
     // solve problem with cache in IE: https://stackoverflow.com/a/4303862/548473
-    $.ajaxSetup({cache: false});
+    $.ajaxSetup({cache: false, headers: {"Authorization": "Bearer " + localStorage.getItem("token")}});
 }
 
 function add() {

resources/static/js/contextMenu.js

@@ -12,6 +12,8 @@ let menuItemsPopulated;
 let populateContextMenuFunction;
 let onMenuCloseFunction;
 
+$.ajaxSetup({headers: {"Authorization": "Bearer " + localStorage.getItem("token")}});
+
 function setupContextMenu(elementClass, populateFunction, onCloseFunction) {
     populateContextMenuFunction = populateFunction;
     onMenuCloseFunction = onCloseFunction;

resources/static/js/dashboard.js

@@ -11,6 +11,8 @@ const doneTaskColumn = $('#done-task-column');
 const tasksByColumns = new Map();
 const oneDayMillis = 1000 * 60 * 60 * 24;
 
+$.ajaxSetup({headers: {"Authorization": "Bearer " + localStorage.getItem("token")}});
+
 $(window).on('load', () => init());
 
 function init() {

resources/static/js/profile.js

@@ -1,5 +1,7 @@
 const codeTitleMap = new Map();
 
+$.ajaxSetup({headers: {"Authorization": "Bearer " + localStorage.getItem("token")}});
+
 function changeInputContactCodeToTitleAndReturnCode(row) {
     let typeCode = row.cells[0].children[0].value;
     const typeTitle = codeTitleMap.get(typeCode);

resources/static/js/references.js

@@ -2,6 +2,8 @@ let selectReftype = document.getElementById('select-reftype');
 let modalRef = document.getElementById('modalRef');
 let modalCaller = '';
 
+$.ajaxSetup({headers: {"Authorization": "Bearer " + localStorage.getItem("token")}});
+
 getRefsByType(selectReftype.value);
 selectReftype.addEventListener('change', () => {
     let refType = selectReftype.value;

resources/static/js/report.js

@@ -8,6 +8,8 @@ const taskTotalRow = $('#task-total-row');
 let sprintList = [];
 const oneDayMillis = 1000 * 60 * 60 * 24;
 
+$.ajaxSetup({headers: {"Authorization": "Bearer " + localStorage.getItem("token")}});
+
 $(window).on('load', () => init());
 
 function init() {

resources/static/js/tree.js

@@ -1,3 +1,5 @@
+$.ajaxSetup({headers: {"Authorization": "Bearer " + localStorage.getItem("token")}});
+
 $(function () {
     setupContextMenu('fancytree-node',
         ((node) => {

resources/static/js/users.js

@@ -1,5 +1,7 @@
 const userUrl = "/api/admin/users";
 
+$.ajaxSetup({headers: {"Authorization": "Bearer " + localStorage.getItem("token")}});
+
 // https://stackoverflow.com/a/5064235/548473
 const ctx = {
     ajaxUrl: userUrl,

resources/view/404.html

@@ -1,4 +1,4 @@
-<html lang="ru">
+<html th:lang="${#locale}" lang="ru">
 <head>
     <meta content="text/html;charset=utf-8" http-equiv="Content-Type"/>
     <meta content="width=device-width, initial-scale=1" name="viewport">

resources/view/admin/users.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="ru" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale}" lang="ru" xmlns:th="http://www.thymeleaf.org">
 <th:block th:replace="~{layout/main::page(title='Users',appMain=~{::appMain}, activeMenuItem='users')}">
     <appMain>
         <div class="jumbotron pt-4">

resources/view/dashboard.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="ru" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale}" lang="ru" xmlns:th="http://www.thymeleaf.org">
 
 <th:block
         th:replace="~{layout/main::page(title='JiraRush: mini bugtracking system',appMainFluid=~{::appMain}, activeMenuItem='dashboard')}">

resources/view/exception.html

@@ -1,4 +1,4 @@
-<html lang="ru" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale}" lang="ru" xmlns:th="http://www.thymeleaf.org">
 <th:block th:replace="~{layout/main::page(title='Application Error',appMain=~{::appMain})}">
     <appMain>
         <div class="text-center">

resources/view/index.html

@@ -1,14 +1,25 @@
 <!DOCTYPE html>
-<html lang="ru" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale}" lang="en" xmlns:th="http://www.thymeleaf.org">
 <!--/*@thymesVar id="authUser" type="com.javarush.jira.login.AuthUser"*/-->
-
 <th:block th:replace="~{layout/main::page(title='JiraRush: mini bugtracking system',appMain=~{::appMain})}">
     <appMain>
-        <h1>JiraRush Home page</h1>
+        <div th:insert="layout/lang :: menu"></div>
+        <h1 th:text="#{home.text}">JiraRush Home page</h1>
         <div th:if="${authUser} != null">
             <form action="/ui/logout" method="post">
-                <button class="btn btn-primary btn-lg mt-3" type="submit">Logout</button>
+                <button th:text="#{button.logout}" class="btn btn-primary btn-lg mt-3" type="submit">Logout</button>
             </form>
         </div>
+        <th:block th:if="${jwt}">
+            <script th:inline="javascript">
+                (function() {
+                    let token = /*[[${jwt}]]*/ null;
+                    if (token) {
+                        localStorage.setItem("token", token);
+                        window.location.href = "/";
+                    }
+                })();
+            </script>
+        </th:block>
     </appMain>
 </th:block>

resources/view/layout/bugtrackLayout.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- view/edit layouts for Task, Sprint, Project -->
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale}" lang="en" xmlns:th="http://www.thymeleaf.org">
 <!--/*@thymesVar id="codeTo" type="com.javarush.jira.common.to.CodeTo"*/-->
 <!--/*@thymesVar id="attachs" type="java.util.List<com.javarush.jira.bugtracking.attachment.Attachment>"*/-->
 <!--/*@thymesVar id="belongs" type="java.util.List<com.javarush.jira.bugtracking.UserBelong>"*/-->