From 86e902bbfe596133e729279b2f6aa28aa567944f Mon Sep 17 00:00:00 2001 From: Andrii Solianyk Date: Fri, 13 Jun 2025 17:51:35 +0200 Subject: [PATCH] few small fixes --- src/main/resources/application.properties | 10 +-- src/main/resources/sql/data.sql | 10 +-- .../EmailControllerIntegrationTest.java | 76 ------------------- .../NoticeServiceTest.java | 7 +- 4 files changed, 11 insertions(+), 92 deletions(-) delete mode 100644 src/test/java/_11/asktpk/artisanconnectbackend/EmailControllerIntegrationTest.java diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c3d49fe..c0a05eb 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,41 +1,33 @@ spring.application.name=ArtisanConnectBackend -## PostgreSQL spring.datasource.url=${DB_URL:jdbc:postgresql://db:5432/postgres} spring.datasource.username=${DB_USER:postgres} spring.datasource.password=${DB_PASS:postgres} spring.datasource.driver-class-name=org.postgresql.Driver -#Injekcja danych przyk?adowych przy starcie bazy spring.sql.init.data-locations=classpath:sql/data.sql spring.sql.init.mode=always spring.jpa.defer-datasource-initialization=true -#Spos�b zachowania JPA -spring.jpa.hibernate.ddl-auto=create-drop +spring.jpa.hibernate.ddl-auto=update -#Gdzie uploadujemy zdj?cia i maksymalny rozmiar file.upload-dir=${IMAGES_UPLOAD_DIR:/app/images} spring.servlet.multipart.max-file-size=${MAX_FILE_SIZE:10MB} spring.servlet.multipart.max-request-size=${MAX_REQUEST_SIZE:10MB} -#Ustawienia wysy?ania maili spring.mail.host=${MAIL_HOST} spring.mail.port=${MAIL_PORT} spring.mail.username=${MAIL_USER} spring.mail.password=${MAIL_PASSWORD} -#Ustawienia TPay tpay.clientId=${TPAY_CLIENT_ID} tpay.clientSecret=${TPAY_SECRET} tpay.authUrl=${TPAY_AUTH_URL} tpay.transactionUrl=${TPAY_TRANSACTION_URL} tpay.securityCode = ${TPAY_SECURITY_CODE} -#Ustawienia JWT jwt.secret=${JWT_SECRET} jwt.expiration=1200000 -#Ustawienia logowania logging.file.name=logs/payment-notifications.log logging.level.TpayLogger=INFO \ No newline at end of file diff --git a/src/main/resources/sql/data.sql b/src/main/resources/sql/data.sql index c889d10..bb82361 100644 --- a/src/main/resources/sql/data.sql +++ b/src/main/resources/sql/data.sql @@ -5,11 +5,11 @@ VALUES INSERT INTO clients (email, first_name, last_name, password, role_id) VALUES - ('dignissim.tempor.arcu@aol.ca', 'Diana', 'Harrison', 'password', 1), - ('john.doe@example.com', 'John', 'Doe', 'password123', 2), - ('jane.smith@example.com', 'Jane', 'Smith', 'securepass', 1), - ('michael.brown@example.com', 'Michael', 'Brown', 'mypassword', 1), - ('emily.jones@example.com', 'Emily', 'Jones', 'passw0rd', 1); + ('dignissim.tempor.arcu@aol.ca', 'Diana', 'Harrison', '', 1), + ('john.doe@example.com', 'John', 'Doe', '', 2), + ('jane.smith@example.com', 'Jane', 'Smith', '', 1), + ('michael.brown@example.com', 'Michael', 'Brown', '', 1), + ('emily.jones@example.com', 'Emily', 'Jones', '', 1); INSERT INTO notice (title, description, client_id, price, category, status, publish_date) VALUES diff --git a/src/test/java/_11/asktpk/artisanconnectbackend/EmailControllerIntegrationTest.java b/src/test/java/_11/asktpk/artisanconnectbackend/EmailControllerIntegrationTest.java deleted file mode 100644 index 4353b5e..0000000 --- a/src/test/java/_11/asktpk/artisanconnectbackend/EmailControllerIntegrationTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package _11.asktpk.artisanconnectbackend; - -import _11.asktpk.artisanconnectbackend.security.JwtUtil; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; - -@SpringBootTest -@AutoConfigureMockMvc -class EmailControllerIntegrationTest { - - @Autowired - private MockMvc mockMvc; - - @Autowired - private JwtUtil jwtUtil; - - @Test - @DisplayName("Wysyłanie Maila z waznym tokenem") - void testSendEmailWithValidAuthToken() throws Exception { - System.out.println("Startowanie testSendEmailWithValidAuthToken"); - String jsonPayload = """ - { - "to": "test@example.com", - "subject": "Test Subject", - "body": "Test Body" - } - """; - System.out.println("Wysyłanie JSON payload: " + jsonPayload); - - String jwtToken = "Bearer " + jwtUtil.generateToken("test@example.com", "USER", 1L); - - MvcResult result = mockMvc.perform(post("/api/v1/email/send") - .header("Authorization", jwtToken) - .contentType(MediaType.APPLICATION_JSON) - .content(jsonPayload)) - .andExpect(status().isOk()) - .andExpect(content().string("Email wysłany pomyślnie")) - .andReturn(); - - System.out.println("Status odpowiedzi: " + result.getResponse().getStatus()); - System.out.println("Treść odpowiedzi: " + result.getResponse().getContentAsString()); - } - - @Test - @DisplayName("Wysyłanie Maila bez tokena") - void testSendEmailWithoutAuthToken() throws Exception { - System.out.println("Startowanie testSendEmailWithoutAuthToken"); - String jsonPayload = """ - { - "to": "test@example.com", - "subject": "Test Subject", - "body": "Test Body" - } - """; - System.out.println("Wysyłanie JSON payload: " + jsonPayload); - - MvcResult result = mockMvc.perform(post("/api/v1/email/send") - .contentType(MediaType.APPLICATION_JSON) - .content(jsonPayload)) - .andExpect(status().isForbidden()) - .andReturn(); - - System.out.println("Status odpowiedzi: " + result.getResponse().getStatus()); - System.out.println("Treść odpowiedzi: " + result.getResponse().getContentAsString()); - } -} \ No newline at end of file diff --git a/src/test/java/_11/asktpk/artisanconnectbackend/NoticeServiceTest.java b/src/test/java/_11/asktpk/artisanconnectbackend/NoticeServiceTest.java index c96c9d4..b4dda02 100644 --- a/src/test/java/_11/asktpk/artisanconnectbackend/NoticeServiceTest.java +++ b/src/test/java/_11/asktpk/artisanconnectbackend/NoticeServiceTest.java @@ -39,6 +39,9 @@ class NoticeServiceTest { @Mock private AttributeValuesRepository attributeValuesRepository; + @Mock + private AttributesNoticeRepository attributesNoticeRepository; + @InjectMocks private NoticeService noticeService; @@ -121,8 +124,8 @@ class NoticeServiceTest { @DisplayName("Dodanie ogłoszenia z atrybutami") void addNotice_WithAttributes_ShouldSaveAttributes() { AttributeDto attributeDto = new AttributeDto(); - attributeDto.setName("Materiał"); - attributeDto.setValue("Drewno"); + attributeDto.setName("Kolor"); + attributeDto.setValue("Zielony"); sampleNoticeRequest.setAttributes(List.of(attributeDto)); when(clientRepository.findById(1L)).thenReturn(Optional.of(sampleClient));