From e553bc04b6f9fc121f2606988bbe349dd3caa1fa Mon Sep 17 00:00:00 2001 From: PolinaAlimova11 Date: Thu, 29 Aug 2024 13:19:03 +0300 Subject: [PATCH 01/11] delete vk/yandex auth --- resources/view/login.html | 8 ----- .../handler/VkOAuth2UserDataHandler.java | 35 ------------------- .../handler/YandexOAuth2UserDataHandler.java | 21 ----------- src/main/resources/application.yaml | 24 ------------- 4 files changed, 88 deletions(-) delete mode 100644 src/main/java/com/javarush/jira/login/internal/sociallogin/handler/VkOAuth2UserDataHandler.java delete mode 100644 src/main/java/com/javarush/jira/login/internal/sociallogin/handler/YandexOAuth2UserDataHandler.java diff --git a/resources/view/login.html b/resources/view/login.html index 8765ca8ff..d49ce5691 100644 --- a/resources/view/login.html +++ b/resources/view/login.html @@ -48,14 +48,6 @@

Sign in

type="button"> - - - - - - diff --git a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/VkOAuth2UserDataHandler.java b/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/VkOAuth2UserDataHandler.java deleted file mode 100644 index e8e05be05..000000000 --- a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/VkOAuth2UserDataHandler.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.javarush.jira.login.internal.sociallogin.handler; - -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.Map; - -@Component("vk") -public class VkOAuth2UserDataHandler implements OAuth2UserDataHandler { - @Override - public String getFirstName(OAuth2UserData oAuth2UserData) { - return getAttribute(oAuth2UserData, "first_name"); - } - - @Override - public String getLastName(OAuth2UserData oAuth2UserData) { - return getAttribute(oAuth2UserData, "last_name"); - } - - @Override - public String getEmail(OAuth2UserData oAuth2UserData) { - return oAuth2UserData.getData("email"); - } - - private String getAttribute(OAuth2UserData oAuth2UserData, String name) { - List> attributesResponse = oAuth2UserData.getData("response"); - if (attributesResponse != null) { - Map attributes = attributesResponse.get(0); - if (attributes != null) { - return (String) attributes.get(name); - } - } - return null; - } -} diff --git a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/YandexOAuth2UserDataHandler.java b/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/YandexOAuth2UserDataHandler.java deleted file mode 100644 index e8ea1ac1d..000000000 --- a/src/main/java/com/javarush/jira/login/internal/sociallogin/handler/YandexOAuth2UserDataHandler.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.javarush.jira.login.internal.sociallogin.handler; - -import org.springframework.stereotype.Component; - -@Component("yandex") -public class YandexOAuth2UserDataHandler implements OAuth2UserDataHandler { - @Override - public String getFirstName(OAuth2UserData oAuth2UserData) { - return oAuth2UserData.getData("first_name"); - } - - @Override - public String getLastName(OAuth2UserData oAuth2UserData) { - return oAuth2UserData.getData("last_name"); - } - - @Override - public String getEmail(OAuth2UserData oAuth2UserData) { - return oAuth2UserData.getData("default_email"); - } -} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 7fcba1570..d9660eb05 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -61,20 +61,6 @@ spring: scope: - email - profile - vk: - client-id: 51562377 - client-secret: jNM1YHQy1362Mqs49wUN - client-name: Vkontakte - redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" - client-authentication-method: client_secret_post - authorization-grant-type: authorization_code - scope: email - yandex: - client-id: 2f3395214ba84075956b76a34b231985 - client-secret: ed236c501e444a609b0f419e5e88f1e1 - client-name: Yandex - redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" - authorization-grant-type: authorization_code gitlab: client-id: b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494 client-secret: e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004 @@ -83,16 +69,6 @@ spring: authorization-grant-type: authorization_code scope: read_user provider: - vk: - authorization-uri: https://oauth.vk.com/authorize - token-uri: https://oauth.vk.com/access_token - user-info-uri: https://api.vk.com/method/users.get?v=8.1 - user-name-attribute: response - yandex: - authorization-uri: https://oauth.yandex.ru/authorize - token-uri: https://oauth.yandex.ru/token - user-info-uri: https://login.yandex.ru/info - user-name-attribute: login gitlab: authorization-uri: https://gitlab.com/oauth/authorize token-uri: https://gitlab.com/oauth/token From a7ccb54c6650d6d391d4bd2e7f517010cb1960ee Mon Sep 17 00:00:00 2001 From: PolinaAlimova11 Date: Thu, 29 Aug 2024 13:33:38 +0300 Subject: [PATCH 02/11] add environment variable --- env.list | 14 ++++++++++++++ src/main/resources/application.yaml | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 env.list diff --git a/env.list b/env.list new file mode 100644 index 000000000..2b7b4aa89 --- /dev/null +++ b/env.list @@ -0,0 +1,14 @@ +DB_URL=jdbc:postgresql://localhost:5432/jira +DB_USERNAME=jira +DB_PASSWORD=JiraRush +MAIL_HOST=smtp.gmail.com +MAIL_USERNAME=jira4jr@gmail.com +MAIL_PASSWORD=zdfzsrqvgimldzyj +MAIL_PORT=587 +MAIL_USERNAME_TEST=jira4jr@gmail.com +GITHUB_CLIENT_ID=3d0d8738e65881fff266 +GITHUB_CLIENT_SECRET=0f97031ce6178b7dfb67a6af587f37e222a16120 +GOOGLE_CLIENT_ID=329113642700-f8if6pu68j2repq3ef6umd5jgiliup60.apps.googleusercontent.com +GOOGLE_CLIENT_SECRET=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 +GITLAB_CLIENT_ID=b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494 +GITLAB_CLIENT_SECRET=e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004 \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index d9660eb05..baed9ecfc 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,7 +1,7 @@ # https://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html app: host-url: http://localhost:8080 - test-mail: jira4jr@gmail.com + test-mail: ${MAIL_USERNAME_TEST} templates-update-cache: 5s mail-sending-props: core-pool-size: 8 @@ -26,9 +26,9 @@ spring: # https://stackoverflow.com/questions/21257819/what-is-the-difference-between-hibernate-jdbc-fetch-size-and-hibernate-jdbc-batc jdbc.batch_size: 20 datasource: - url: jdbc:postgresql://localhost:5432/jira - username: jira - password: JiraRush + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} liquibase: changeLog: "classpath:db/changelog.sql" @@ -51,19 +51,19 @@ spring: client: registration: github: - client-id: 3d0d8738e65881fff266 - client-secret: 0f97031ce6178b7dfb67a6af587f37e222a16120 + client-id: ${GITHUB_CLIENT_ID} + client-secret: ${GITHUB_CLIENT_SECRET} scope: - email google: - client-id: 329113642700-f8if6pu68j2repq3ef6umd5jgiliup60.apps.googleusercontent.com - client-secret: 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 + client-id: ${GOOGLE_CLIENT_ID} + client-secret: ${GOOGLE_CLIENT_SECRET} scope: - email - profile gitlab: - client-id: b8520a3266089063c0d8261cce36971defa513f5ffd9f9b7a3d16728fc83a494 - client-secret: e72c65320cf9d6495984a37b0f9cc03ec46be0bb6f071feaebbfe75168117004 + client-id: ${GITLAB_CLIENT_ID} + client-secret: ${GITLAB_CLIENT_SECRET} client-name: GitLab redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" authorization-grant-type: authorization_code @@ -86,10 +86,10 @@ spring: starttls: enable: true auth: true - host: smtp.gmail.com - username: jira4jr@gmail.com - password: zdfzsrqvgimldzyj - port: 587 + host: ${MAIL_HOST} + username: ${MAIL_USERNAME} + password: ${MAIL_PASSWORD} + port: ${MAIL_PORT} thymeleaf.check-template-location: false mvc.throw-exception-if-no-handler-found: true From 1a6c6e137364f463ab4a7841255eff8c33475215 Mon Sep 17 00:00:00 2001 From: PolinaAlimova11 Date: Fri, 30 Aug 2024 12:45:03 +0300 Subject: [PATCH 03/11] add testcontainers --- pom.xml | 13 +++++++++ .../java/com/javarush/jira/BaseTests.java | 29 ++++++++++++++++++- src/test/resources/application-test.yaml | 6 +--- 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index f6c152c68..6d2f97738 100644 --- a/pom.xml +++ b/pom.xml @@ -142,6 +142,19 @@ junit-platform-launcher test + + org.testcontainers + junit-jupiter + 1.20.1 + test + + + org.testcontainers + postgresql + 1.20.1 + test + + diff --git a/src/test/java/com/javarush/jira/BaseTests.java b/src/test/java/com/javarush/jira/BaseTests.java index b6ed2d1aa..ca07a2471 100644 --- a/src/test/java/com/javarush/jira/BaseTests.java +++ b/src/test/java/com/javarush/jira/BaseTests.java @@ -1,9 +1,36 @@ package com.javarush.jira; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; +import org.testcontainers.containers.PostgreSQLContainer; -@SpringBootTest +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @ActiveProfiles("test") abstract class BaseTests { + + static PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer<>( + "postgres:16-alpine" + ); + + @DynamicPropertySource + static void configureProperties(DynamicPropertyRegistry registry) { + registry.add("spring.datasource.url", postgreSQLContainer::getJdbcUrl); + registry.add("spring.datasource.username", postgreSQLContainer::getUsername); + registry.add("spring.datasource.password", postgreSQLContainer::getPassword); + } + + @BeforeAll + static void beforeAll() { + postgreSQLContainer.start(); + } + + @AfterAll + static void afterAll() { + postgreSQLContainer.stop(); + } + } diff --git a/src/test/resources/application-test.yaml b/src/test/resources/application-test.yaml index 51137fd06..b117db540 100644 --- a/src/test/resources/application-test.yaml +++ b/src/test/resources/application-test.yaml @@ -1,8 +1,4 @@ spring.cache.type: none spring: init: - mode: always - datasource: - url: jdbc:postgresql://localhost:5433/jira-test - username: jira - password: JiraRush \ No newline at end of file + mode: always \ No newline at end of file From 0acdea703546d1f35e733c637836d2070178caef Mon Sep 17 00:00:00 2001 From: PolinaAlimova11 Date: Sun, 1 Sep 2024 15:42:14 +0300 Subject: [PATCH 04/11] add ProfileRestControllerTest --- .../web/ProfileRestControllerTest.java | 122 ++++++++++++++++++ .../profile/internal/web/ProfileTestData.java | 7 + 2 files changed, 129 insertions(+) diff --git a/src/test/java/com/javarush/jira/profile/internal/web/ProfileRestControllerTest.java b/src/test/java/com/javarush/jira/profile/internal/web/ProfileRestControllerTest.java index a6fd5e3bf..851b8ab1e 100644 --- a/src/test/java/com/javarush/jira/profile/internal/web/ProfileRestControllerTest.java +++ b/src/test/java/com/javarush/jira/profile/internal/web/ProfileRestControllerTest.java @@ -1,8 +1,130 @@ package com.javarush.jira.profile.internal.web; import com.javarush.jira.AbstractControllerTest; +import com.javarush.jira.common.util.JsonUtil; +import com.javarush.jira.login.AuthUser; +import com.javarush.jira.profile.ProfileTo; +import com.javarush.jira.profile.internal.ProfileRepository; +import com.javarush.jira.profile.internal.model.Profile; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.test.context.support.WithUserDetails; +import org.springframework.test.web.servlet.ResultActions; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import static com.javarush.jira.profile.internal.web.ProfileRestController.REST_URL; +import static com.javarush.jira.profile.internal.web.ProfileTestData.*; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; class ProfileRestControllerTest extends AbstractControllerTest { + @Autowired + private ProfileRepository profileRepository; + + @Test + @WithUserDetails(value = USER_MAIL) + void testGetUserProfile() throws Exception { + perform(MockMvcRequestBuilders.get(REST_URL)) + .andExpect(status().isOk()) + .andDo(print()) + .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON)) + .andExpect(PROFILE_TO_MATCHER.contentJson(USER_PROFILE_TO)); + + } + + @Test + @WithUserDetails(value = GUEST_MAIL) + void testGetGuestProfile() throws Exception { + perform(MockMvcRequestBuilders.get(REST_URL)) + .andExpect(status().isOk()) + .andDo(print()) + .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON)) + .andExpect(PROFILE_TO_MATCHER.contentJson(GUEST_PROFILE_EMPTY_TO)); + + } + + @Test + @WithUserDetails(value = GUEST_MAIL) + void testGetNewProfile() throws Exception { + AuthUser authUser = (AuthUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + Profile newProfile = ProfileTestData.getNew(authUser.id()); + profileRepository.save(newProfile); + ResultActions resultActions = perform(MockMvcRequestBuilders.get(REST_URL)) + .andExpect(status().isOk()) + .andDo(print()) + .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON)); + + ProfileTo response = PROFILE_TO_MATCHER.readFromJson(resultActions); + ProfileTo newProfileTo = ProfileTestData.getNewTo(); + newProfileTo.setId(authUser.id()); + PROFILE_TO_MATCHER.assertMatch(response, newProfileTo); + } + + @Test + @WithUserDetails(value = USER_MAIL) + void testUpdateUserProfile() throws Exception { + AuthUser authUser = (AuthUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + ProfileTo updateProfileTo = ProfileTestData.getUpdatedTo(); + updateProfileTo.setId(authUser.id()); + perform(MockMvcRequestBuilders.put(REST_URL) + .contentType(MediaType.APPLICATION_JSON) + .content(JsonUtil.writeValue(updateProfileTo))) + .andDo(print()) + .andExpect(status().isNoContent()); + + Profile updateProfileFromRepo = profileRepository.findById(updateProfileTo.id()).get(); + Profile updateProfile = ProfileTestData.getUpdated(authUser.id()); + PROFILE_MATCHER.assertMatch(updateProfileFromRepo, updateProfile); + + } + + @Test + @WithUserDetails(value = USER_MAIL) + void testUpdateInvalidProfileTo() throws Exception { + ProfileTo invalidProfileTo = ProfileTestData.getInvalidTo(); + perform(MockMvcRequestBuilders.put(REST_URL) + .contentType(MediaType.APPLICATION_JSON) + .content(JsonUtil.writeValue(invalidProfileTo))) + .andDo(print()) + .andExpect(status().isUnprocessableEntity()); + + } + + @Test + @WithUserDetails(value = USER_MAIL) + void testUpdateInvalidNotificationMail() throws Exception { + ProfileTo profileTo = ProfileTestData.getWithUnknownNotificationTo(); + perform(MockMvcRequestBuilders.put(REST_URL) + .contentType(MediaType.APPLICATION_JSON) + .content(JsonUtil.writeValue(profileTo))) + .andDo(print()) + .andExpect(status().isUnprocessableEntity()); + } + + @Test + @WithUserDetails(value = USER_MAIL) + void testUpdateInvalidContract() throws Exception { + ProfileTo profileTo = ProfileTestData.getWithUnknownContactTo(); + perform(MockMvcRequestBuilders.put(REST_URL) + .contentType(MediaType.APPLICATION_JSON) + .content(JsonUtil.writeValue(profileTo))) + .andDo(print()) + .andExpect(status().isUnprocessableEntity()); + } + + @Test + @WithUserDetails(value = USER_MAIL) + void testUpdateWithContactHtmlUnsafeTo() throws Exception { + ProfileTo profileTo = ProfileTestData.getWithContactHtmlUnsafeTo(); + perform(MockMvcRequestBuilders.put(REST_URL) + .contentType(MediaType.APPLICATION_JSON) + .content(JsonUtil.writeValue(profileTo))) + .andDo(print()) + .andExpect(status().isUnprocessableEntity()); + } + } \ No newline at end of file diff --git a/src/test/java/com/javarush/jira/profile/internal/web/ProfileTestData.java b/src/test/java/com/javarush/jira/profile/internal/web/ProfileTestData.java index fb4407268..8219f74d4 100644 --- a/src/test/java/com/javarush/jira/profile/internal/web/ProfileTestData.java +++ b/src/test/java/com/javarush/jira/profile/internal/web/ProfileTestData.java @@ -10,9 +10,16 @@ import java.util.Set; public class ProfileTestData { + + public static final String USER_MAIL = "user@gmail.com"; + public static final String GUEST_MAIL = "guest@gmail.com"; + public static MatcherFactory.Matcher PROFILE_MATCHER = MatcherFactory.usingIgnoringFieldsComparator(Profile.class, "user"); + public static MatcherFactory.Matcher PROFILE_TO_MATCHER = + MatcherFactory.usingIgnoringFieldsComparator(ProfileTo.class, "id"); + public static ProfileTo USER_PROFILE_TO = new ProfileTo(null, Set.of("assigned", "overdue", "deadline"), Set.of(new ContactTo("skype", "userSkype"), From 4d40e9e03f81301c275c505c94ba79a6502b5f87 Mon Sep 17 00:00:00 2001 From: PolinaAlimova11 Date: Sun, 1 Sep 2024 17:45:07 +0300 Subject: [PATCH 05/11] modify FileUtil.upload --- .../jira/bugtracking/attachment/FileUtil.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/javarush/jira/bugtracking/attachment/FileUtil.java b/src/main/java/com/javarush/jira/bugtracking/attachment/FileUtil.java index 6cffbe175..57b780c60 100644 --- a/src/main/java/com/javarush/jira/bugtracking/attachment/FileUtil.java +++ b/src/main/java/com/javarush/jira/bugtracking/attachment/FileUtil.java @@ -7,7 +7,6 @@ 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; @@ -25,15 +24,18 @@ 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 = Files.createDirectories(Paths.get(directoryPath)); + if (Files.exists(directory)) { + Path pathFile = Files.createFile(Paths.get(directoryPath, fileName)); + try (OutputStream outputStream = new FileOutputStream(pathFile.toFile())) { + outputStream.write(multipartFile.getBytes()); + } } + } catch (IOException e) { + throw new IllegalRequestDataException("Failed to upload file" + multipartFile.getOriginalFilename()); } + } public static Resource download(String fileLink) { From 422cc4cb67caab2a6956c4f9e7fbabaa8347119d Mon Sep 17 00:00:00 2001 From: PolinaAlimova11 Date: Mon, 2 Sep 2024 14:22:21 +0300 Subject: [PATCH 06/11] add Dockerfile and docker-compose.yml --- Dockerfile | 14 ++++++++++++++ config/nginx.conf | 2 +- docker-compose.yml | 39 +++++++++++++++++++++++++++++++++++++++ env.list => jira.env | 2 +- 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 Dockerfile create mode 100644 docker-compose.yml rename env.list => jira.env (92%) diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..64ef8d8c3 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,14 @@ +#FROM maven:3.8.5-openjdk-17 +#ARG JAR_FILE=target/*.jar +#WORKDIR /opt/app +#COPY resources /resources +#COPY ${JAR_FILE} app.jar +#ENTRYPOINT ["java","-jar","app.jar"] +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"] \ No newline at end of file diff --git a/config/nginx.conf b/config/nginx.conf index 82b9e234d..634d2c528 100644 --- a/config/nginx.conf +++ b/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;} diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..3e0bda448 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,39 @@ +version: "3.7" +services: + app: + container_name: jira-project + restart: always + build: + context: . + dockerfile: Dockerfile + ports: + - "8080:8080" + depends_on: + - db + - nginx + env_file: + - ./jira.env + + + db: + container_name: postgres_db + image: postgres:latest + restart: always + volumes: + - ./data/db:/var/lib/postgresql/data/ + ports: + - "5432:5432" + environment: + POSTGRES_USER: jira + POSTGRES_PASSWORD: JiraRush + + + nginx: + container_name: nginx + image: nginx:latest + restart: always + ports: + - "80:80" + volumes: + - ./config/nginx.conf:/etc/nginx/conf.d/nginx.conf + diff --git a/env.list b/jira.env similarity index 92% rename from env.list rename to jira.env index 2b7b4aa89..34c618996 100644 --- a/env.list +++ b/jira.env @@ -1,4 +1,4 @@ -DB_URL=jdbc:postgresql://localhost:5432/jira +DB_URL=jdbc:postgresql://db:5432/jira DB_USERNAME=jira DB_PASSWORD=JiraRush MAIL_HOST=smtp.gmail.com From 4f001ec0f04b7a07605f9e15f5316f20d0356065 Mon Sep 17 00:00:00 2001 From: PolinaAlimova11 Date: Mon, 2 Sep 2024 20:47:37 +0300 Subject: [PATCH 07/11] add localisation --- pom.xml | 4 ++ resources/mails/email-confirmation.html | 10 ++--- resources/mails/password-reset.html | 10 ++--- resources/view/index.html | 6 +-- resources/view/layout/footer.html | 44 ++++++++++---------- resources/view/layout/header.html | 10 ++--- resources/view/layout/sidebar.html | 12 +++--- src/main/resources/messages.properties | 48 ++++++++++++++++++++++ src/main/resources/messages_en.properties | 48 ++++++++++++++++++++++ src/main/resources/messages_ru.properties | 49 +++++++++++++++++++++++ 10 files changed, 195 insertions(+), 46 deletions(-) create mode 100644 src/main/resources/messages.properties create mode 100644 src/main/resources/messages_en.properties create mode 100644 src/main/resources/messages_ru.properties diff --git a/pom.xml b/pom.xml index 6d2f97738..f6cb79c8b 100644 --- a/pom.xml +++ b/pom.xml @@ -154,6 +154,10 @@ 1.20.1 test + + org.springframework.boot + spring-boot-starter-thymeleaf + diff --git a/resources/mails/email-confirmation.html b/resources/mails/email-confirmation.html index 106e6129a..4f3eba176 100644 --- a/resources/mails/email-confirmation.html +++ b/resources/mails/email-confirmation.html @@ -1,13 +1,13 @@ - + - JiraRush - подтверждение почты + JiraRush - подтверждение почты -

