isMainImage pobierane z Frontend

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

@@ -26,7 +26,7 @@ public class SecurityConfig {
                 .cors(cors -> cors.configure(http))
                 .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(auth -> auth
-                        .requestMatchers("/api/v1/auth/**").permitAll()
+                        .requestMatchers("/api/v1/auth/**", "/api/v1/payments/notification").permitAll()
                         .anyRequest().authenticated())
                 .sessionManagement(session -> session
                         .sessionCreationPolicy(SessionCreationPolicy.STATELESS));

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

@@ -6,6 +6,7 @@ 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.data.repository.query.Param;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -29,7 +30,7 @@ public class ImageController {
     private String uploadDir;
 
     @PostMapping("/upload/{id}")
-    public ResponseEntity<RequestResponseDTO> uploadImage(@RequestParam("file") MultipartFile file, @PathVariable("id") Long noticeId) {
+    public ResponseEntity<RequestResponseDTO> uploadImage(@RequestParam("file") MultipartFile file, @PathVariable("id") Long noticeId, @Param("isMainImage") Boolean isMainImage) {
         try {
             if(file.isEmpty()) {
                 return ResponseEntity.badRequest().body(new RequestResponseDTO("File is empty"));
@@ -44,10 +45,11 @@ public class ImageController {
             }
 
             String newImageName = imageService.saveImageToStorage(uploadDir, file);
-            imageService.addImageNameToDB(newImageName, noticeId);
+            imageService.addImageNameToDB(newImageName, noticeId, isMainImage);
 
             return ResponseEntity.ok(new RequestResponseDTO("Image uploaded successfully with new name: " + newImageName));
         } catch (Exception e) {
+            System.out.println(e.getMessage());
             return ResponseEntity.status(HttpStatus.UNSUPPORTED_MEDIA_TYPE).body(new RequestResponseDTO(e.getMessage()));
         }
     }

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

@@ -1,7 +1,9 @@
 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;
@@ -11,6 +13,8 @@ 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")
@@ -38,21 +42,95 @@ public class OrderController {
     }
 
     @PostMapping("/token")
-    public ResponseEntity<?> fetchToken() {
-        Order order = orderService.getOrderById(1L);
+    public ResponseEntity<?> fetchToken(@RequestParam Long orderId) {
+        Order order = orderService.getOrderById(orderId);
+        Client client = order.getClient();
         OAuthPaymentResponseDTO authPaymentDTO = paymentService.getOAuthToken();
         TransactionPaymentRequestDTO.Payer payer = new TransactionPaymentRequestDTO.Payer(
-                "patryk@test.pl", "Patryk Test");
+                client.getEmail(), client.getFirstName()+' '+client.getLastName());
 
         String paymentDescription = order.getOrderType() == Enums.OrderType.ACTIVATION ? "Aktywacja ogłoszenia" : "Podbicie ogłoszenia";
         paymentDescription += order.getNotice().getTitle();
-        TransactionPaymentRequestDTO request = new TransactionPaymentRequestDTO(
-                order.getAmount(), paymentDescription, payer);
 
-        String response = paymentService.createTransaction(order, authPaymentDTO.getAccess_token(), request);
-        System.out.println(response);
-        System.out.println(request);
+        TransactionPaymentRequestDTO.Callbacks callbacks = new TransactionPaymentRequestDTO.Callbacks();
+        TransactionPaymentRequestDTO.PayerUrls payerUrls = new TransactionPaymentRequestDTO.PayerUrls();
+        payerUrls.setSuccess("com.hamx.artisanconnect://dashboard/userNotices");
+        payerUrls.setError("com.hamx.artisanconnect://dashboard/userNotices");
+        callbacks.setPayerUrls(payerUrls);
+
+        TransactionPaymentRequestDTO paymentRequest = new TransactionPaymentRequestDTO(
+                order.getAmount(), paymentDescription, payer, callbacks);
+
+        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

@@ -39,9 +39,6 @@ public class PaymentController {
 
     @PostMapping(value = "/notification", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
     public ResponseEntity<String> handleTpayNotification(@RequestParam Map<String, String> params) {
-        log.info("=== ODEBRANO NOTYFIKACJĘ Tpay ===");
-        log.info("Parametry:\n{}", paramsToLogString(params));
-
         String id = params.get("id");
         String trId = params.get("tr_id");
         String trAmount = params.get("tr_amount");
@@ -54,7 +51,6 @@ public class PaymentController {
         );
 
         if (!expectedMd5.equals(md5sum)) {
-            log.warn("❌ Błędna suma kontrolna! Otrzymano: {}, Oczekiwano: {}", md5sum, expectedMd5);
             return ResponseEntity.status(400).body("INVALID CHECKSUM");
         }
 
@@ -63,7 +59,6 @@ public class PaymentController {
             Payment payment = optionalPayment.get();
 
             if ("true".equalsIgnoreCase(trStatus) || "PAID".equalsIgnoreCase(trStatus)) {
-                log.info("✅ Transakcja opłacona: tr_id={}, kwota={}", trId, params.get("tr_paid"));
                 payment.setStatus(Enums.PaymentStatus.CORRECT);
 
                 if (payment.getOrder() != null) {
@@ -78,7 +73,6 @@ public class PaymentController {
                 }
 
             } else if ("false".equalsIgnoreCase(trStatus)) {
-                log.warn("❌ Transakcja nieudana: {}", trId);
                 payment.setStatus(Enums.PaymentStatus.INCORRECT);
 
                 if (payment.getOrder() != null) {
@@ -87,10 +81,7 @@ public class PaymentController {
             }
 
             paymentRepository.save(payment);
-        } else {
-            log.warn("⚠️ Brak płatności o tr_id={}", trId);
         }
-
         return ResponseEntity.ok("TRUE");
     }
 

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

@@ -1,9 +0,0 @@
-package _11.asktpk.artisanconnectbackend.dto;
-
-import org.springframework.core.io.Resource;
-
-public class ImageRequestDTO {
-    public Resource image;
-    public Long noticeId;
-    public boolean isMainImage;
-}

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

@@ -0,0 +1,17 @@
+package _11.asktpk.artisanconnectbackend.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter @Setter
+public class OrderWithPaymentsDTO {
+    private Long orderId;
+    private String orderType;
+    private String status;
+    private Double amount;
+    private LocalDateTime createdAt;
+    private List<PaymentDTO> 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/TransactionPaymentRequestDTO.java

@@ -11,6 +11,7 @@ public class TransactionPaymentRequestDTO {
     private double amount;
     private String description;
     private Payer payer;
+    private Callbacks callbacks;
 
     @Getter
     @Setter
@@ -20,4 +21,21 @@ public class TransactionPaymentRequestDTO {
         private String email;
         private String name;
     }
+
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Callbacks {
+        private PayerUrls payerUrls;
+    }
+
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class PayerUrls {
+        private String success;
+        private String error;
+    }
 }

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

@@ -4,8 +4,10 @@ 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

@@ -4,9 +4,12 @@ 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/service/AuthService.java

@@ -7,7 +7,6 @@ import _11.asktpk.artisanconnectbackend.dto.ClientDTO;
 import _11.asktpk.artisanconnectbackend.entities.Client;
 import _11.asktpk.artisanconnectbackend.security.JwtUtil;
 import org.springframework.http.*;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import lombok.extern.slf4j.Slf4j;
@@ -23,10 +22,10 @@ public class AuthService {
     private final PasswordEncoder passwordEncoder;
     private final JwtUtil jwtUtil;
 
-    public AuthService(ClientService clientService, JwtUtil jwtUtil) {
+    public AuthService(ClientService clientService, JwtUtil jwtUtil, PasswordEncoder passwordEncoder) {
         this.clientService = clientService;
         this.jwtUtil = jwtUtil;
-        this.passwordEncoder = new BCryptPasswordEncoder();
+        this.passwordEncoder = passwordEncoder;
     }
 
     public AuthResponseDTO login(String email, String password) throws Exception {

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

@@ -7,7 +7,6 @@ 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;
@@ -15,12 +14,10 @@ import java.util.List;
 @Service
 public class ClientService {
     private final ClientRepository clientRepository;
-    private final PasswordEncoder passwordEncoder;
     private final RolesRepository rolesRepository;
 
-    public ClientService(ClientRepository clientRepository, PasswordEncoder passwordEncoder, RolesRepository rolesRepository) {
+    public ClientService(ClientRepository clientRepository, RolesRepository rolesRepository) {
         this.clientRepository = clientRepository;
-        this.passwordEncoder = passwordEncoder;
         this.rolesRepository = rolesRepository;
     }
 
@@ -126,7 +123,6 @@ public class ClientService {
 
     public ClientDTO registerClient(Client client) {
         client.setRole(getUserRole()); // ID 1 - USER role
-        client.setPassword(passwordEncoder.encode(client.getPassword()));
         return toDto(clientRepository.save(client));
     }
 }

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

@@ -15,10 +15,10 @@ public class EmailService {
 
     public void sendEmail(EmailDTO email) {
         SimpleMailMessage message = new SimpleMailMessage();
+        message.setFrom("noreply@zikor.pl");
         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/ImageService.java

@@ -40,10 +40,11 @@ public class ImageService {
         return uniqueFileName;
     }
 
-    public void addImageNameToDB(String filename, Long noticeId) {
+    public void addImageNameToDB(String filename, Long noticeId, boolean isMainImage) {
         Image image = new Image();
         image.setImageName(filename);
         image.setNoticeId(noticeId);
+        image.setMainImage(isMainImage);
         imageRepository.save(image);
     }
 

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

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import _11.asktpk.artisanconnectbackend.entities.Order;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Service
 public class OrderService {
@@ -75,4 +76,8 @@ public class OrderService {
         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

@@ -15,6 +15,8 @@ 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;
@@ -80,4 +82,10 @@ public class PaymentService {
 
         return null;
     }
+
+    public List<Payment> getPaymentsByOrderId(Long id) {
+        return paymentRepository.findAllByOrderId(id);
+    }
+
+
 }

src/main/resources/application.properties

@@ -1,39 +1,41 @@
 spring.application.name=ArtisanConnectBackend
 
 ## PostgreSQL
-spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
+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
-spring.datasource.username=postgres
-spring.datasource.password=postgres
 
-#initial data for db injection
+#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
 
-# create and drop table, good for testing, production set to none or comment it
+#Sposób zachowania JPA
 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
+#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}
 
-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
+#Ustawienia wysy?ania maili
+spring.mail.host=${MAIL_HOST}
+spring.mail.port=${MAIL_PORT}
+spring.mail.username=${MAIL_USER}
+spring.mail.password=${MAIL_PASSWORD}
 
-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
+#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}
 
-#jwt settings
-jwt.secret=DIXLsOs3FKmCAQwISd0SKsHMXJrPl3IKIRkVlkOvYW7kEcdUTbxh8zFe1B3eZWkY
-jwt.expiration=300000
+#Ustawienia JWT
+jwt.secret=${JWT_SECRET}
+jwt.expiration=1200000
 
+#Ustawienia logowania
 logging.file.name=logs/payment-notifications.log
 logging.level.TpayLogger=INFO