feat: Add product activation functionality with corresponding command and controller endpoint

Author: gustaavik

src/main/java/com/zenfulcode/commercify/api/payment/PaymentAdminController.java

@@ -2,6 +2,7 @@
 
 import com.zenfulcode.commercify.api.payment.dto.response.CapturedPaymentResponse;
 import com.zenfulcode.commercify.api.payment.mapper.PaymentDtoMapper;
+import com.zenfulcode.commercify.order.domain.valueobject.OrderId;
 import com.zenfulcode.commercify.payment.application.command.CapturePaymentCommand;
 import com.zenfulcode.commercify.payment.application.dto.CapturedPayment;
 import com.zenfulcode.commercify.payment.application.service.PaymentApplicationService;
@@ -10,10 +11,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/v2/payments/admin")
@@ -23,11 +21,11 @@ public class PaymentAdminController {
     private final PaymentApplicationService paymentService;
     private final PaymentDtoMapper paymentDtoMapper;
 
-    @PostMapping("/{paymentId}/capture")
+    @PostMapping("/{orderId}/capture")
     public ResponseEntity<ApiResponse<CapturedPaymentResponse>> capturePayment(
-            @PathVariable String paymentId) {
+            @PathVariable String orderId) {
 
-        CapturePaymentCommand command = paymentDtoMapper.toCaptureCommand(PaymentId.of(paymentId));
+        CapturePaymentCommand command = paymentDtoMapper.toCaptureCommand(OrderId.of(orderId));
         CapturedPayment capturedPayment = paymentService.capturePayment(command);
         CapturedPaymentResponse response = paymentDtoMapper.toCapturedResponse(capturedPayment);
 
@@ -41,4 +39,5 @@ public ResponseEntity<ApiResponse<String>> refundPayment(
 //        paymentService.refundPayment(OrderId.of(orderId));
         return ResponseEntity.ok(ApiResponse.success("Refund initiated"));
     }
+
 }

src/main/java/com/zenfulcode/commercify/api/payment/mapper/PaymentDtoMapper.java

@@ -8,6 +8,7 @@
 import com.zenfulcode.commercify.api.payment.dto.response.PaymentResponse;
 import com.zenfulcode.commercify.order.application.service.OrderApplicationService;
 import com.zenfulcode.commercify.order.domain.model.Order;
+import com.zenfulcode.commercify.order.domain.valueobject.OrderId;
 import com.zenfulcode.commercify.payment.application.command.CapturePaymentCommand;
 import com.zenfulcode.commercify.payment.application.command.InitiatePaymentCommand;
 import com.zenfulcode.commercify.payment.application.dto.CapturedPayment;
@@ -59,9 +60,9 @@ public WebhookPayload toWebhookPayload(WebhookRequest request) {
         }
     }
 
