Merge remote-tracking branch 'origin/fix-payments' into fix-payments

added possibility to get attributes

pom.xml

@@ -44,6 +44,11 @@
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+            <version>2.4.12</version>
+        </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -73,6 +78,42 @@
             <artifactId>jakarta.validation-api</artifactId>
             <version>3.1.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+            <version>3.3.4</version>
+        </dependency>
+
+        <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>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <version>0.11.5</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/_11/asktpk/artisanconnectbackend/config/AppConfig.java

@@ -0,0 +1,15 @@
+package _11.asktpk.artisanconnectbackend.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+public class AppConfig {
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/config/SecurityConfig.java

@@ -0,0 +1,38 @@
+package _11.asktpk.artisanconnectbackend.config;
+
+import _11.asktpk.artisanconnectbackend.security.JwtRequestFilter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig {
+
+    private final JwtRequestFilter jwtRequestFilter;
+
+    public SecurityConfig(JwtRequestFilter jwtRequestFilter) {
+        this.jwtRequestFilter = jwtRequestFilter;
+    }
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http
+                .cors(cors -> cors.configure(http))
+                .csrf(AbstractHttpConfigurer::disable)
+                .authorizeHttpRequests(auth -> auth
+                        .requestMatchers("/api/v1/auth/**", "/api/v1/payments/notification").permitAll()
+                        .anyRequest().authenticated())
+                .sessionManagement(session -> session
+                        .sessionCreationPolicy(SessionCreationPolicy.STATELESS));
+
+        http.addFilterBefore(jwtRequestFilter, UsernamePasswordAuthenticationFilter.class);
+
+        return http.build();
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/controller/AuthController.java

@@ -0,0 +1,126 @@
+package _11.asktpk.artisanconnectbackend.controller;
+
+import _11.asktpk.artisanconnectbackend.dto.*;
+import _11.asktpk.artisanconnectbackend.entities.Client;
+import _11.asktpk.artisanconnectbackend.security.JwtUtil;
+import _11.asktpk.artisanconnectbackend.service.ClientService;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.*;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/v1/auth")
+public class AuthController {
+
+    private final ClientService clientService;
+    private final JwtUtil jwtUtil;
+
+    public AuthController(ClientService clientService, JwtUtil jwtUtil) {
+        this.clientService = clientService;
+        this.jwtUtil = jwtUtil;
+    }
+
+    @PostMapping("/login")
+    public ResponseEntity<AuthResponseDTO> login(@RequestBody AuthRequestDTO authRequestDTO) {
+        if (clientService.checkClientCredentials(authRequestDTO)) {
+            Client client = clientService.getClientByEmail(authRequestDTO.getEmail());
+            Long userId = client.getId();
+            String userRole = client.getRole().getRole();
+
+            String token = jwtUtil.generateToken(client.getEmail(), userRole, userId);
+
+            log.info("User logged in with {}", client.getEmail());
+            return ResponseEntity.status(HttpStatus.OK)
+                    .body(new AuthResponseDTO(userId, userRole, token));
+        } else {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(null);
+        }
+    }
+
+    @PostMapping("/register")
+    public ResponseEntity<AuthResponseDTO> register(@RequestBody ClientRegistrationDTO clientDTO) {
+        if (clientService.getClientByEmail(clientDTO.getEmail()) != null) {
+            return ResponseEntity.status(HttpStatus.CONFLICT).build();
+        }
+
+        ClientDTO savedClient = clientService.registerClient(clientDTO);
+
+        String token = jwtUtil.generateToken(
+                savedClient.getEmail(),
+                savedClient.getRole(),
+                savedClient.getId()
+        );
+
+        log.info("New user registered with {}", savedClient.getEmail());
+
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(new AuthResponseDTO(
+                        savedClient.getId(),
+                        savedClient.getRole(),
+                        token
+                ));
+    }
+
+    @PostMapping("/logout")
+    public ResponseEntity<RequestResponseDTO> logout(HttpServletRequest request) {
+        String authHeader = request.getHeader("Authorization");
+
+        if (authHeader != null && authHeader.startsWith("Bearer ")) {
+            String token = authHeader.substring(7);
+            jwtUtil.blacklistToken(token);
+            return ResponseEntity.ok(new RequestResponseDTO("Successfully logged out"));
+        }
+
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO("Invalid token"));
+    }
+
+    @PostMapping("/google")
+    public ResponseEntity<?> authenticateWithGoogle(@RequestBody GoogleAuthRequestDTO dto) {
+        try {
+            String accessToken = dto.getGoogleToken();
+            String googleUserInfoUrl = "https://www.googleapis.com/oauth2/v3/userinfo";
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.setBearerAuth(accessToken);
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+
+            RestTemplate restTemplate = new RestTemplate();
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    googleUserInfoUrl, HttpMethod.GET, entity, Map.class);
+
+            Map<String, Object> userInfo = response.getBody();
+
+//                String googleId = (String) userInfo.get("sub");  Potencjalnie możemy używać googlowskiego ID, ale to ma konflikt z naszym generowanym
+            assert userInfo != null;
+            String email = (String) userInfo.get("email");
+            String name = (String) userInfo.get("name");
+
+            Client client = clientService.getClientByEmail(email);
+            if (client == null) {
+                client = new Client();
+                client.setEmail(email);
+                client.setFirstName(name);
+                client.setRole(clientService.getUserRole()); // to pobiera po prostu role "USER" z tabeli w bazie
+                clientService.saveClientToDB(client);
+            }
+
+            String jwt = jwtUtil.generateToken(client.getEmail(), client.getRole().getRole(), client.getId());
+
+            log.info("User authenticated with google: {}", email);
+            return ResponseEntity.ok(new AuthResponseDTO(client.getId(), client.getRole().getRole(), jwt));
+        } catch (HttpClientErrorException httpClientErrorException) {
+            log.error("Token is invalid or expired");
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new RequestResponseDTO("Invalid access token"));
+        } catch (Exception e) {
+            log.error("Error while checking Google access token", e);
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
+                    .body(new RequestResponseDTO("Authentication Error (Google): " + e.getMessage()));
+        }
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/controller/ClientController.java

@@ -24,16 +24,16 @@ public class ClientController {
     }
 
     @GetMapping("/get/{id}")
-    public ResponseEntity getClientById(@PathVariable long id) {
+    public ResponseEntity<?> getClientById(@PathVariable long id) {
         if(clientService.getClientById(id) != null) {
-            return new ResponseEntity(clientService.getClientById(id), HttpStatus.OK);
+            return new ResponseEntity<>(clientService.getClientByIdDTO(id), HttpStatus.OK);
         } else {
-            return new ResponseEntity(HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
         }
     }
 
     @PostMapping("/add")
-    public ResponseEntity addClient(@RequestBody ClientDTO clientDTO) {
+    public ResponseEntity<?> addClient(@RequestBody ClientDTO clientDTO) {
         if(clientService.clientExists(clientDTO.getId())) {
             return new ResponseEntity<>(HttpStatus.CONFLICT);
         } else {
@@ -43,7 +43,7 @@ public class ClientController {
 
     // TODO: do zrobienia walidacja danych
     @PutMapping("/edit/{id}")
-    public ResponseEntity updateClient(@PathVariable("id") long id, @RequestBody ClientDTO clientDTO) {
+    public ResponseEntity<?> updateClient(@PathVariable("id") long id, @RequestBody ClientDTO clientDTO) {
         if(clientService.clientExists(id)) {
             return new ResponseEntity<>(clientService.updateClient(id, clientDTO),HttpStatus.OK);
         } else {
@@ -52,7 +52,7 @@ public class ClientController {
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity deleteClient(@PathVariable("id") long id) {
+    public ResponseEntity<?> deleteClient(@PathVariable("id") long id) {
         if(clientService.clientExists(id)) {
             clientService.deleteClient(id);
             return new ResponseEntity<>(HttpStatus.OK);

src/main/java/_11/asktpk/artisanconnectbackend/controller/EmailController.java

@@ -0,0 +1,25 @@
+package _11.asktpk.artisanconnectbackend.controller;
+import _11.asktpk.artisanconnectbackend.dto.EmailDTO;
+import _11.asktpk.artisanconnectbackend.service.EmailService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/v1/email")
+public class EmailController {
+    private final EmailService emailService;
+
+    public EmailController(EmailService emailService) {
+        this.emailService = emailService;
+    }
+
+    @PostMapping("/send")
+    public ResponseEntity<String> sendEmail(@RequestBody EmailDTO email) {
+        try {
+            emailService.sendEmail(email);
+            return ResponseEntity.ok("Email wysłany pomyślnie");
+        } catch (Exception e) {
+            return ResponseEntity.status(500).body("Błąd podczas wysyłania emaila");
+        }
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/controller/ImageController.java

@@ -3,6 +3,7 @@ package _11.asktpk.artisanconnectbackend.controller;
 import _11.asktpk.artisanconnectbackend.dto.RequestResponseDTO;
 import _11.asktpk.artisanconnectbackend.service.ImageService;
 import _11.asktpk.artisanconnectbackend.service.NoticeService;
+import jakarta.persistence.EntityNotFoundException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpStatus;
@@ -63,18 +64,17 @@ public class ImageController {
     }
 
     @GetMapping("/list/{id}")
-    public ResponseEntity<List<String>> getImagesNamesList(@PathVariable("id") Long noticeId) {
-        if(noticeId == null) {
-            return ResponseEntity.badRequest().body(Collections.singletonList("Notice ID is invalid or does not exist."));
-        }
-
+    public ResponseEntity<?> getImagesNamesList(@PathVariable("id") Long noticeId) {
         List<String> result;
         try {
+            noticeService.getNoticeById(noticeId);
             result = imageService.getImagesList(noticeId);
+            return ResponseEntity.ok(result);
+        } catch (EntityNotFoundException e) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new RequestResponseDTO(e.getMessage()));
         } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(Collections.singletonList(e.getMessage()));
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new RequestResponseDTO(e.getMessage()));
         }
-        return ResponseEntity.ok(result);
     }
 
     @DeleteMapping("/delete/{filename}")

src/main/java/_11/asktpk/artisanconnectbackend/controller/NoticeController.java

@@ -1,17 +1,17 @@
 package _11.asktpk.artisanconnectbackend.controller;
 
-import _11.asktpk.artisanconnectbackend.dto.NoticeAdditionDTO;
-import _11.asktpk.artisanconnectbackend.dto.NoticeBoostDTO;
-import _11.asktpk.artisanconnectbackend.dto.RequestResponseDTO;
+import _11.asktpk.artisanconnectbackend.dto.*;
 import _11.asktpk.artisanconnectbackend.service.ClientService;
 import _11.asktpk.artisanconnectbackend.service.NoticeService;
-import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
+import _11.asktpk.artisanconnectbackend.utils.Enums;
+import _11.asktpk.artisanconnectbackend.utils.Tools;
 import jakarta.persistence.EntityNotFoundException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RequestMapping("/api/v1/notices")
@@ -19,14 +19,16 @@ import java.util.List;
 public class NoticeController {
     private final NoticeService noticeService;
     private final ClientService clientService;
+    private final Tools tools;
 
-    public NoticeController(NoticeService noticeService, ClientService clientService) {
+    public NoticeController(NoticeService noticeService, ClientService clientService, Tools tools) {
         this.noticeService = noticeService;
         this.clientService = clientService;
+        this.tools = tools;
     }
 
     @GetMapping("/get/all")
-    public List<NoticeDTO> getAllNotices() {
+    public List<NoticeResponseDTO> getAllNotices() {
         return noticeService.getAllNotices();
     }
 
@@ -40,57 +42,34 @@ public class NoticeController {
     }
 
     @PostMapping("/add")
-    public ResponseEntity<NoticeAdditionDTO> addNotice(@RequestBody NoticeDTO dto) {
-        if (!clientService.clientExists(dto.getClientId())) {
+    public ResponseEntity<NoticeAdditionDTO> addNotice(@RequestBody NoticeRequestDTO dto, HttpServletRequest request) {
+        Long clientId = tools.getClientIdFromRequest(request);
+        if (!clientService.clientExists(clientId)) {
             return ResponseEntity
                     .status(HttpStatus.BAD_REQUEST)
-                    .body(new NoticeAdditionDTO("Nie znaleziono klienta o ID: " + dto.getClientId()));
+                    .body(new NoticeAdditionDTO("Nie znaleziono klienta o ID: " + clientId));
         }
 
-        if (dto.getCategory() == null) {
+        dto.setClientId(clientId);
+
+        if (dto.getCategory() == null || !Arrays.asList(Enums.Category.values()).contains(dto.getCategory())) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new NoticeAdditionDTO("Nie ma takiej kategorii"));
         }
-        dto.setPublishDate(java.time.LocalDateTime.now());
 
         Long newNoticeId = noticeService.addNotice(dto);
 
         return ResponseEntity.status(HttpStatus.CREATED).body(new NoticeAdditionDTO(newNoticeId ,"Dodano ogłoszenie."));
     }
 
-    // TODO: zamiast dodawać tutaj pętlą, musi to robić NoticeService, trzeba zaimplementować odpowienią metodę
-    @PostMapping("/bulk_add")
-    public ResponseEntity<String> addNotices(@RequestBody List<NoticeDTO> notices_list) {
-        ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.CREATED);
-        List<String> errors = new ArrayList<>();
-        boolean isError = false;
-
-        if (notices_list.isEmpty()) {
-            return response.status(HttpStatus.BAD_REQUEST).body("Lista ogłoszeń jest pusta.");
-        }
-
-        for (NoticeDTO dto : notices_list) {
-            if (!clientService.clientExists(dto.getClientId())) {
-                isError = true;
-                errors.add(dto.getClientId().toString());
-            } else {
-                if (!isError) {
-                    noticeService.addNotice(dto);
-                }
-            }
-        }
-
-        if (isError) {
-            return response.status(HttpStatus.BAD_REQUEST).body("Nie znaleziono klientów: " + errors);
-        }
-
-        return response;
-    }
-
     @PutMapping("/edit/{id}")
-    public ResponseEntity<Object> editNotice(@PathVariable("id") long id, @RequestBody NoticeDTO dto) {
+    public ResponseEntity<Object> editNotice(@PathVariable("id") long id, @RequestBody NoticeRequestDTO dto, HttpServletRequest request) {
+        Long clientIdFromToken = tools.getClientIdFromRequest(request);
         if (noticeService.noticeExists(id)) {
+            if (!noticeService.isNoticeOwnedByClient(id, clientIdFromToken)) {
+                return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new RequestResponseDTO("Nie masz uprawnień do edycji tego ogłoszenia."));
+            }
             try {
-                return new ResponseEntity<>(noticeService.updateNotice(id, dto), HttpStatus.OK);
+                return ResponseEntity.status(HttpStatus.OK).body(noticeService.updateNotice(id, dto));
             } catch (EntityNotFoundException e) {
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
             }
@@ -100,8 +79,13 @@ public class NoticeController {
     }
 
     @DeleteMapping("/delete/{id}")
-    public ResponseEntity<RequestResponseDTO> deleteNotice(@PathVariable("id") long id) {
+    public ResponseEntity<RequestResponseDTO> deleteNotice(@PathVariable("id") long id, HttpServletRequest request) {
+        Long clientIdFromToken = tools.getClientIdFromRequest(request);
         if (noticeService.noticeExists(id)) {
+            if (!noticeService.isNoticeOwnedByClient(id, clientIdFromToken)) {
+                return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new RequestResponseDTO("Nie masz uprawnień do usunięcia tego ogłoszenia."));
+            }
+
             noticeService.deleteNotice(id);
             return ResponseEntity.status(HttpStatus.OK).body(new RequestResponseDTO("Pomyślnie usunięto ogłoszenie o ID: " + id));
         } else {
@@ -109,9 +93,10 @@ public class NoticeController {
         }
     }
 
-    @PostMapping("/boost/{id}")
-    public ResponseEntity<RequestResponseDTO> boostNotice(@PathVariable("id") long clientId, @RequestBody NoticeBoostDTO dto) {
-        if (!noticeService.isNoticeOwnedByClient(dto.getNoticeId(), clientId)) {
+    @PostMapping("/boost")
+    public ResponseEntity<RequestResponseDTO> boostNotice(@RequestBody NoticeBoostDTO dto, HttpServletRequest request) {
+        Long clientId = tools.getClientIdFromRequest(request);
+        if (noticeService.isNoticeOwnedByClient(dto.getNoticeId(), clientId)) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new RequestResponseDTO("Ogłoszenie nie istnieje lub nie należy do zalogowanego klienta."));
         }
         noticeService.boostNotice(dto.getNoticeId());

src/main/java/_11/asktpk/artisanconnectbackend/controller/OrderController.java

@@ -0,0 +1,129 @@
+package _11.asktpk.artisanconnectbackend.controller;
+
+import _11.asktpk.artisanconnectbackend.dto.*;
+import _11.asktpk.artisanconnectbackend.entities.Client;
+import _11.asktpk.artisanconnectbackend.entities.Order;
+import _11.asktpk.artisanconnectbackend.entities.Payment;
+import _11.asktpk.artisanconnectbackend.service.OrderService;
+import _11.asktpk.artisanconnectbackend.service.PaymentService;
+import _11.asktpk.artisanconnectbackend.utils.Enums;
+import _11.asktpk.artisanconnectbackend.utils.Tools;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@RestController
+@RequestMapping("/api/v1/orders")
+public class OrderController {
+
+    private final OrderService orderService;
+    private final PaymentService paymentService;
+    private final Tools tools;
+
+    public OrderController(OrderService orderService, PaymentService paymentService, Tools tools) {
+        this.orderService = orderService;
+        this.paymentService = paymentService;
+        this.tools = tools;
+    }
+
+    @PostMapping("/add")
+    public ResponseEntity<?> addClient(@RequestBody OrderDTO orderDTO, HttpServletRequest request) {
+        orderDTO.setClientId(tools.getClientIdFromRequest(request));
+        return ResponseEntity.status(HttpStatus.CREATED).body(orderService.addOrder(orderDTO));
+    }
+
+    @PutMapping("/changeStatus")
+    public ResponseEntity<?> changeStatus(@RequestBody OrderStatusDTO orderStatusDTO) {
+        return ResponseEntity.status(HttpStatus.OK).body(orderService.changeOrderStatus(orderStatusDTO.getId(), orderStatusDTO.getStatus()));
+    }
+
+    @PostMapping("/token")
+    public ResponseEntity<?> fetchToken(HttpServletRequest request,@RequestParam Long orderId) {
+        Order order = orderService.getOrderById(orderId);
+        Client client = order.getClient();
+        OAuthPaymentResponseDTO authPaymentDTO = paymentService.getOAuthToken();
+        TransactionPaymentRequestDTO.Payer payer = new TransactionPaymentRequestDTO.Payer(
+                client.getEmail(), client.getFirstName()+' '+client.getLastName());
+
+        String paymentDescription = order.getOrderType() == Enums.OrderType.ACTIVATION ? "Aktywacja ogłoszenia" : "Podbicie ogłoszenia";
+        paymentDescription += order.getNotice().getTitle();
+        TransactionPaymentRequestDTO paymentRequest = new TransactionPaymentRequestDTO(
+                order.getAmount(), paymentDescription, payer);
+
+        String response = paymentService.createTransaction(order, authPaymentDTO.getAccess_token(), paymentRequest);
+
+        return ResponseEntity.status(HttpStatus.OK).body(response);
+    }
+
+    @GetMapping("/get/all")
+    public ResponseEntity<List<OrderWithPaymentsDTO>> getOrders(HttpServletRequest request) {
+        Long clientId = tools.getClientIdFromRequest(request);
+        List<Order> orders = orderService.getOrdersByClientId(clientId);
+
+        List<OrderWithPaymentsDTO> dtoList = orders.stream().map(order -> {
+            OrderWithPaymentsDTO dto = new OrderWithPaymentsDTO();
+            dto.setOrderId(order.getId());
+            dto.setOrderType(order.getOrderType().name());
+            dto.setStatus(order.getStatus().name());
+            dto.setAmount(order.getAmount());
+            dto.setCreatedAt(order.getCreatedAt());
+
+            List<Payment> payments = paymentService.getPaymentsByOrderId(order.getId());
+
+            List<PaymentDTO> paymentDTOs = payments.stream().map(payment -> {
+                PaymentDTO pDto = new PaymentDTO();
+                pDto.setPaymentId(payment.getIdPayment());
+                pDto.setAmount(payment.getAmount());
+                pDto.setStatus(payment.getStatus().name());
+                pDto.setTransactionPaymentUrl(payment.getTransactionPaymentUrl());
+                pDto.setTransactionId(payment.getTransactionId());
+                return pDto;
+            }).toList();
+
+            dto.setPayments(paymentDTOs);
+            return dto;
+        }).toList();
+
+        return ResponseEntity.ok(dtoList);
+    }
+
+    @GetMapping("/get/{orderId}")
+    public ResponseEntity<OrderWithPaymentsDTO> getOrderById(HttpServletRequest request,
+                                                             @PathVariable Long orderId) {
+        Long clientId = tools.getClientIdFromRequest(request);
+
+        Order order = orderService.getOrderById(orderId);
+
+        if (!order.getClient().getId().equals(clientId)) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
+        }
+
+        OrderWithPaymentsDTO dto = new OrderWithPaymentsDTO();
+        dto.setOrderId(order.getId());
+        dto.setOrderType(order.getOrderType().name());
+        dto.setStatus(order.getStatus().name());
+        dto.setAmount(order.getAmount());
+        dto.setCreatedAt(order.getCreatedAt());
+
+        List<Payment> payments = paymentService.getPaymentsByOrderId(order.getId());
+        List<PaymentDTO> paymentDTOs = payments.stream().map(payment -> {
+            PaymentDTO pDto = new PaymentDTO();
+            pDto.setPaymentId(payment.getIdPayment());
+            pDto.setAmount(payment.getAmount());
+            pDto.setStatus(payment.getStatus().name());
+            pDto.setTransactionPaymentUrl(payment.getTransactionPaymentUrl());
+            pDto.setTransactionId(payment.getTransactionId());
+            return pDto;
+        }).toList();
+
+        dto.setPayments(paymentDTOs);
+
+        return ResponseEntity.ok(dto);
+    }
+
+
+}

src/main/java/_11/asktpk/artisanconnectbackend/controller/PaymentController.java

@@ -0,0 +1,93 @@
+package _11.asktpk.artisanconnectbackend.controller;
+
+import _11.asktpk.artisanconnectbackend.entities.Notice;
+import _11.asktpk.artisanconnectbackend.entities.Order;
+import _11.asktpk.artisanconnectbackend.entities.Payment;
+import _11.asktpk.artisanconnectbackend.repository.PaymentRepository;
+import _11.asktpk.artisanconnectbackend.utils.Enums;
+import org.springframework.beans.factory.annotation.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/api/v1/payments")
+public class PaymentController {
+
+    @Value("${tpay.securityCode}")
+    private String sellerSecurityCode;
+
+    private static final Logger log = LoggerFactory.getLogger(PaymentController.class);
+
+    private final PaymentRepository paymentRepository;
+
+    public PaymentController(PaymentRepository paymentRepository) {
+        this.paymentRepository = paymentRepository;
+    }
+
+    @PostMapping(value = "/notification", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    public ResponseEntity<String> handleTpayNotification(@RequestParam Map<String, String> params) {
+        String id = params.get("id");
+        String trId = params.get("tr_id");
+        String trAmount = params.get("tr_amount");
+        String trCrc = params.get("tr_crc");
+        String md5sum = params.get("md5sum");
+        String trStatus = params.get("tr_status");
+
+        String expectedMd5 = DigestUtils.md5DigestAsHex(
+                (id + trId + trAmount + trCrc + sellerSecurityCode).getBytes()
+        );
+
+        if (!expectedMd5.equals(md5sum)) {
+            return ResponseEntity.status(400).body("INVALID CHECKSUM");
+        }
+
+        Optional<Payment> optionalPayment = paymentRepository.findByTransactionId(trId);
+        if (optionalPayment.isPresent()) {
+            Payment payment = optionalPayment.get();
+
+            if ("true".equalsIgnoreCase(trStatus) || "PAID".equalsIgnoreCase(trStatus)) {
+                payment.setStatus(Enums.PaymentStatus.CORRECT);
+
+                if (payment.getOrder() != null) {
+                    Order order = payment.getOrder();
+                    order.setStatus(Enums.OrderStatus.COMPLETED);
+                    Notice notice = order.getNotice();
+                    if (order.getOrderType() == Enums.OrderType.ACTIVATION) {
+                        notice.setStatus(Enums.Status.ACTIVE);
+                    } else if (order.getOrderType() == Enums.OrderType.BOOST) {
+                        notice.setPublishDate(LocalDateTime.now());
+                    }
+                }
+
+            } else if ("false".equalsIgnoreCase(trStatus)) {
+                payment.setStatus(Enums.PaymentStatus.INCORRECT);
+
+                if (payment.getOrder() != null) {
+                    payment.getOrder().setStatus(Enums.OrderStatus.CANCELLED);
+                }
+            }
+
+            paymentRepository.save(payment);
+        }
+        return ResponseEntity.ok("TRUE");
+    }
+
+    private String paramsToLogString(Map<String, String> params) {
+        return params.entrySet().stream()
+                .map(e -> e.getKey() + " = " + e.getValue())
+                .collect(Collectors.joining("\n"));
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/controller/VariablesController.java

@@ -13,7 +13,6 @@ import java.util.Map;
 @RestController
 @RequestMapping("/api/v1/vars")
 public class VariablesController {
-
     @GetMapping("/categories")
     public List<CategoriesDTO> getAllVariables() {
         List<CategoriesDTO> categoriesDTOList = new ArrayList<>();
@@ -31,10 +30,4 @@ public class VariablesController {
     public List<Enums.Status> getAllStatuses() {
         return List.of(Enums.Status.values());
     }
-
-    @GetMapping("/roles")
-    public List<Enums.Role> getAllRoles() {
-        return List.of(Enums.Role.values());
-    }
-
 }

src/main/java/_11/asktpk/artisanconnectbackend/controller/WishlistController.java

@@ -1,35 +1,39 @@
 package _11.asktpk.artisanconnectbackend.controller;
 
-import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
+import _11.asktpk.artisanconnectbackend.dto.NoticeResponseDTO;
 import _11.asktpk.artisanconnectbackend.dto.RequestResponseDTO;
-import _11.asktpk.artisanconnectbackend.dto.WishlistDTO;
 import _11.asktpk.artisanconnectbackend.service.ClientService;
 import _11.asktpk.artisanconnectbackend.service.NoticeService;
 import _11.asktpk.artisanconnectbackend.service.WishlistService;
+import _11.asktpk.artisanconnectbackend.utils.Tools;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+@Slf4j
 @RestController
 @RequestMapping("/api/v1/wishlist")
 public class WishlistController {
     private final WishlistService wishlistService;
     private final ClientService clientService;
     private final NoticeService noticeService;
+    private final Tools tools;
 
-    public WishlistController(WishlistService wishlistService, ClientService clientService, NoticeService noticeService) {
+    public WishlistController(WishlistService wishlistService, ClientService clientService, NoticeService noticeService, Tools tools) {
         this.wishlistService = wishlistService;
         this.clientService = clientService;
         this.noticeService = noticeService;
+        this.tools = tools;
     }
 
-    @PostMapping("/toggle")
-    public ResponseEntity<RequestResponseDTO> toggleWishlist(@RequestBody WishlistDTO wishlistDTO) {
-        Long noticeId = wishlistDTO.getNoticeId();
-        Long clientId = wishlistDTO.getClientId();
-        NoticeDTO noticeDTO = noticeService.getNoticeById(noticeId);
-        if (noticeDTO == null) {
+    @PostMapping("/toggle/{noticeId}")
+    public ResponseEntity<RequestResponseDTO> toggleWishlist(@PathVariable Long noticeId, HttpServletRequest request) {
+        Long clientId = tools.getClientIdFromRequest(request);
+        NoticeResponseDTO noticeResponseDTO = noticeService.getNoticeById(noticeId);
+        if (noticeResponseDTO == null) {
             return ResponseEntity.badRequest().body(new RequestResponseDTO("Notice not found"));
         }
         boolean added = wishlistService.toggleWishlist(
@@ -51,9 +55,8 @@ public class WishlistController {
 //    }
 
     @GetMapping("/")
-    public List<NoticeDTO> getWishlistForClient() {
-        // TODO: Replace with actual client ID from authentication context
-        Long clientId = 1L;
+    public List<NoticeResponseDTO> getWishlistForClient(HttpServletRequest request) {
+        Long clientId = tools.getClientIdFromRequest(request);
         return wishlistService.getNoticesInWishlist(clientId);
     }
 }

src/main/java/_11/asktpk/artisanconnectbackend/dto/AttributeDto.java

@@ -0,0 +1,11 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public class AttributeDto {
+    private String name;
+    private String value;
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/AuthRequestDTO.java

@@ -0,0 +1,10 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public class AuthRequestDTO {
+    private String email;
+    private String password;
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/AuthResponseDTO.java

@@ -0,0 +1,12 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter @AllArgsConstructor
+public class AuthResponseDTO {
+    private Long user_id;
+    private String user_role;
+    private String token;
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/ClientDTO.java

@@ -6,8 +6,6 @@ import lombok.Setter;
 
 import jakarta.validation.constraints.Email;
 
-import _11.asktpk.artisanconnectbackend.utils.Enums.Role;
-
 @Getter @Setter
 public class ClientDTO {
     private Long id;
@@ -18,5 +16,5 @@ public class ClientDTO {
     private String firstName;
     private String lastName;
     private String image;
-    private Role role;
+    private String role;
 }

src/main/java/_11/asktpk/artisanconnectbackend/dto/ClientRegistrationDTO.java

@@ -0,0 +1,16 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public class ClientRegistrationDTO {
+    @Email
+    @NotBlank
+    private String email;
+    private String firstName;
+    private String lastName;
+    private String password;
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/EmailDTO.java

@@ -0,0 +1,20 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+public class EmailDTO {
+    @Email(message = "Podaj poprawny adres email")
+    @NotBlank(message = "Adres email nie może być pusty")
+    private String to;
+
+    @NotBlank(message = "Temat nie może być pusty")
+    private String subject;
+
+    @NotBlank(message = "Treść nie może być pusta")
+    private String body;
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/GoogleAuthRequestDTO.java

@@ -0,0 +1,9 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public class GoogleAuthRequestDTO {
+    private String googleToken;
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/NoticeRequestDTO.java

@@ -0,0 +1,24 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import _11.asktpk.artisanconnectbackend.utils.Enums;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public class NoticeRequestDTO {
+    private String title;
+
+    private Long clientId;
+
+    private String description;
+
+    private Double price;
+
+    private Enums.Category category;
+
+    private Enums.Status status;
+
+    public NoticeRequestDTO() {
+
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/NoticeResponseDTO.java

@@ -1,6 +1,5 @@
 package _11.asktpk.artisanconnectbackend.dto;
 
-import _11.asktpk.artisanconnectbackend.entities.AttributesNotice;
 import _11.asktpk.artisanconnectbackend.utils.Enums;
 import lombok.Getter;
 import lombok.Setter;
@@ -9,7 +8,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 @Getter @Setter
-public class NoticeDTO {
+public class NoticeResponseDTO {
     private long noticeId;
 
     private String title;
@@ -26,11 +25,9 @@ public class NoticeDTO {
 
     private LocalDateTime publishDate;
 
-    private List<AttributesNotice> attributesNotices;
+    private List<AttributeDto> attributes;
 
-    private boolean isWishlisted;
-
-    public NoticeDTO() {
+    public NoticeResponseDTO() {
 
     }
 }

src/main/java/_11/asktpk/artisanconnectbackend/dto/OAuthPaymentResponseDTO.java

@@ -0,0 +1,15 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class OAuthPaymentResponseDTO {
+    private long issued_at;
+    private String scope;
+    private String token_type;
+    private int expires_in;
+    private String client_id;
+    private String access_token;
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/OrderDTO.java

@@ -0,0 +1,13 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import _11.asktpk.artisanconnectbackend.utils.Enums;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class OrderDTO {
+    private Long clientId;
+    private Long noticeId;
+    private Enums.OrderType orderType;
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/OrderStatusDTO.java

@@ -0,0 +1,12 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+
+import _11.asktpk.artisanconnectbackend.utils.Enums;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public class OrderStatusDTO {
+    public long id;
+    public Enums.OrderStatus status;
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/OrderWithPaymentsDTO.java

@@ -0,0 +1,62 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public class OrderWithPaymentsDTO {
+    private Long orderId;
+    private String orderType;
+    private String status;
+    private Double amount;
+    private LocalDateTime createdAt;
+    private List<PaymentDTO> payments;
+
+    // Gettery i settery
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(String orderType) {
+        this.orderType = orderType;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Double getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Double amount) {
+        this.amount = amount;
+    }
+
+    public LocalDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(LocalDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public List<PaymentDTO> getPayments() {
+        return payments;
+    }
+
+    public void setPayments(List<PaymentDTO> payments) {
+        this.payments = payments;
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/PaymentDTO.java

@@ -0,0 +1,34 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PaymentDTO {
+    private Long paymentId;
+    private Double amount;
+    private String status;
+    private String transactionPaymentUrl;
+    private String transactionId;
+
+    public void setPaymentId(Long paymentId) {
+        this.paymentId = paymentId;
+    }
+
+    public void setAmount(Double amount) {
+        this.amount = amount;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public void setTransactionPaymentUrl(String transactionPaymentUrl) {
+        this.transactionPaymentUrl = transactionPaymentUrl;
+    }
+
+    public void setTransactionId(String transactionId) {
+        this.transactionId = transactionId;
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/RequestResponseDTO.java

@@ -10,4 +10,8 @@ public class RequestResponseDTO {
     public RequestResponseDTO(String message) {
         this.message = message;
     }
+
+    public String toJSON() {
+        return "{\"message\":\"" + message + "\"}";
+    }
 }

src/main/java/_11/asktpk/artisanconnectbackend/dto/TransactionPaymentRequestDTO.java

@@ -0,0 +1,23 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class TransactionPaymentRequestDTO {
+    private double amount;
+    private String description;
+    private Payer payer;
+
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Payer {
+        private String email;
+        private String name;
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/dto/TransactionPaymentResponseDTO.java

@@ -0,0 +1,80 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Getter;
+import lombok.Setter;
+
+    @Getter
+    @Setter
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public class TransactionPaymentResponseDTO {
+        private String result;
+        private String requestId;
+        private String transactionId;
+        private String title;
+        private String posId;
+        private String status;
+        private DateInfo date;
+        private double amount;
+        private String currency;
+        private String description;
+        private String hiddenDescription;
+        private Payer payer;
+        private Payments payments;
+        private String transactionPaymentUrl;
+
+        @Getter
+        @Setter
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        public static class DateInfo {
+            private String creation;
+            private String realization;
+        }
+
+        @Getter
+        @Setter
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        public static class Payer {
+            private String payerId;
+            private String email;
+            private String name;
+            private String phone;
+            private String address;
+            private String city;
+            private String country;
+            private String postalCode;
+        }
+
+        @Getter
+        @Setter
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        public static class Payments {
+            private String status;
+            private String method;
+            private double amountPaid;
+            private DateInfo date;
+        }
+
+        @Override
+        public String toString() {
+            return "YourClassName{" +
+                    "result='" + result + '\'' +
+                    ", requestId='" + requestId + '\'' +
+                    ", transactionId='" + transactionId + '\'' +
+                    ", title='" + title + '\'' +
+                    ", posId='" + posId + '\'' +
+                    ", status='" + status + '\'' +
+                    ", date=" + date +
+                    ", amount=" + amount +
+                    ", currency='" + currency + '\'' +
+                    ", description='" + description + '\'' +
+                    ", hiddenDescription='" + hiddenDescription + '\'' +
+                    ", payer=" + payer +
+                    ", payments=" + payments +
+                    ", transactionPaymentUrl='" + transactionPaymentUrl + '\'' +
+                    '}';
+        }
+
+    }
+
+

src/main/java/_11/asktpk/artisanconnectbackend/entities/AttributeValues.java

@@ -1,9 +1,12 @@
 package _11.asktpk.artisanconnectbackend.entities;
 
 import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
 
 @Entity
 @Table(name = "attribute_values")
+@Getter @Setter
 public class AttributeValues {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -14,6 +17,4 @@ public class AttributeValues {
     private Attributes attribute;
 
     private String value;
-
-    // Getters, setters, and constructors
 }

src/main/java/_11/asktpk/artisanconnectbackend/entities/Attributes.java

@@ -1,10 +1,14 @@
 package _11.asktpk.artisanconnectbackend.entities;
 
 import jakarta.persistence.*;
+import lombok.Setter;
+import lombok.Getter;
+
 import java.util.List;
 
 @Entity
 @Table(name = "attributes")
+@Getter @Setter
 public class Attributes {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -12,8 +16,6 @@ public class Attributes {
 
     private String name;
 
-    @OneToMany(mappedBy = "attribute", cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "attribute")
     private List<AttributeValues> attributeValues;
-
-    // Getters, setters, and constructors
 }

src/main/java/_11/asktpk/artisanconnectbackend/entities/AttributesNotice.java

@@ -1,21 +1,20 @@
 package _11.asktpk.artisanconnectbackend.entities;
 
 import jakarta.persistence.*;
+import lombok.Setter;
+import lombok.Getter;
 
 @Entity
 @Table(name = "attributes_notice")
+@Getter @Setter
 public class AttributesNotice {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @ManyToOne
-    @JoinColumn(name = "id_notice")
-    private Notice notice;
+    private Long notice_id;
 
     @ManyToOne
     @JoinColumn(name = "id_value")
     private AttributeValues attributeValue;
-
-    // Getters, setters, and constructors
 }

src/main/java/_11/asktpk/artisanconnectbackend/entities/Client.java

@@ -1,11 +1,11 @@
 package _11.asktpk.artisanconnectbackend.entities;
 
-import _11.asktpk.artisanconnectbackend.utils.Enums.Role;
-
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.CreationTimestamp;
 
+import java.util.Date;
 import java.util.List;
 
 @Entity
@@ -24,14 +24,15 @@ public class Client {
 
     private String lastName;
 
-    private String image; // Optional field
+    private String image;
 
-    @Enumerated(EnumType.STRING)
+    @ManyToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "role_id", referencedColumnName = "id")
     private Role role;
 
-//    @OneToMany(mappedBy = "client", cascade = CascadeType.ALL)
-//    private List<Notice> notices;
-
     @OneToMany(mappedBy = "client", cascade = CascadeType.ALL)
-    private List<Orders> orders;
+    private List<Order> orders;
+
+    @CreationTimestamp
+    private Date createdAt;
 }

src/main/java/_11/asktpk/artisanconnectbackend/entities/GlobalVariables.java

@@ -1,16 +0,0 @@
-package _11.asktpk.artisanconnectbackend.entities;
-
-import jakarta.persistence.*;
-
-@Entity
-@Table(name = "global_variables")
-public class GlobalVariables {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    private String name;
-    private String value;
-
-    // Getters, setters, and constructors
-}

src/main/java/_11/asktpk/artisanconnectbackend/entities/Notice.java

@@ -35,12 +35,12 @@ public class Notice {
 
     private LocalDateTime publishDate;
 
-    @OneToMany(mappedBy = "notice", cascade = CascadeType.ALL)
+    @OneToMany(mappedBy = "notice_id")
     private List<AttributesNotice> attributesNotices;
 
-    @OneToMany(mappedBy = "notice", cascade = CascadeType.ALL)
-    private List<Orders> orders;
+    @OneToMany(mappedBy = "notice")
+    private List<Order> orders;
 
-    @OneToMany(mappedBy = "notice", cascade = CascadeType.ALL)
-    private List<Payments> payments;
+//    @OneToMany(mappedBy = "notice", cascade = CascadeType.ALL)
+//    private List<Payment> payment;
 }

src/main/java/_11/asktpk/artisanconnectbackend/entities/Order.java

@@ -0,0 +1,43 @@
+package _11.asktpk.artisanconnectbackend.entities;
+
+import _11.asktpk.artisanconnectbackend.utils.Enums;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "orders")
+@Getter
+@Setter
+public class Order {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "id_client")
+    private Client client;
+
+    @ManyToOne
+    @JoinColumn(name = "id_notice")
+    private Notice notice;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private Enums.OrderType orderType;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private Enums.OrderStatus status;
+
+    @Column(nullable = false)
+    private Double amount;
+
+    @Column(nullable = false)
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+}

src/main/java/_11/asktpk/artisanconnectbackend/entities/Orders.java

@@ -1,26 +0,0 @@
-package _11.asktpk.artisanconnectbackend.entities;
-
-import _11.asktpk.artisanconnectbackend.utils.Enums.Status;
-
-import jakarta.persistence.*;
-
-@Entity
-@Table(name = "orders")
-public class Orders {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long idOrder;
-
-    @ManyToOne
-    @JoinColumn(name = "id_user")
-    private Client client;
-
-    @ManyToOne
-    @JoinColumn(name = "id_notice")
-    private Notice notice;
-
-    @Enumerated(EnumType.STRING)
-    private Status status;
-
-    // Getters, setters, and constructors
-}

src/main/java/_11/asktpk/artisanconnectbackend/entities/Payment.java

@@ -0,0 +1,30 @@
+package _11.asktpk.artisanconnectbackend.entities;
+
+import _11.asktpk.artisanconnectbackend.utils.Enums;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "payment")
+@Getter @Setter
+public class Payment {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long idPayment;
+
+    @ManyToOne
+    @JoinColumn(name = "id_order")
+    private Order order;
+
+    private Double amount;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private Enums.PaymentStatus status;
+
+    private String transactionPaymentUrl;
+
+    private String transactionId;
+}

src/main/java/_11/asktpk/artisanconnectbackend/entities/Payments.java

@@ -1,30 +0,0 @@
-package _11.asktpk.artisanconnectbackend.entities;
-
-import _11.asktpk.artisanconnectbackend.utils.Enums.Status;
-
-import jakarta.persistence.*;
-
-@Entity
-@Table(name = "payments")
-public class Payments {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long idPayment;
-
-    @ManyToOne
-    @JoinColumn(name = "id_order")
-    private Orders order;
-
-    @ManyToOne
-    @JoinColumn(name = "id_notice")
-    private Notice notice;
-
-    private Double noticePublishPrice;
-
-    @Enumerated(EnumType.STRING)
-    private Status status;
-
-    private String sessionId;
-
-    // Getters, setters, and constructors
-}

src/main/java/_11/asktpk/artisanconnectbackend/entities/Role.java

@@ -0,0 +1,19 @@
+package _11.asktpk.artisanconnectbackend.entities;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name = "roles")
+@Getter
+@Setter
+public class Role {
+    @Id
+    private Long id;
+    @Column(name="rolename")
+    private String role;
+}

src/main/java/_11/asktpk/artisanconnectbackend/repository/ClientRepository.java

@@ -1,8 +1,8 @@
 package _11.asktpk.artisanconnectbackend.repository;
 
 import _11.asktpk.artisanconnectbackend.entities.Client;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ClientRepository extends JpaRepository<Client, Long> {
+    Client findByEmail(String email);
 }

src/main/java/_11/asktpk/artisanconnectbackend/repository/NoticeRepository.java

@@ -1,11 +1,9 @@
 package _11.asktpk.artisanconnectbackend.repository;
 
 import _11.asktpk.artisanconnectbackend.entities.Notice;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface NoticeRepository extends JpaRepository<Notice, Long> {
 
     boolean existsByIdNoticeAndClientId(long noticeId, long clientId);
-
-}
+}

src/main/java/_11/asktpk/artisanconnectbackend/repository/OrderRepository.java

@@ -0,0 +1,13 @@
+package _11.asktpk.artisanconnectbackend.repository;
+
+import _11.asktpk.artisanconnectbackend.entities.Order;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface OrderRepository extends JpaRepository<Order, Long> {
+    List<Order> findByClientId(Long clientId);
+
+}

src/main/java/_11/asktpk/artisanconnectbackend/repository/PaymentRepository.java

@@ -0,0 +1,15 @@
+package _11.asktpk.artisanconnectbackend.repository;
+
+import _11.asktpk.artisanconnectbackend.entities.Payment;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface PaymentRepository extends JpaRepository<Payment, Long> {
+        Optional<Payment> findByTransactionId(String transactionId);
+
+    List<Payment> findAllByOrderId(Long id);
+}

src/main/java/_11/asktpk/artisanconnectbackend/repository/RolesRepository.java

@@ -0,0 +1,12 @@
+package _11.asktpk.artisanconnectbackend.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import _11.asktpk.artisanconnectbackend.entities.Role;
+
+@Repository
+public interface RolesRepository extends JpaRepository<Role, String> {
+    Role findRoleById(Long id);
+
+    Role findRoleByRole(String role);
+}

src/main/java/_11/asktpk/artisanconnectbackend/security/JwtRequestFilter.java

@@ -0,0 +1,80 @@
+package _11.asktpk.artisanconnectbackend.security;
+
+import _11.asktpk.artisanconnectbackend.dto.RequestResponseDTO;
+import io.jsonwebtoken.ExpiredJwtException;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+import java.util.Collections;
+
+@Component
+public class JwtRequestFilter extends OncePerRequestFilter {
+
+    private final JwtUtil jwtUtil;
+
+    public JwtRequestFilter(JwtUtil jwtUtil) {
+        this.jwtUtil = jwtUtil;
+    }
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, @NotNull HttpServletResponse response, @NotNull FilterChain chain)
+            throws ServletException, IOException {
+
+        final String authorizationHeader = request.getHeader("Authorization");
+
+        String email = null;
+        String jwt = null;
+
+        if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) {
+            jwt = authorizationHeader.substring(7);
+
+            try {
+                if (jwtUtil.isBlacklisted(jwt) || !jwtUtil.isLatestToken(jwt)) {
+                    response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+                    response.setContentType("application/json");
+                    response.setCharacterEncoding("UTF-8");
+                    String jsonResponse = "{\"error\": \"Token is invalid. Please login again.\"}";
+                    response.getWriter().write(jsonResponse);
+                    return;
+                }
+
+
+                email = jwtUtil.extractEmail(jwt);
+            } catch (ExpiredJwtException expiredJwtException) {
+                logger.error(expiredJwtException.getMessage());
+                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+                response.getWriter().write(new RequestResponseDTO("Authentication token is expired. Please login again.").toJSON());
+                return;
+            } catch (Exception e) {
+                logger.error(e.getMessage());
+                response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+                response.getWriter().write(new RequestResponseDTO(e.getMessage()).toJSON());
+                return;
+            }
+        }
+
+        if (email != null && SecurityContextHolder.getContext().getAuthentication() == null) {
+            String role = jwtUtil.extractRole(jwt);
+
+            UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(
+                    email, null, Collections.singletonList(new SimpleGrantedAuthority("ROLE_" + role)));
+
+            authToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+            SecurityContextHolder.getContext().setAuthentication(authToken);
+        }
+
+//        logger.info("Token of user " + jwtUtil.extractEmail(jwt) + (jwtUtil.isTokenExpired(jwt) ? " is expired" : " is not expired"));
+
+        chain.doFilter(request, response);
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/security/JwtUtil.java

@@ -0,0 +1,101 @@
+package _11.asktpk.artisanconnectbackend.security;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.security.Keys;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.SecretKey;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
+@Component
+public class JwtUtil {
+
+    @Value("${jwt.secret:defaultSecretKeyNeedsToBeAtLeast32BytesLong}")
+    private String secret;
+
+    @Value("${jwt.expiration}")
+    private long expiration;
+
+    // sterowanie tokenami wygasnietymi
+    private final Set<String> blacklistedTokens = ConcurrentHashMap.newKeySet();
+
+    public void blacklistToken(String token) {
+        blacklistedTokens.add(token);
+    }
+
+    public boolean isBlacklisted(String token) {
+        return blacklistedTokens.contains(token);
+    }
+
+
+    private SecretKey getSigningKey() {
+        return Keys.hmacShaKeyFor(secret.getBytes());
+    }
+
+    private final Map<String, String> userActiveTokens = new ConcurrentHashMap<>();
+
+    public boolean isLatestToken(String token) {
+        String email = extractEmail(token);
+        String tokenId = extractTokenId(token);
+        String latestTokenId = userActiveTokens.get(email);
+
+        return latestTokenId != null && latestTokenId.equals(tokenId);
+    }
+
+    public String generateToken(String email, String role, Long userId) {
+        Map<String, Object> claims = new HashMap<>();
+        claims.put("role", role);
+        claims.put("userId", userId);
+        claims.put("tokenId", UUID.randomUUID().toString());
+
+        String token = createToken(claims, email);
+
+        userActiveTokens.put(email, extractTokenId(token));
+
+        return token;
+    }
+
+    private String createToken(Map<String, Object> claims, String subject) {
+        return Jwts.builder()
+                .setClaims(claims)
+                .setSubject(subject)
+                .setIssuedAt(new Date())
+                .setExpiration(new Date(System.currentTimeMillis() + expiration))
+                .signWith(getSigningKey(), SignatureAlgorithm.HS256)
+                .compact();
+    }
+
+    public String extractTokenId(String token) {
+        return extractAllClaims(token).get("tokenId", String.class);
+    }
+
+    public String extractEmail(String token) {
+        return extractClaim(token, Claims::getSubject);
+    }
+
+    public String extractRole(String token) {
+        return extractAllClaims(token).get("role", String.class);
+    }
+
+    public Long extractUserId(String token) {
+        return extractAllClaims(token).get("userId", Long.class);
+    }
+
+    public <T> T extractClaim(String token, Function<Claims, T> claimsResolver) {
+        final Claims claims = extractAllClaims(token);
+        return claimsResolver.apply(claims);
+    }
+
+    private Claims extractAllClaims(String token) {
+        return Jwts.parserBuilder()
+                .setSigningKey(getSigningKey())
+                .build()
+                .parseClaimsJws(token)
+                .getBody();
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/service/ClientService.java

@@ -1,9 +1,14 @@
 package _11.asktpk.artisanconnectbackend.service;
 
+import _11.asktpk.artisanconnectbackend.dto.AuthRequestDTO;
 import _11.asktpk.artisanconnectbackend.dto.ClientDTO;
+import _11.asktpk.artisanconnectbackend.dto.ClientRegistrationDTO;
 import _11.asktpk.artisanconnectbackend.entities.Client;
+import _11.asktpk.artisanconnectbackend.entities.Role;
 import _11.asktpk.artisanconnectbackend.repository.ClientRepository;
+import _11.asktpk.artisanconnectbackend.repository.RolesRepository;
 import jakarta.persistence.EntityNotFoundException;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -11,19 +16,27 @@ import java.util.List;
 @Service
 public class ClientService {
     private final ClientRepository clientRepository;
+    private final PasswordEncoder passwordEncoder;
+    private final RolesRepository rolesRepository;
 
-    public ClientService(ClientRepository clientRepository) {
+    public ClientService(ClientRepository clientRepository, PasswordEncoder passwordEncoder, RolesRepository rolesRepository) {
         this.clientRepository = clientRepository;
+        this.passwordEncoder = passwordEncoder;
+        this.rolesRepository = rolesRepository;
     }
 
     private ClientDTO toDto(Client client) {
+        if(client == null) {
+            return null;
+        }
+
         ClientDTO dto = new ClientDTO();
 
         dto.setId(client.getId());
         dto.setFirstName(client.getFirstName());
         dto.setLastName(client.getLastName());
         dto.setEmail(client.getEmail());
-        dto.setRole(client.getRole());
+        dto.setRole(client.getRole().getRole());
         dto.setImage(client.getImage());
 
         return dto;
@@ -31,17 +44,35 @@ public class ClientService {
 
     private Client fromDto(ClientDTO dto) {
         Client client = new Client();
+        Role rola;
+
+        if (clientRepository.findById(dto.getId()).isPresent()) {
+            rola = clientRepository.findById(dto.getId()).get().getRole();
+        } else {
+            rola = new Role();
+            rola.setRole("USER");
+        }
 
         client.setId(dto.getId());
         client.setFirstName(dto.getFirstName());
         client.setLastName(dto.getLastName());
         client.setEmail(dto.getEmail());
-        client.setRole(dto.getRole());
+        client.setRole(rola);
         client.setImage(dto.getImage());
 
         return client;
     }
 
+    private Client fromDto(ClientRegistrationDTO dto) {
+           Client client = new Client();
+
+           client.setFirstName(dto.getFirstName());
+           client.setLastName(dto.getLastName());
+           client.setEmail(dto.getEmail());
+           client.setPassword(dto.getPassword());
+           return client;
+    }
+
     public List<ClientDTO> getAllClients() {
         List<Client> clients = clientRepository.findAll();
         return clients.stream().map(this::toDto).toList();
@@ -51,6 +82,10 @@ public class ClientService {
         return clientRepository.findById(id).orElse(null);
     }
 
+    public ClientDTO getClientByIdDTO(Long id) {
+        return toDto(clientRepository.findById(id).orElse(null));
+    }
+
     public boolean clientExists(Long id) {
         return clientRepository.existsById(id);
     }
@@ -59,15 +94,21 @@ public class ClientService {
         return toDto(clientRepository.save(fromDto(clientDTO)));
     }
 
+    public Client saveClientToDB(Client client) {
+        return clientRepository.save(client);
+    }
+
     public ClientDTO updateClient(long id, ClientDTO clientDTO) {
         Client existingClient = clientRepository.findById(id)
                 .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
 
+        Role newRole = rolesRepository.findRoleByRole(clientDTO.getRole());
+
         existingClient.setEmail(clientDTO.getEmail());
         existingClient.setFirstName(clientDTO.getFirstName());
         existingClient.setLastName(clientDTO.getLastName());
         existingClient.setImage(clientDTO.getImage());
-        existingClient.setRole(clientDTO.getRole());
+        existingClient.setRole(newRole);
 
         return toDto(clientRepository.save(existingClient));
     }
@@ -75,4 +116,30 @@ public class ClientService {
     public void deleteClient(Long id) {
         clientRepository.deleteById(id);
     }
+
+    // И замените метод checkClientCredentials на:
+    public boolean checkClientCredentials(AuthRequestDTO dto) {
+        Client cl = clientRepository.findByEmail(dto.getEmail());
+        if (cl == null) {
+            return false;
+        }
+
+        return passwordEncoder.matches(dto.getPassword(), cl.getPassword());
+    }
+
+    // При создании нового пользователя не забудьте шифровать пароль:
+    public ClientDTO registerClient(ClientRegistrationDTO clientDTO) {
+        Client client = fromDto(clientDTO);
+        client.setRole(rolesRepository.findRoleById(1L));
+        client.setPassword(passwordEncoder.encode(client.getPassword()));
+        return toDto(clientRepository.save(client));
+    }
+
+    public Client getClientByEmail(String email) {
+        return clientRepository.findByEmail(email);
+    }
+
+    public Role getUserRole() {
+        return rolesRepository.findRoleByRole("USER");
+    }
 }

src/main/java/_11/asktpk/artisanconnectbackend/service/EmailService.java

@@ -0,0 +1,24 @@
+package _11.asktpk.artisanconnectbackend.service;
+
+import _11.asktpk.artisanconnectbackend.dto.EmailDTO;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EmailService {
+    private final JavaMailSender mailSender;
+
+    public EmailService(JavaMailSender mailSender) {
+        this.mailSender = mailSender;
+    }
+
+    public void sendEmail(EmailDTO email) {
+        SimpleMailMessage message = new SimpleMailMessage();
+        message.setTo(email.getTo());
+        message.setSubject(email.getSubject());
+        message.setText(email.getBody());
+        message.setFrom("patryk.kania001@gmail.com");
+        mailSender.send(message);
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/service/NoticeService.java

@@ -1,41 +1,47 @@
 package _11.asktpk.artisanconnectbackend.service;
 
+import _11.asktpk.artisanconnectbackend.dto.AttributeDto;
+import _11.asktpk.artisanconnectbackend.dto.NoticeRequestDTO;
+import _11.asktpk.artisanconnectbackend.entities.AttributesNotice;
 import _11.asktpk.artisanconnectbackend.entities.Client;
 import _11.asktpk.artisanconnectbackend.entities.Notice;
 import _11.asktpk.artisanconnectbackend.repository.ClientRepository;
 import _11.asktpk.artisanconnectbackend.repository.NoticeRepository;
-import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
-//import _11.asktpk.artisanconnectbackend.service.WishlistService;
+import _11.asktpk.artisanconnectbackend.dto.NoticeResponseDTO;
 import jakarta.persistence.EntityNotFoundException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 @Service
 public class NoticeService {
+    private static final Logger logger = LogManager.getLogger(NoticeService.class);
+
+    @Value("${file.upload-dir}")
+    private String uploadDir;
 
     private final NoticeRepository noticeRepository;
     private final ClientRepository clientRepository;
-    private final WishlistService wishlistService;
+    private final ImageService imageService;
 
-    public NoticeService(NoticeRepository noticeRepository, ClientRepository clientRepository, WishlistService wishlistService) {
+    public NoticeService(NoticeRepository noticeRepository, ClientRepository clientRepository, ImageService imageService) {
         this.noticeRepository = noticeRepository;
         this.clientRepository = clientRepository;
-        this.wishlistService = wishlistService;
+        this.imageService = imageService;
     }
 
-    public Notice fromDTO(NoticeDTO dto) {
+    public Notice fromDTO(NoticeRequestDTO dto) {
         Notice notice = new Notice();
         notice.setTitle(dto.getTitle());
         notice.setDescription(dto.getDescription());
         notice.setPrice(dto.getPrice());
         notice.setCategory(dto.getCategory());
         notice.setStatus(dto.getStatus());
-        notice.setPublishDate(dto.getPublishDate());
-        notice.setAttributesNotices(dto.getAttributesNotices());
 
         Client client = clientRepository.findById(dto.getClientId())
                 .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono klienta o ID: " + dto.getClientId()));
@@ -44,15 +50,8 @@ public class NoticeService {
         return notice;
     }
 
-    private NoticeDTO toDTO(Notice notice) {
-        NoticeDTO dto = new NoticeDTO();
-        // TODO: To be updated using AuthService after implementing authentication.
-        Optional<Client> client = clientRepository.findById(1L);
-        boolean isWishlisted = false;
-        if (client.isPresent()) {
-            Client c = client.get();
-            isWishlisted = wishlistService.isWishlisted(c, notice);
-        }
+    private NoticeResponseDTO toDTO(Notice notice) {
+        NoticeResponseDTO dto = new NoticeResponseDTO();
         dto.setNoticeId(notice.getIdNotice());
         dto.setTitle(notice.getTitle());
         dto.setClientId(notice.getClient().getId());
@@ -61,20 +60,30 @@ public class NoticeService {
         dto.setCategory(notice.getCategory());
         dto.setStatus(notice.getStatus());
         dto.setPublishDate(notice.getPublishDate());
-        dto.setAttributesNotices(notice.getAttributesNotices());
-        dto.setWishlisted(isWishlisted);
+
+        List<AttributeDto> attributes = new ArrayList<>();
+        if (notice.getAttributesNotices() != null) {
+            for (AttributesNotice an : notice.getAttributesNotices()) {
+                AttributeDto attr = new AttributeDto();
+                attr.setName(an.getAttributeValue().getAttribute().getName());
+                attr.setValue(an.getAttributeValue().getValue());
+                attributes.add(attr);
+            }
+        }
+        dto.setAttributes(attributes);
+
         return dto;
     }
 
-    public List<NoticeDTO> getAllNotices() {
-        List<NoticeDTO> result = new ArrayList<>();
+    public List<NoticeResponseDTO> getAllNotices() {
+        List<NoticeResponseDTO> result = new ArrayList<>();
         for (Notice notice : noticeRepository.findAll()) {
             result.add(toDTO(notice));
         }
         return result;
     }
 
-    public NoticeDTO getNoticeById(Long id) {
+    public NoticeResponseDTO getNoticeById(Long id) {
         Notice notice = noticeRepository.findById(id)
                 .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
         return toDTO(notice);
@@ -85,15 +94,17 @@ public class NoticeService {
                 .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
     }
 
-    public Long addNotice(NoticeDTO dto) {
-        return noticeRepository.save(fromDTO(dto)).getIdNotice();
+    public Long addNotice(NoticeRequestDTO dto) {
+        Notice notice = fromDTO(dto);
+        notice.setPublishDate(LocalDateTime.now());
+        return noticeRepository.save(notice).getIdNotice();
     }
 
     public boolean noticeExists(Long id) {
         return noticeRepository.existsById(id);
     }
 
-    public NoticeDTO updateNotice(Long id, NoticeDTO dto) {
+    public NoticeResponseDTO updateNotice(Long id, NoticeRequestDTO dto) {
         Notice existingNotice = noticeRepository.findById(id)
                 .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id));
 
@@ -102,7 +113,6 @@ public class NoticeService {
         existingNotice.setPrice(dto.getPrice());
         existingNotice.setCategory(dto.getCategory());
         existingNotice.setStatus(dto.getStatus());
-        existingNotice.setAttributesNotices(dto.getAttributesNotices());
 
         if (dto.getClientId() != null && !dto.getClientId().equals(existingNotice.getClient().getId())) {
             Client client = clientRepository.findById(dto.getClientId())
@@ -116,6 +126,22 @@ public class NoticeService {
     public void deleteNotice(Long id) {
         if (noticeExists(id)) {
             noticeRepository.deleteById(id);
+
+            List<String> imagesList = new ArrayList<>();
+
+            try {
+                imagesList = imageService.getImagesList(id);
+            } catch (Exception e) {
+                logger.info("There weren't any images for notice with ID: " + id + ". Skipping deletion of images. Message: " + e.getMessage());
+            }
+
+            try {
+                for (String imageName : imagesList) {
+                    imageService.deleteImage(uploadDir, imageName);
+                }
+            } catch (Exception e) {
+                logger.info("There were some issues while deleting images for notice with ID: " + id + ". Message: " + e.getMessage());
+            }
         } else {
             throw new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + id);
         }

src/main/java/_11/asktpk/artisanconnectbackend/service/OrderService.java

@@ -0,0 +1,83 @@
+package _11.asktpk.artisanconnectbackend.service;
+
+import _11.asktpk.artisanconnectbackend.dto.OrderDTO;
+import _11.asktpk.artisanconnectbackend.entities.Client;
+import _11.asktpk.artisanconnectbackend.entities.Notice;
+import _11.asktpk.artisanconnectbackend.repository.ClientRepository;
+import _11.asktpk.artisanconnectbackend.repository.NoticeRepository;
+import _11.asktpk.artisanconnectbackend.repository.OrderRepository;
+import _11.asktpk.artisanconnectbackend.utils.Enums;
+import jakarta.persistence.EntityNotFoundException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import _11.asktpk.artisanconnectbackend.entities.Order;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class OrderService {
+
+    private final OrderRepository orderRepository;
+    private final ClientRepository clientRepository;
+    private final NoticeRepository noticeRepository;
+
+    @Autowired
+    public OrderService(OrderRepository orderRepository, ClientRepository clientRepository, NoticeRepository noticeRepository) {
+        this.orderRepository = orderRepository;
+        this.clientRepository = clientRepository;
+        this.noticeRepository = noticeRepository;
+    }
+
+    public Order fromDTO(OrderDTO orderDTO) {
+        Order order = new Order();
+        order.setOrderType(orderDTO.getOrderType());
+        order.setStatus(Enums.OrderStatus.PENDING);
+        if(orderDTO.getOrderType() == Enums.OrderType.ACTIVATION){
+            order.setAmount(10.00);
+        }else{
+            order.setAmount(8.00);
+        }
+
+        order.setCreatedAt(LocalDateTime.now()
+        );
+        order.setUpdatedAt(LocalDateTime.now()
+        );
+
+        Client client = clientRepository.findById(orderDTO.getClientId())
+                .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono klienta o ID: " + orderDTO.getClientId()));
+        order.setClient(client);
+
+        Notice notice = noticeRepository.findById(orderDTO.getNoticeId())
+                .orElseThrow(() -> new EntityNotFoundException("Nie znaleziono ogłoszenia o ID: " + orderDTO.getNoticeId()));
+        order.setNotice(notice);
+
+        return order;
+    }
+
+
+    public Long addOrder(OrderDTO orderDTO) {
+        return orderRepository.save(fromDTO(orderDTO)).getId();
+    }
+
+    public Long changeOrderStatus(Long id, Enums.OrderStatus status) {
+        Order order = orderRepository.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException("Nie znaleziono zamówienia o ID: " + id));
+
+        order.setStatus(status);
+
+        order = orderRepository.save(order);
+
+        return order.getId();
+
+    }
+
+    public Order getOrderById(Long id) {
+        return orderRepository.findById(id)
+                .orElseThrow(() -> new RuntimeException("Nie znaleziono zamówienia o ID: " + id));
+    }
+
+    public List<Order> getOrdersByClientId(Long clientId) {
+        return orderRepository.findByClientId(clientId);
+    }
+}

src/main/java/_11/asktpk/artisanconnectbackend/service/PaymentService.java

@@ -0,0 +1,91 @@
+package _11.asktpk.artisanconnectbackend.service;
+
+import _11.asktpk.artisanconnectbackend.dto.OAuthPaymentResponseDTO;
+import _11.asktpk.artisanconnectbackend.dto.TransactionPaymentRequestDTO;
+import _11.asktpk.artisanconnectbackend.dto.TransactionPaymentResponseDTO;
+import _11.asktpk.artisanconnectbackend.entities.Order;
+import _11.asktpk.artisanconnectbackend.entities.Payment;
+import _11.asktpk.artisanconnectbackend.repository.PaymentRepository;
+import _11.asktpk.artisanconnectbackend.utils.Enums;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+@Service
+public class PaymentService {
+    private final WebClient webClient;
+    private final String clientId;
+    private final String clientSecret;
+    private final String authUrl;
+    private final String transactionUrl;
+    private final PaymentRepository paymentRepository;
+
+    public PaymentService(
+            WebClient.Builder webClientBuilder,
+            @Value("${tpay.clientId}") String clientId,
+            @Value("${tpay.clientSecret}") String clientSecret,
+            @Value("${tpay.authUrl}") String authUrl,
+            @Value("${tpay.transactionUrl}") String transactionUrl,
+            PaymentRepository paymentRepository
+    ) {
+        this.webClient = webClientBuilder.baseUrl(authUrl).build();
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+        this.authUrl = authUrl;
+        this.transactionUrl = transactionUrl;
+        this.paymentRepository = paymentRepository;
+    }
+
+    public OAuthPaymentResponseDTO getOAuthToken() {
+        return webClient.post()
+                .uri("")
+                .contentType(MediaType.MULTIPART_FORM_DATA)
+                .header("accept", "application/json")
+                .body(BodyInserters.fromMultipartData("client_id", clientId)
+                        .with("client_secret", clientSecret))
+                .retrieve()
+                .bodyToMono(OAuthPaymentResponseDTO.class)
+                .block();
+    }
+
+    public String createTransaction(Order order, String accessToken, TransactionPaymentRequestDTO transactionPaymentRequestDTO) {
+        TransactionPaymentResponseDTO response = webClient.post()
+                .uri(transactionUrl)
+                .header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken)
+                .contentType(MediaType.APPLICATION_JSON)
+                .bodyValue(transactionPaymentRequestDTO)
+                .retrieve()
+                .bodyToMono(TransactionPaymentResponseDTO.class)
+                .block();
+
+        if (response != null && "success".equalsIgnoreCase(response.getResult())) {
+            Payment payment = new Payment();
+            payment.setOrder(order);
+            payment.setAmount(response.getAmount());
+
+            payment.setStatus(Enums.PaymentStatus.PENDING);
+
+            payment.setTransactionId(response.getTitle());
+            payment.setTransactionPaymentUrl(response.getTransactionPaymentUrl());
+            paymentRepository.save(payment);
+
+            System.out.println(response);
+
+            return response.getTransactionPaymentUrl();
+        }
+
+        return null;
+    }
+
+    public List<Payment> getPaymentsByOrderId(Long id) {
+        return paymentRepository.findAllByOrderId(id);
+    }
+
+
+}

src/main/java/_11/asktpk/artisanconnectbackend/service/WishlistService.java

@@ -1,7 +1,7 @@
 package _11.asktpk.artisanconnectbackend.service;
 
 import _11.asktpk.artisanconnectbackend.dto.WishlistDTO;
-import _11.asktpk.artisanconnectbackend.dto.NoticeDTO;
+import _11.asktpk.artisanconnectbackend.dto.NoticeResponseDTO;
 import _11.asktpk.artisanconnectbackend.entities.Client;
 import _11.asktpk.artisanconnectbackend.entities.Notice;
 import _11.asktpk.artisanconnectbackend.entities.Wishlist;
@@ -31,12 +31,6 @@ public class WishlistService {
                 .toList();
     }
 
-    public boolean isWishlisted(Client client, Notice notice) {
-        Optional<Wishlist> existingEntry = wishlistRepository.findByClientAndNotice(client, notice);
-
-        return existingEntry.isEmpty();
-    }
-
     public boolean toggleWishlist(Client client, Notice notice) {
         Optional<Wishlist> existingEntry = wishlistRepository.findByClientAndNotice(client, notice);
 
@@ -61,7 +55,7 @@ public class WishlistService {
         return dto;
     }
 
-    public List<NoticeDTO> getNoticesInWishlist(Long clientId) {
+    public List<NoticeResponseDTO> getNoticesInWishlist(Long clientId) {
         List<Wishlist> wishlistEntries = wishlistRepository.findAllByClientId(clientId);
 
         return wishlistEntries.stream()

src/main/java/_11/asktpk/artisanconnectbackend/utils/Enums.java

@@ -43,4 +43,20 @@ public class Enums {
     public enum Status {
         ACTIVE, INACTIVE
     }
+
+    public enum OrderType {
+        ACTIVATION,
+        BOOST
+    }
+
+
+    public enum OrderStatus {
+        PENDING, COMPLETED, CANCELLED
+    }
+
+    public enum PaymentStatus{
+        PENDING, CORRECT, INCORRECT
+    }
+
+    
 }

src/main/java/_11/asktpk/artisanconnectbackend/utils/Tools.java

@@ -0,0 +1,24 @@
+package _11.asktpk.artisanconnectbackend.utils;
+
+import _11.asktpk.artisanconnectbackend.security.JwtUtil;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.stereotype.Component;
+
+@Component
+public class Tools {
+    private final JwtUtil jwtUtil;
+
+    public Tools(JwtUtil jwtUtil) {
+        this.jwtUtil = jwtUtil;
+    }
+
+    public Long getClientIdFromRequest(HttpServletRequest request) {
+        String authorizationHeader = request.getHeader("Authorization");
+        if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) {
+            return jwtUtil.extractUserId(authorizationHeader.substring(7));
+        } else {
+            return -1L;
+        }
+    }
+}

src/main/resources/application.properties

@@ -16,4 +16,24 @@ spring.jpa.hibernate.ddl-auto=create-drop
 
 file.upload-dir=/Users/andsol/Desktop/uploads
 spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=10MB
+spring.servlet.multipart.max-request-size=10MB
+
+spring.mail.host=smtp.gmail.com
+spring.mail.port=587
+spring.mail.username=patryk.kania001@gmail.com
+spring.mail.password=pmyd ylwg mbsn hcpp
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+
+tpay.clientId = 01JQKC048X62ST9V59HNRSXD92-01JQKC2CQHPYXQFSFX8BKC24BX
+tpay.clientSecret = 44898642be53381cdcc47f3e44bf5a15e592f5d270fc3a6cf6fb81a8b8ebffb9
+tpay.authUrl = https://openapi.sandbox.tpay.com/oauth/auth
+tpay.transactionUrl = https://openapi.sandbox.tpay.com/transactions
+tpay.securityCode = )IY7E)YSM!A)Q6O-GN#U7U_33s9qObk8
+
+#jwt settings
+jwt.secret=DIXLsOs3FKmCAQwISd0SKsHMXJrPl3IKIRkVlkOvYW7kEcdUTbxh8zFe1B3eZWkY
+jwt.expiration=300000
+
+logging.file.name=logs/payment-notifications.log
+logging.level.TpayLogger=INFO

src/main/resources/sql/data.sql

@@ -1,10 +1,15 @@
-INSERT INTO clients (email, first_name, image, last_name, password, role)
+INSERT INTO roles (id, rolename)
 VALUES
-    ('dignissim.tempor.arcu@aol.ca', 'Diana', 'null', 'Harrison', 'password', 'USER'),
-    ('john.doe@example.com', 'John', 'null', 'Doe', 'password123', 'ADMIN'),
-    ('jane.smith@example.com', 'Jane', 'null', 'Smith', 'securepass', 'USER'),
-    ('michael.brown@example.com', 'Michael', 'null', 'Brown', 'mypassword', 'USER'),
-    ('emily.jones@example.com', 'Emily', 'null', 'Jones', 'passw0rd', 'USER');
+    (1, 'USER'),
+    (2, 'ADMIN');
+
+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);
 
 
 INSERT INTO notice (title, description, client_id, price, category, status, publish_date) VALUES
@@ -12,4 +17,45 @@ INSERT INTO notice (title, description, client_id, price, category, status, publ
     ('Drewniany stół', 'Solidny stół wykonany z litego drewna dębowego.', 3, 1200.00, 'Furniture', 'ACTIVE', '2023-09-15'),
     ('Ceramiczna waza', 'Piękna waza ceramiczna, idealna na prezent.', 2, 300.00, 'Ceramics', 'INACTIVE', '2023-08-20'),
     ('Obraz olejny', 'Obraz olejny przedstawiający krajobraz górski.', 4, 800.00, 'Painting', 'ACTIVE', '2023-07-10'),
-    ('Skórzany portfel', 'Ręcznie wykonany portfel ze skóry naturalnej.', 1, 250.00, 'Leatherwork', 'ACTIVE', '2023-06-05');
+    ('Skórzany portfel', 'Ręcznie wykonany portfel ze skóry naturalnej.', 1, 250.00, 'Leatherwork', 'ACTIVE', '2023-06-05');
+
+
+insert into attributes (name) values
+                                  ('Kolor'),
+                                  ('Materiał');
+
+-- Kolory
+insert into attribute_values (value, id_attribute)  values
+                                                        ('Zielony', 1),
+                                                        ('Czerwony', 1),
+                                                        ('Niebieski', 1),
+                                                        ('Żółty', 1),
+                                                        ('Biały', 1),
+                                                        ('Czarny', 1),
+                                                        ('Różowy', 1),
+                                                        ('Szary', 1),
+                                                        ('Fioletowy', 1),
+                                                        ('Pomarańczowy', 1),
+                                                        ('Inny', 1);
+
+-- Materiały
+insert into attribute_values (value, id_attribute)  values
+                                                        ('Bawełna', 2),
+                                                        ('Wełna', 2),
+                                                        ('Syntetyk', 2),
+                                                        ('Skóra', 2),
+                                                        ('Len', 2),
+                                                        ('Jedwab', 2),
+                                                        ('Poliester', 2),
+                                                        ('Akryl', 2),
+                                                        ('Wiskoza', 2),
+                                                        ('Nylon', 2),
+                                                        ('Inny', 2);
+
+insert into attributes_notice (id_value, notice_id) values
+                                                        (1, 1), -- Ręcznie robiona biżuteria - Zielony
+                                                        (22, 1),
+                                                        (2, 2), -- Drewniany stół - Czerwony
+                                                        (3, 3), -- Ceramiczna waza - Niebieski
+                                                        (4, 4), -- Obraz olejny - Żółty
+                                                        (5, 5); -- Skórzany portfel - Biały