-

Чтобы завершить настройку учетной записи и начать пользоваться JiraRush, подтвердите, что вы правильно указали вашу +

+

Чтобы завершить настройку учетной записи и начать пользоваться JiraRush, подтвердите, что вы правильно указали вашу электронную почту.

-Подтвердить почту +Подтвердить почту \ No newline at end of file diff --git a/resources/mails/password-reset.html b/resources/mails/password-reset.html index b37a49007..3a7b68a67 100644 --- a/resources/mails/password-reset.html +++ b/resources/mails/password-reset.html @@ -1,12 +1,12 @@ - + - JiraRush - установить новый пароль + JiraRush - установить новый пароль -

-

-Установить пароль +

+

+Установить пароль \ No newline at end of file diff --git a/resources/view/index.html b/resources/view/index.html index e8656ef96..c90fa6e3c 100644 --- a/resources/view/index.html +++ b/resources/view/index.html @@ -1,13 +1,13 @@ - + -

JiraRush Home page

+

JiraRush Home page

- +
diff --git a/resources/view/layout/footer.html b/resources/view/layout/footer.html index abd5ae968..2637f7de1 100644 --- a/resources/view/layout/footer.html +++ b/resources/view/layout/footer.html @@ -1,5 +1,5 @@ - +
diff --git a/resources/view/layout/header.html b/resources/view/layout/header.html index 451f9652d..d5b4caffc 100644 --- a/resources/view/layout/header.html +++ b/resources/view/layout/header.html @@ -1,5 +1,5 @@ - +
@@ -9,7 +9,7 @@
  • @@ -17,13 +17,13 @@