-    public CapturePaymentCommand toCaptureCommand(PaymentId paymentId) {
+    public CapturePaymentCommand toCaptureCommand(OrderId orderId) {
         return new CapturePaymentCommand(
-                paymentId,
+                orderId,
                 null
         );
     }

src/main/java/com/zenfulcode/commercify/api/product/ProductController.java

@@ -14,6 +14,7 @@
 import com.zenfulcode.commercify.product.domain.valueobject.ProductId;
 import com.zenfulcode.commercify.shared.interfaces.ApiResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -22,6 +23,7 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+@Slf4j
 @RestController
 @RequestMapping("/api/v2/products")
 @RequiredArgsConstructor
@@ -135,11 +137,24 @@ public ResponseEntity<ApiResponse<String>> updateVariantPrices(
     @PreAuthorize("hasRole('ADMIN')")
     public ResponseEntity<ApiResponse<String>> deactivateProduct(@PathVariable String productId) {
         DeactivateProductCommand command = new DeactivateProductCommand(ProductId.of(productId));
+        log.info("Deactivating product with ID: {}", productId);
         productApplicationService.deactivateProduct(command);
-
+        log.info("Product deactivated successfully");
         return ResponseEntity.ok(ApiResponse.success("Product deactivated successfully"));
     }
 
+    @PostMapping("/{productId}/activate")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ResponseEntity<ApiResponse<String>> activateProduct(@PathVariable String productId) {
+        ActivateProductCommand command = new ActivateProductCommand(ProductId.of(productId));
+        log.info("Activating product with ID: {}", productId);
+        productApplicationService.activateProduct(command);
+
+        log.info("Product activated successfully");
+
+        return ResponseEntity.ok(ApiResponse.success("Product activated successfully"));
+    }
+
     @DeleteMapping("/{productId}")
     @PreAuthorize("hasRole('ADMIN')")
     public ResponseEntity<ApiResponse<String>> deleteProduct(@PathVariable String productId) {

src/main/java/com/zenfulcode/commercify/payment/application/command/CapturePaymentCommand.java

@@ -1,10 +1,11 @@
 package com.zenfulcode.commercify.payment.application.command;
 
+import com.zenfulcode.commercify.order.domain.valueobject.OrderId;
 import com.zenfulcode.commercify.payment.domain.valueobject.PaymentId;
 import com.zenfulcode.commercify.shared.domain.model.Money;
 
 public record CapturePaymentCommand(
-        PaymentId paymentId,
+        OrderId orderId,
         Money captureAmount
 ) {
 }

src/main/java/com/zenfulcode/commercify/payment/application/service/PaymentApplicationService.java

@@ -79,7 +79,7 @@ public void handlePaymentCallback(PaymentProvider provider, WebhookPayload paylo
     // TODO: Make sure the capture currency is the same as the payment currency
     @Transactional
     public CapturedPayment capturePayment(CapturePaymentCommand command) {
-        Payment payment = paymentDomainService.getPaymentById(command.paymentId());
+        Payment payment = paymentDomainService.getPaymentByOrderId(command.orderId());
 
         Money captureAmount = command.captureAmount() == null ? payment.getAmount() : command.captureAmount();
 

src/main/java/com/zenfulcode/commercify/payment/domain/service/PaymentDomainService.java

@@ -1,6 +1,7 @@
 package com.zenfulcode.commercify.payment.domain.service;
 
 import com.zenfulcode.commercify.order.domain.model.Order;
+import com.zenfulcode.commercify.order.domain.valueobject.OrderId;
 import com.zenfulcode.commercify.payment.domain.event.PaymentCreatedEvent;
 import com.zenfulcode.commercify.payment.domain.exception.PaymentNotFoundException;
 import com.zenfulcode.commercify.payment.domain.model.FailureReason;
@@ -126,4 +127,9 @@ public Payment getPaymentByProviderReference(String providerReference) {
         return paymentRepository.findByProviderReference(providerReference)
                 .orElseThrow(() -> new PaymentNotFoundException(providerReference));
     }
+
+    public Payment getPaymentByOrderId(OrderId orderId) {
+        return paymentRepository.findByOrderId(orderId)
+                .orElseThrow(() -> new PaymentNotFoundException(orderId));
+    }
 }

src/main/java/com/zenfulcode/commercify/product/application/command/ActivateProductCommand.java

@@ -0,0 +1,8 @@
+package com.zenfulcode.commercify.product.application.command;
+
+import com.zenfulcode.commercify.product.domain.valueobject.ProductId;
+
+public record ActivateProductCommand(
+        ProductId productId
+) {
+}

src/main/java/com/zenfulcode/commercify/product/application/service/ProductApplicationService.java

@@ -131,6 +131,19 @@ public void deactivateProduct(DeactivateProductCommand command) {
         eventPublisher.publish(product.getDomainEvents());
     }
 
+    /**
+     * Activates a product
+     */
+    @Transactional
+    public void activateProduct(ActivateProductCommand command) {
+        Product product = productRepository.findById(command.productId())
+                .orElseThrow(() -> new ProductNotFoundException(command.productId()));
+
+        product.activate();
+        productRepository.save(product);
+        eventPublisher.publish(product.getDomainEvents());
+    }
+
     /**
      * Deletes a product
      */