- Profile
-
diff --git a/resources/view/layout/sidebar.html b/resources/view/layout/sidebar.html index a6669e9e8..022904acd 100644 --- a/resources/view/layout/sidebar.html +++ b/resources/view/layout/sidebar.html @@ -1,5 +1,5 @@ - +
@@ -39,28 +39,28 @@
    diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties new file mode 100644 index 000000000..c625a0b8c --- /dev/null +++ b/src/main/resources/messages.properties @@ -0,0 +1,48 @@ +index.body.header=JiraRush Home page +index.button.logout=Logout + +menu.tree=Tree +menu.dashboard=Dashboard +menu.reports=Reports +menu.users=Users +menu.references=References + +header.logout=Logout +header.search=Search +header.login=Login/Register +header.profile=Profile + +footer.learn=LEARN +footer.learn.courses=Programming Courses +footer.learn.java=Java Course +footer.learn.help=Help with Tasks +footer.learn.pricing=Pricing +footer.learn.project=Game Projects +footer.community=COMMUNITY +footer.community.users=Users +footer.community.articles=Articles +footer.community.forum=Forum +footer.community.chat=Chat +footer.community.stories=Success Stories +footer.company=COMPANY +footer.company.about=About us +footer.company.contacts=Contacts +footer.company.reviews=Reviews +footer.company.faq=FAQ +footer.company.support=Support +footer.description=JavaRush is an online course for learning Java programming from scratch. \ + This course is a perfect way to master Java for beginners. \ + It contains 1200+ of tasks with instant verification and an essential scope of Java fundamentals theory. +footer.follow=FOLLOW US +footer.made=Programmers Are Made, Not Born © 2023 JavaRush + +email.confirmation.title=JiraRush - Email Confirmation +email.confirmation.text1=Hello +email.confirmation.text2=To complete your account setup and start using JiraRush, \ +confirm that you have entered your email correctly. +email.confirmation.url=Confirm email + +email.reset.title=JiraRush - Set New Password +email.reset.text1=Hello +email.reset.text2=We received a request to set a new JiraRush password for the account: +email.reset.url=Set password diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties new file mode 100644 index 000000000..73d694d6e --- /dev/null +++ b/src/main/resources/messages_en.properties @@ -0,0 +1,48 @@ +index.body.header=JiraRush Home page +index.button.logout=Logout + +header.search=Search +header.login=Login/Register +header.profile=Profile +header.logout=Logout + +menu.tree=Tree +menu.dashboard=Dashboard +menu.reports=Reports +menu.users=Users +menu.references=References + +footer.learn=LEARN +footer.learn.courses=Programming Courses +footer.learn.java=Java Course +footer.learn.help=Help with Tasks +footer.learn.pricing=Pricing +footer.learn.project=Game Projects +footer.community=COMMUNITY +footer.community.users=Users +footer.community.articles=Articles +footer.community.forum=Forum +footer.community.chat=Chat +footer.community.stories=Success Stories +footer.company=COMPANY +footer.company.about=About us +footer.company.contacts=Contacts +footer.company.reviews=Reviews +footer.company.faq=FAQ +footer.company.support=Support +footer.description=JavaRush is an online course for learning Java programming from scratch. \ + This course is a perfect way to master Java for beginners. \ + It contains 1200+ of tasks with instant verification and an essential scope of Java fundamentals theory. +footer.follow=FOLLOW US +footer.made=Programmers Are Made, Not Born © 2023 JavaRush + +email.confirmation.title=JiraRush - Email Confirmation +email.confirmation.text1=Hello +email.confirmation.text2=To complete your account setup and start using JiraRush, \ +confirm that you have entered your email correctly. +email.confirmation.url=Confirm email + +email.reset.title=JiraRush - Set New Password +email.reset.text1=Hello +email.reset.text2=We received a request to set a new JiraRush password for the account: +email.reset.url=Set password \ No newline at end of file diff --git a/src/main/resources/messages_ru.properties b/src/main/resources/messages_ru.properties new file mode 100644 index 000000000..3b8906771 --- /dev/null +++ b/src/main/resources/messages_ru.properties @@ -0,0 +1,49 @@ +index.body.header=Домашняя страница JiraRush +index.button.logout=Выйти + +header.search=Поиск +header.login=Вход/регистрация +header.profile=Профиль +header.logout=Выйти + +menu.tree=Схема +menu.dashboard=Панель инструментов +menu.reports=Отчёты +menu.users=Пользователи +menu.references=Ссылки + +footer.learn=ОБУЧЕНИЕ +footer.learn.courses=Курсы программирования +footer.learn.java=Курс по Java +footer.learn.help=Помощь с задачами +footer.learn.pricing=Цены +footer.learn.project=Игровые проекты +footer.community=СООБЩЕСТВО +footer.community.users=Участники +footer.community.articles=Статьи +footer.community.forum=Форум +footer.community.chat=Чат +footer.community.stories=Истории успеха +footer.company=КОМПАНИЯ +footer.company.about=О нас +footer.company.contacts=Контакты +footer.company.reviews=Обзоры +footer.company.faq=FAQ +footer.company.support=Поддержка +footer.description=JavaRush — это онлайн-курс для изучения программирования на Java с нуля. \ + Этот курс — идеальный способ освоить Java для начинающих. \ + Он содержит 1200+ заданий с мгновенной проверкой и существенный объем теории основ Java. +footer.follow=Подпишись на нас +footer.made=Программистами не рождаются, а становятся © 2023 JavaRush + +email.confirmation.title=JiraRush - подтверждение почты +email.confirmation.text1=Привет +email.confirmation.text2=Чтобы завершить настройку учетной записи и начать пользоваться JiraRush, \ + подтвердите, что вы правильно указали вашу электронную почту. +email.confirmation.url=Подтвердить почту + +email.reset.title=JiraRush - установить новый пароль +email.reset.text1=Привет +email.reset.text2=Мы получили запрос на установку нового пароля JiraRush для учетной записи: +email.reset.url=Установить пароль + From bfd1841ae41f5a5e600776c2469b987279786e85 Mon Sep 17 00:00:00 2001 From: PolinaAlimova11 Date: Tue, 3 Sep 2024 08:03:50 +0300 Subject: [PATCH 08/11] add track time (in work) --- .../jira/bugtracking/task/Activity.java | 12 ++++++++++++ .../jira/bugtracking/task/TaskService.java | 17 ++++++++++++++++- .../jira/bugtracking/task/TaskStatusTrack.java | 16 ++++++++++++++++ src/main/resources/data4dev/data.sql | 14 +++++++------- src/main/resources/db/changelog.sql | 5 +++++ 5 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/javarush/jira/bugtracking/task/TaskStatusTrack.java diff --git a/src/main/java/com/javarush/jira/bugtracking/task/Activity.java b/src/main/java/com/javarush/jira/bugtracking/task/Activity.java index 07fa00ae9..f4cfff14d 100644 --- a/src/main/java/com/javarush/jira/bugtracking/task/Activity.java +++ b/src/main/java/com/javarush/jira/bugtracking/task/Activity.java @@ -73,6 +73,18 @@ public class Activity extends BaseEntity implements HasAuthorId { @Column(name = "estimate") private Integer estimate; + @Column(name = "in_progress") + @Nullable + private LocalDateTime inProgress; + + @Column(name = "ready_for_review") + @Nullable + private LocalDateTime readyForReview; + + @Column(name = "done") + @Nullable + private LocalDateTime done; + Activity(Long id, Long taskId, Long authorId) { super(id); this.taskId = taskId; diff --git a/src/main/java/com/javarush/jira/bugtracking/task/TaskService.java b/src/main/java/com/javarush/jira/bugtracking/task/TaskService.java index e6f385548..97c75a0eb 100644 --- a/src/main/java/com/javarush/jira/bugtracking/task/TaskService.java +++ b/src/main/java/com/javarush/jira/bugtracking/task/TaskService.java @@ -47,6 +47,7 @@ public void changeStatus(long taskId, String statusCode) { if (!statusCode.equals(task.getStatusCode())) { task.checkAndSetStatusCode(statusCode); Activity statusChangedActivity = new Activity(null, taskId, AuthUser.authId()); + setTrackTime(statusCode, statusChangedActivity); statusChangedActivity.setStatusCode(statusCode); activityHandler.create(statusChangedActivity); String userType = getRefTo(RefType.TASK_STATUS, statusCode).getAux(1); @@ -56,6 +57,18 @@ public void changeStatus(long taskId, String statusCode) { } } + private void setTrackTime(String statusCode, Activity statusChangedActivity) { + if (TaskStatusTrack.IN_PROGRESS.getName().equals(statusCode)) { + statusChangedActivity.setInProgress(LocalDateTime.now()); + } + if (TaskStatusTrack.READY_FOR_REVIEW.getName().equals(statusCode)) { + statusChangedActivity.setReadyForReview(LocalDateTime.now()); + } + if (TaskStatusTrack.DONE.getName().equals(statusCode)) { + statusChangedActivity.setDone(LocalDateTime.now()); + } + } + @Transactional public void changeSprint(long taskId, Long sprintId) { Task task = handler.getRepository().getExisted(taskId); @@ -82,7 +95,9 @@ public Task create(TaskToExt taskTo) { public void update(TaskToExt taskTo, long id) { if (!taskTo.equals(get(taskTo.id()))) { handler.updateFromTo(taskTo, id); - activityHandler.create(makeActivity(id, taskTo)); + Activity activity = makeActivity(id, taskTo); + setTrackTime(taskTo.getStatusCode(), activity); + activityHandler.create(activity); } } diff --git a/src/main/java/com/javarush/jira/bugtracking/task/TaskStatusTrack.java b/src/main/java/com/javarush/jira/bugtracking/task/TaskStatusTrack.java new file mode 100644 index 000000000..9cb64f572 --- /dev/null +++ b/src/main/java/com/javarush/jira/bugtracking/task/TaskStatusTrack.java @@ -0,0 +1,16 @@ +package com.javarush.jira.bugtracking.task; + +import lombok.Getter; + +@Getter +public enum TaskStatusTrack { + IN_PROGRESS("in_progress"), + READY_FOR_REVIEW("ready_for_review"), + DONE("done"); + + private final String name; + + TaskStatusTrack(String name) { + this.name = name; + } +} diff --git a/src/main/resources/data4dev/data.sql b/src/main/resources/data4dev/data.sql index a7d43cbad..f943741e2 100644 --- a/src/main/resources/data4dev/data.sql +++ b/src/main/resources/data4dev/data.sql @@ -317,11 +317,11 @@ sequence TASK_ID_SEQ restart with 1000; ---task 1------ INSERT INTO ACTIVITY(AUTHOR_ID, TASK_ID, UPDATED, COMMENT, TITLE, DESCRIPTION, ESTIMATE, TYPE_CODE, STATUS_CODE, - PRIORITY_CODE) -values (6, 1, '2023-05-15 09:05:10', null, 'Data', null, 3, 'epic', 'in_progress', 'low'), - (5, 1, '2023-05-15 12:25:10', null, 'Data', null, null, null, null, 'normal'), - (6, 1, '2023-05-15 14:05:10', null, 'Data', null, 4, null, null, null), ---task 118---- - (11, 118, '2023-05-16 10:05:10', null, 'UI tab of tasks', null, 4, 'task', 'in_progress', 'normal'), - (5, 118, '2023-05-16 11:10:10', null, 'UI tab of tasks', null, null, null, null, 'high'), - (11, 118, '2023-05-16 12:30:10', null, 'UI tab of tasks', null, 2, null, null, null); + PRIORITY_CODE, IN_PROGRESS, READY_FOR_REVIEW, DONE) +values (6, 1, '2023-05-15 09:05:10', null, 'Data', null, 3, 'epic', 'in_progress', 'low', '2023-05-15 09:05:10', null, null), + (5, 1, '2023-05-15 12:25:10', null, 'Data', null, null, null, null, 'normal', null, null, null), + (6, 1, '2023-05-15 14:05:10', null, 'Data', null, 4, null, null, null, null, null, null), ---task 118---- + (11, 118, '2023-05-16 10:05:10', null, 'UI tab of tasks', null, 4, 'task', 'in_progress', 'normal', '2023-05-15 09:05:10', null, null), + (5, 118, '2023-05-16 11:10:10', null, 'UI tab of tasks', null, null, null, null, 'high', null, null, null), + (11, 118, '2023-05-16 12:30:10', null, 'UI tab of tasks', null, 2, null, null, null, null, null, null); diff --git a/src/main/resources/db/changelog.sql b/src/main/resources/db/changelog.sql index 68591336d..c9ff02e8c 100644 --- a/src/main/resources/db/changelog.sql +++ b/src/main/resources/db/changelog.sql @@ -329,3 +329,8 @@ values ('todo', 'ToDo', 3, 'in_progress,canceled|'), drop index UK_USER_BELONG; create unique index UK_USER_BELONG on USER_BELONG (OBJECT_ID, OBJECT_TYPE, USER_ID, USER_TYPE_CODE) where ENDPOINT is null; + +--changeset alimovapd:add_columns_in_activity +alter table ACTIVITY ADD IN_PROGRESS timestamp NULL; +alter table ACTIVITY ADD READY_FOR_REVIEW timestamp NULL; +alter table ACTIVITY ADD DONE timestamp NULL; \ No newline at end of file From 720e481ce91255c31ddfa3ba9c96e4290dd576fc Mon Sep 17 00:00:00 2001 From: PolinaAlimova11 Date: Wed, 4 Sep 2024 00:06:25 +0300 Subject: [PATCH 09/11] add track time (done) --- .../jira/bugtracking/task/Activity.java | 12 ------- .../bugtracking/task/ActivityRepository.java | 2 ++ .../bugtracking/task/ActivityService.java | 31 +++++++++++++++++++ .../jira/bugtracking/task/TaskController.java | 11 +++++++ .../jira/bugtracking/task/TaskService.java | 17 +--------- .../bugtracking/task/TaskStatusTrack.java | 16 ---------- src/main/resources/data4dev/data.sql | 17 +++++----- src/main/resources/db/changelog.sql | 7 +---- 8 files changed, 56 insertions(+), 57 deletions(-) delete mode 100644 src/main/java/com/javarush/jira/bugtracking/task/TaskStatusTrack.java diff --git a/src/main/java/com/javarush/jira/bugtracking/task/Activity.java b/src/main/java/com/javarush/jira/bugtracking/task/Activity.java index f4cfff14d..07fa00ae9 100644 --- a/src/main/java/com/javarush/jira/bugtracking/task/Activity.java +++ b/src/main/java/com/javarush/jira/bugtracking/task/Activity.java @@ -73,18 +73,6 @@ public class Activity extends BaseEntity implements HasAuthorId { @Column(name = "estimate") private Integer estimate; - @Column(name = "in_progress") - @Nullable - private LocalDateTime inProgress; - - @Column(name = "ready_for_review") - @Nullable - private LocalDateTime readyForReview; - - @Column(name = "done") - @Nullable - private LocalDateTime done; - Activity(Long id, Long taskId, Long authorId) { super(id); this.taskId = taskId; diff --git a/src/main/java/com/javarush/jira/bugtracking/task/ActivityRepository.java b/src/main/java/com/javarush/jira/bugtracking/task/ActivityRepository.java index 3ce8a9386..ac85c9149 100644 --- a/src/main/java/com/javarush/jira/bugtracking/task/ActivityRepository.java +++ b/src/main/java/com/javarush/jira/bugtracking/task/ActivityRepository.java @@ -13,4 +13,6 @@ public interface ActivityRepository extends BaseRepository { @Query("SELECT a FROM Activity a JOIN FETCH a.author WHERE a.taskId =:taskId AND a.comment IS NOT NULL ORDER BY a.updated DESC") List findAllComments(long taskId); + + List findByTaskIdOrderByUpdatedAsc(long taskId); } diff --git a/src/main/java/com/javarush/jira/bugtracking/task/ActivityService.java b/src/main/java/com/javarush/jira/bugtracking/task/ActivityService.java index 7938541bb..f042c6ea2 100644 --- a/src/main/java/com/javarush/jira/bugtracking/task/ActivityService.java +++ b/src/main/java/com/javarush/jira/bugtracking/task/ActivityService.java @@ -8,6 +8,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.Duration; +import java.time.LocalDateTime; import java.util.List; import static com.javarush.jira.bugtracking.task.TaskUtil.getLatestValue; @@ -18,6 +20,9 @@ public class ActivityService { private final TaskRepository taskRepository; private final Handlers.ActivityHandler handler; + private final String START_TASK = "in_progress"; + private final String START_TEST = "ready_for_review"; + private final String DONE_TASK = "done"; private static void checkBelong(HasAuthorId activity) { if (activity.getAuthorId() != AuthUser.authId()) { @@ -53,6 +58,32 @@ public void delete(long id) { updateTaskIfRequired(activity.getTaskId(), activity.getStatusCode(), activity.getTypeCode()); } + @Transactional(readOnly = true) + public Duration getTimeWorkTaskById(long id) { + Task task = taskRepository.getExisted(id); + return getTimeTaskDuration(task, START_TASK, START_TEST); + } + + @Transactional(readOnly = true) + public Duration getTimeTestTaskById(long id) { + Task task = taskRepository.getExisted(id); + return getTimeTaskDuration(task, START_TEST, DONE_TASK); + } + + private Duration getTimeTaskDuration(Task task, String startStatus, String endStatus) { + List activityList = handler.getRepository().findByTaskIdOrderByUpdatedAsc(task.id()); + LocalDateTime startTime = null; + for (Activity activity : activityList) { + if (startStatus.equals(activity.getStatusCode())) { + startTime = activity.getUpdated(); + } + if (endStatus.equals(activity.getStatusCode()) && startTime != null) { + return Duration.between(startTime, activity.getUpdated()); + } + } + return null; + } + private void updateTaskIfRequired(long taskId, String activityStatus, String activityType) { if (activityStatus != null || activityType != null) { Task task = taskRepository.getExisted(taskId); diff --git a/src/main/java/com/javarush/jira/bugtracking/task/TaskController.java b/src/main/java/com/javarush/jira/bugtracking/task/TaskController.java index b53f7ff37..dfc4f8918 100644 --- a/src/main/java/com/javarush/jira/bugtracking/task/TaskController.java +++ b/src/main/java/com/javarush/jira/bugtracking/task/TaskController.java @@ -20,6 +20,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.time.Duration; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -156,4 +157,14 @@ public TaskTreeNode(TaskTo taskTo) { this(taskTo, new LinkedList<>()); } } + + @GetMapping("/{id}/time/work") + public Duration getTimeWorkTask(@PathVariable long id) { + return activityService.getTimeWorkTaskById(id); + } + + @GetMapping("/{id}/time/test") + public Duration getTimeTestTask(@PathVariable long id) { + return activityService.getTimeTestTaskById(id); + } } diff --git a/src/main/java/com/javarush/jira/bugtracking/task/TaskService.java b/src/main/java/com/javarush/jira/bugtracking/task/TaskService.java index 97c75a0eb..e6f385548 100644 --- a/src/main/java/com/javarush/jira/bugtracking/task/TaskService.java +++ b/src/main/java/com/javarush/jira/bugtracking/task/TaskService.java @@ -47,7 +47,6 @@ public void changeStatus(long taskId, String statusCode) { if (!statusCode.equals(task.getStatusCode())) { task.checkAndSetStatusCode(statusCode); Activity statusChangedActivity = new Activity(null, taskId, AuthUser.authId()); - setTrackTime(statusCode, statusChangedActivity); statusChangedActivity.setStatusCode(statusCode); activityHandler.create(statusChangedActivity); String userType = getRefTo(RefType.TASK_STATUS, statusCode).getAux(1); @@ -57,18 +56,6 @@ public void changeStatus(long taskId, String statusCode) { } } - private void setTrackTime(String statusCode, Activity statusChangedActivity) { - if (TaskStatusTrack.IN_PROGRESS.getName().equals(statusCode)) { - statusChangedActivity.setInProgress(LocalDateTime.now()); - } - if (TaskStatusTrack.READY_FOR_REVIEW.getName().equals(statusCode)) { - statusChangedActivity.setReadyForReview(LocalDateTime.now()); - } - if (TaskStatusTrack.DONE.getName().equals(statusCode)) { - statusChangedActivity.setDone(LocalDateTime.now()); - } - } - @Transactional public void changeSprint(long taskId, Long sprintId) { Task task = handler.getRepository().getExisted(taskId); @@ -95,9 +82,7 @@ public Task create(TaskToExt taskTo) { public void update(TaskToExt taskTo, long id) { if (!taskTo.equals(get(taskTo.id()))) { handler.updateFromTo(taskTo, id); - Activity activity = makeActivity(id, taskTo); - setTrackTime(taskTo.getStatusCode(), activity); - activityHandler.create(activity); + activityHandler.create(makeActivity(id, taskTo)); } } diff --git a/src/main/java/com/javarush/jira/bugtracking/task/TaskStatusTrack.java b/src/main/java/com/javarush/jira/bugtracking/task/TaskStatusTrack.java deleted file mode 100644 index 9cb64f572..000000000 --- a/src/main/java/com/javarush/jira/bugtracking/task/TaskStatusTrack.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.javarush.jira.bugtracking.task; - -import lombok.Getter; - -@Getter -public enum TaskStatusTrack { - IN_PROGRESS("in_progress"), - READY_FOR_REVIEW("ready_for_review"), - DONE("done"); - - private final String name; - - TaskStatusTrack(String name) { - this.name = name; - } -} diff --git a/src/main/resources/data4dev/data.sql b/src/main/resources/data4dev/data.sql index f943741e2..08777de10 100644 --- a/src/main/resources/data4dev/data.sql +++ b/src/main/resources/data4dev/data.sql @@ -317,11 +317,14 @@ sequence TASK_ID_SEQ restart with 1000; ---task 1------ INSERT INTO ACTIVITY(AUTHOR_ID, TASK_ID, UPDATED, COMMENT, TITLE, DESCRIPTION, ESTIMATE, TYPE_CODE, STATUS_CODE, - PRIORITY_CODE, IN_PROGRESS, READY_FOR_REVIEW, DONE) -values (6, 1, '2023-05-15 09:05:10', null, 'Data', null, 3, 'epic', 'in_progress', 'low', '2023-05-15 09:05:10', null, null), - (5, 1, '2023-05-15 12:25:10', null, 'Data', null, null, null, null, 'normal', null, null, null), - (6, 1, '2023-05-15 14:05:10', null, 'Data', null, 4, null, null, null, null, null, null), ---task 118---- - (11, 118, '2023-05-16 10:05:10', null, 'UI tab of tasks', null, 4, 'task', 'in_progress', 'normal', '2023-05-15 09:05:10', null, null), - (5, 118, '2023-05-16 11:10:10', null, 'UI tab of tasks', null, null, null, null, 'high', null, null, null), - (11, 118, '2023-05-16 12:30:10', null, 'UI tab of tasks', null, 2, null, null, null, null, null, null); + PRIORITY_CODE) +values (6, 1, '2023-05-15 09:05:10', null, 'Data', null, 3, 'epic', 'in_progress', 'low'), + (5, 1, '2023-05-15 12:25:10', null, 'Data', null, null, null, null, 'normal'), + (6, 1, '2023-05-15 14:05:10', null, 'Data', null, 4, null, null, null), ---task 118---- + (11, 118, '2023-05-16 10:05:10', null, 'UI tab of tasks', null, 4, 'task', 'in_progress', 'normal'), + (5, 118, '2023-05-16 11:10:10', null, 'UI tab of tasks', null, null, null, null, 'high'), + (11, 118, '2023-05-16 12:30:10', null, 'UI tab of tasks', null, 2, null, null, null), + (5, 2, '2024-05-15 12:25:10', null, 'Time task', null, null, null, 'in_progress', 'normal'), + (5, 2, '2024-05-17 09:25:10', null, 'Time task', null, null, null, 'ready_for_review', 'normal'), + (5, 2, '2024-05-23 19:47:07', null, 'Time task', null, null, null, 'done', 'normal'); diff --git a/src/main/resources/db/changelog.sql b/src/main/resources/db/changelog.sql index c9ff02e8c..3e9c02a6f 100644 --- a/src/main/resources/db/changelog.sql +++ b/src/main/resources/db/changelog.sql @@ -328,9 +328,4 @@ values ('todo', 'ToDo', 3, 'in_progress,canceled|'), --changeset ishlyakhtenkov:change_UK_USER_BELONG drop index UK_USER_BELONG; -create unique index UK_USER_BELONG on USER_BELONG (OBJECT_ID, OBJECT_TYPE, USER_ID, USER_TYPE_CODE) where ENDPOINT is null; - ---changeset alimovapd:add_columns_in_activity -alter table ACTIVITY ADD IN_PROGRESS timestamp NULL; -alter table ACTIVITY ADD READY_FOR_REVIEW timestamp NULL; -alter table ACTIVITY ADD DONE timestamp NULL; \ No newline at end of file +create unique index UK_USER_BELONG on USER_BELONG (OBJECT_ID, OBJECT_TYPE, USER_ID, USER_TYPE_CODE) where ENDPOINT is null; \ No newline at end of file From f48d3561a73929ca20f16be7a74a88060977a74f Mon Sep 17 00:00:00 2001 From: PolinaAlimova11 Date: Thu, 5 Sep 2024 20:03:31 +0300 Subject: [PATCH 10/11] fix Dockerfile --- Dockerfile | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 64ef8d8c3..6787c506f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,5 @@ -#FROM maven:3.8.5-openjdk-17 -#ARG JAR_FILE=target/*.jar -#WORKDIR /opt/app -#COPY resources /resources -#COPY ${JAR_FILE} app.jar -#ENTRYPOINT ["java","-jar","app.jar"] -FROM maven:3.8.5-openjdk-17 AS build -COPY src /app/src -COPY pom.xml /app +FROM openjdk:17.0.2-jdk-slim-buster +ARG JAR_FILE=target/*.jar 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"] \ No newline at end of file +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java", "-jar","app.jar"] \ No newline at end of file From fb98e5b5295fa0a4459331b6f17a1a662c071b27 Mon Sep 17 00:00:00 2001 From: PolinaAlimova11 Date: Thu, 5 Sep 2024 20:07:57 +0300 Subject: [PATCH 11/11] add done task to README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 719b268f5..5ee08eaf7 100644 --- a/README.md +++ b/README.md @@ -27,4 +27,14 @@ - https://habr.com/ru/articles/259055/ Список выполненных задач: + +- Удалить социальные сети +- Вынести чувствительную информацию (jira.env) +- Добавить testcontainers +- Написать интеграционное тестирование для ProfileRestController +- Сделать рефакторинг метода com.javarush.jira.bugtracking.attachment.FileUtil#upload +- Добавить подсчет времени сколько задача находилась в работе и тестировании +- Добавить локализацию +- Написать Dockerfile для основного сервера +- Написать docker-compose файл для запуска контейнера сервера вместе с БД и nginx ... \ No newline at end of file