total project restructure

.dockerignore

@@ -23,7 +23,6 @@ deploy/
 *.log
 
 # Environment files
-.env
 *.env
 
 # Documentation

.gitignore

@@ -31,4 +31,5 @@ build/
 
 ### VS Code ###
 .vscode/
-/deploy/.env
+.env
+deploy/.env

deploy/.env.example

@@ -4,7 +4,7 @@ DATASOURCE_USERNAME=commercifyapp
 DATASOURCE_PASSWORD=password123!
 STRIPE_SECRET_TEST_KEY=
 STRIPE_WEBHOOK_SECRET=
-STRIPE_WEBHOOK_ENDPOINT=http://localhost:6091/api/v1/payments/stripe/webhooks
+STRIPE_WEBHOOK_ENDPOINT=https://<insert_host>/api/v2/payments/webhooks/stripe/callback
 JWT_SECRET_KEY=
 [email protected]
 ADMIN_PASSWORD=admin
@@ -14,8 +14,8 @@ MOBILEPAY_SUBSCRIPTION_KEY=
 MOBILEPAY_MERCHANT_ID=
 MOBILEPAY_API_URL=
 MOBILEPAY_SYSTEM_NAME=Commercify
+MOBILEPAY_WEBHOOK_CALLBACK=https://<insert_host>/api/v2/payments/webhooks/mobilepay/callback
 MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_HOST=smtp.ethereal.email
-MAIL_PORT=587
-FRONTEND_URL=http://localhost:3000
+MAIL_PORT=587

deploy/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   mysql:
-    image: mysql:8.0
+    image: mysql:9.1
     container_name: commercify-mysql
     environment:
       - MYSQL_DATABASE=commercifydb
@@ -40,10 +40,11 @@ services:
       - MOBILEPAY_SUBSCRIPTION_KEY=${MOBILEPAY_SUBSCRIPTION_KEY}
       - MOBILEPAY_API_URL=${MOBILEPAY_API_URL}
       - MOBILEPAY_SYSTEM_NAME=${MOBILEPAY_SYSTEM_NAME}
-      - MAIL_USERNAME=${MAIL_USERNAME}
-      - MAIL_PASSWORD=${MAIL_PASSWORD}
+      - MOBILEPAY_WEBHOOK_CALLBACK=${MOBILEPAY_WEBHOOK_CALLBACK}
       - MAIL_HOST=${MAIL_HOST}
       - MAIL_PORT=${MAIL_PORT}
+      - MAIL_USERNAME=${MAIL_USERNAME}
+      - MAIL_PASSWORD=${MAIL_PASSWORD}
     depends_on:
       mysql:
         condition: service_healthy

example.env

@@ -0,0 +1,20 @@
+DATASOURCE_URL=jdbc:mysql://localhost/commercifydb?createDatabaseIfNotExist=true
+DATASOURCE_USERNAME=
+DATASOURCE_PASSWORD=
+STRIPE_SECRET_TEST_KEY=
+STRIPE_WEBHOOK_SECRET=
+JWT_SECRET_KEY=7581e8477a88733917bc3b48f683a827935a492a0bd976a59429a72f28c71fd3
+ADMIN_EMAIL=<a valid email, order notification are sent here>
+ADMIN_PASSWORD=commercifyadmin123!
+ADMIN_ORDER_DASHBOARD=https://<admin dashboard>/admin/orders
+MOBILEPAY_CLIENT_ID=
+MOBILEPAY_CLIENT_SECRET=
+MOBILEPAY_SUBSCRIPTION_KEY=
+MOBILEPAY_MERCHANT_ID=
+MOBILEPAY_API_URL=
+MOBILEPAY_SYSTEM_NAME=
+MOBILEPAY_WEBHOOK_CALLBACK=https://<publicdomain>/api/v2/payments/webhooks/mobilepay/callback
+MAIL_HOST=smtp.gmail.com
+MAIL_PORT=
+MAIL_USERNAME=
+MAIL_PASSWORD=

pom.xml

@@ -174,5 +174,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

src/main/java/com/zenfulcode/commercify/commercify/CommercifyApplication.java → src/main/java/com/zenfulcode/commercify/CommercifyApplication.java

@@ -1,12 +1,19 @@
-package com.zenfulcode.commercify.commercify;
+package com.zenfulcode.commercify;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
 public class CommercifyApplication {
     public static void main(String[] args) {
         SpringApplication.run(CommercifyApplication.class, args);
     }
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
 }
 

src/main/java/com/zenfulcode/commercify/api/auth/AuthController.java

@@ -0,0 +1,67 @@
+package com.zenfulcode.commercify.api.auth;
+
+import com.zenfulcode.commercify.api.auth.dto.request.LoginRequest;
+import com.zenfulcode.commercify.api.auth.dto.request.RefreshTokenRequest;
+import com.zenfulcode.commercify.api.auth.dto.request.RegisterRequest;
+import com.zenfulcode.commercify.api.auth.dto.response.AuthResponse;
+import com.zenfulcode.commercify.auth.application.service.AuthenticationApplicationService;
+import com.zenfulcode.commercify.auth.application.service.AuthenticationResult;
+import com.zenfulcode.commercify.shared.interfaces.ApiResponse;
+import com.zenfulcode.commercify.user.application.service.UserApplicationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/v2/auth")
+@RequiredArgsConstructor
+public class AuthController {
+    private final AuthenticationApplicationService authService;
+    private final UserApplicationService userService;
+
+    @PostMapping("/signin")
+    public ResponseEntity<ApiResponse<AuthResponse>> login(
+            @RequestBody LoginRequest request) {
+        AuthenticationResult result = authService.authenticate(
+                request.email(),
+                request.password()
+        );
+
+        AuthResponse response = AuthResponse.from(result);
+        return ResponseEntity.ok(ApiResponse.success(response));
+    }
+
+    @PostMapping("/signup")
+    public ResponseEntity<ApiResponse<AuthResponse>> register(
+            @RequestBody RegisterRequest request) {
+
+        userService.registerUser(
+                request.firstName(),
+                request.lastName(),
+                request.email(),
+                request.password(),
+                request.phone()
+        );
+
+        // Authenticate the newly registered user
+        AuthenticationResult result = authService.authenticate(
+                request.email(),
+                request.password()
+        );
+
+        AuthResponse response = AuthResponse.from(result);
+        return ResponseEntity.ok(ApiResponse.success(response));
+    }
+
+    @PostMapping("/refresh")
+    public ResponseEntity<ApiResponse<AuthResponse>> refreshToken(
+            @RequestBody RefreshTokenRequest request) {
+
+        AuthenticationResult result = authService.refreshToken(request.refreshToken());
+        AuthResponse response = AuthResponse.from(result);
+        return ResponseEntity.ok(ApiResponse.success(response));
+    }
+}

src/main/java/com/zenfulcode/commercify/api/auth/dto/request/LoginRequest.java

@@ -0,0 +1,7 @@
+package com.zenfulcode.commercify.api.auth.dto.request;
+
+public record LoginRequest(
+        String email,
+        String password
+) {
+}

src/main/java/com/zenfulcode/commercify/api/auth/dto/request/RefreshTokenRequest.java

@@ -0,0 +1,6 @@
+package com.zenfulcode.commercify.api.auth.dto.request;
+
+public record RefreshTokenRequest(
+        String refreshToken
+) {
+}

src/main/java/com/zenfulcode/commercify/api/auth/dto/request/RegisterRequest.java

@@ -0,0 +1,10 @@
+package com.zenfulcode.commercify.api.auth.dto.request;
+
+public record RegisterRequest(
+        String firstName,
+        String lastName,
+        String email,
+        String password,
+        String phone
+) {
+}

src/main/java/com/zenfulcode/commercify/api/auth/dto/response/AuthResponse.java

@@ -0,0 +1,33 @@
+package com.zenfulcode.commercify.api.auth.dto.response;
+
+import com.zenfulcode.commercify.auth.application.service.AuthenticationResult;
+import com.zenfulcode.commercify.auth.domain.model.UserRole;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public record AuthResponse(
+        String accessToken,
+        String refreshToken,
+        String tokenType,
+        String userId,
+        String username,
+        String email,
+        Set<String> roles
+) {
+    public static AuthResponse from(AuthenticationResult result) {
+        Set<String> roles = result.user().getRoles().stream()
+                .map(UserRole::name)
+                .collect(Collectors.toSet());
+
+        return new AuthResponse(
+                result.accessToken(),
+                result.refreshToken(),
+                "Bearer",
+                result.user().getUserId(),
+                result.user().getUsername(),
+                result.user().getEmail(),
+                roles
+        );
+    }
+}

src/main/java/com/zenfulcode/commercify/api/order/OrderController.java

@@ -0,0 +1,90 @@
+package com.zenfulcode.commercify.api.order;
+
+import com.zenfulcode.commercify.api.order.dto.request.CreateOrderRequest;
+import com.zenfulcode.commercify.api.order.dto.response.CreateOrderResponse;
+import com.zenfulcode.commercify.api.order.dto.response.OrderDetailsResponse;
+import com.zenfulcode.commercify.api.order.dto.response.PagedOrderResponse;
+import com.zenfulcode.commercify.api.order.mapper.OrderDtoMapper;
+import com.zenfulcode.commercify.order.application.command.CancelOrderCommand;
+import com.zenfulcode.commercify.order.application.command.CreateOrderCommand;
+import com.zenfulcode.commercify.order.application.dto.OrderDetailsDTO;
+import com.zenfulcode.commercify.order.application.query.FindAllOrdersQuery;
+import com.zenfulcode.commercify.order.application.query.FindOrdersByUserIdQuery;
+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.shared.interfaces.ApiResponse;
+import com.zenfulcode.commercify.user.domain.valueobject.UserId;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/v2/orders")
+@RequiredArgsConstructor
+public class OrderController {
+    private final OrderApplicationService orderApplicationService;
+    private final OrderDtoMapper orderDtoMapper;
+
+    @PostMapping
+    public ResponseEntity<ApiResponse<CreateOrderResponse>> createOrder(
+            @RequestBody CreateOrderRequest request) {
+        CreateOrderCommand command = orderDtoMapper.toCommand(request);
+        OrderId orderId = orderApplicationService.createOrder(command);
+
+        CreateOrderResponse response = new CreateOrderResponse(
+                orderId.toString(),
+                "Order created successfully"
+        );
+
+        return ResponseEntity.ok(ApiResponse.success(response));
+    }
+
+    @GetMapping("/{orderId}")
+    public ResponseEntity<ApiResponse<OrderDetailsResponse>> getOrder(
+            @PathVariable String orderId) {
+        OrderDetailsDTO order = orderApplicationService.getOrderDetailsById(OrderId.of(orderId));
+        OrderDetailsResponse response = orderDtoMapper.toResponse(order);
+        return ResponseEntity.ok(ApiResponse.success(response));
+    }
+
+    @GetMapping("/user/{userId}")
+    @PreAuthorize("hasRole('USER') and #userId == authentication.principal.id or hasRole('ADMIN')")
+    public ResponseEntity<ApiResponse<PagedOrderResponse>> getOrdersByUserId(
+            @PathVariable String userId,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "10") int size) {
+
+        FindOrdersByUserIdQuery query = new FindOrdersByUserIdQuery(
+                UserId.of(userId),
+                PageRequest.of(page, size)
+        );
+
+        Page<Order> orders = orderApplicationService.findOrdersByUserId(query);
+        PagedOrderResponse response = orderDtoMapper.toPagedResponse(orders);
+        return ResponseEntity.ok(ApiResponse.success(response));
+    }
+
+    @GetMapping
+    @PreAuthorize("hasRole('ADMIN')")
+    public ResponseEntity<ApiResponse<PagedOrderResponse>> getAllOrders(
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "10") int size) {
+
+        FindAllOrdersQuery query = new FindAllOrdersQuery(PageRequest.of(page, size));
+        Page<Order> orders = orderApplicationService.findAllOrders(query);
+        PagedOrderResponse response = orderDtoMapper.toPagedResponse(orders);
+        return ResponseEntity.ok(ApiResponse.success(response));
+    }
+
+    @DeleteMapping("/{orderId}")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ResponseEntity<ApiResponse<String>> cancelOrder(@PathVariable String orderId) {
+        CancelOrderCommand command = new CancelOrderCommand(OrderId.of(orderId));
+        orderApplicationService.cancelOrder(command);
+        return ResponseEntity.ok(ApiResponse.success("Order cancelled successfully"));
+    }
+}

src/main/java/com/zenfulcode/commercify/api/order/dto/request/AddressRequest.java

@@ -0,0 +1,10 @@
+package com.zenfulcode.commercify.api.order.dto.request;
+
+public record AddressRequest(
+        String street,
+        String city,
+        String state,
+        String zipCode,
+        String country
+) {
+}

src/main/java/com/zenfulcode/commercify/api/order/dto/request/CreateOrderLineRequest.java

@@ -0,0 +1,9 @@
+package com.zenfulcode.commercify.api.order.dto.request;
+
+
+public record CreateOrderLineRequest(
+        String productId,
+        String variantId,
+        int quantity
+) {
+}

src/main/java/com/zenfulcode/commercify/api/order/dto/request/CreateOrderRequest.java

@@ -0,0 +1,13 @@
+package com.zenfulcode.commercify.api.order.dto.request;
+
+import java.util.List;
+
+public record CreateOrderRequest(
+        String userId,
+        String currency,
+        CustomerDetailsRequest customerDetails,
+        AddressRequest shippingAddress,
+        AddressRequest billingAddress,
+        List<CreateOrderLineRequest> orderLines
+) {
+}

src/main/java/com/zenfulcode/commercify/api/order/dto/request/CustomerDetailsRequest.java

@@ -0,0 +1,9 @@
+package com.zenfulcode.commercify.api.order.dto.request;
+
+public record CustomerDetailsRequest(
+        String firstName,
+        String lastName,
+        String email,
+        String phone
+) {
+}

src/main/java/com/zenfulcode/commercify/api/order/dto/request/UpdateOrderStatusRequest.java

@@ -0,0 +1,6 @@
+package com.zenfulcode.commercify.api.order.dto.request;
+
+public record UpdateOrderStatusRequest(
+        String status
+) {
+}

src/main/java/com/zenfulcode/commercify/api/order/dto/response/AddressResponse.java

@@ -0,0 +1,10 @@
+package com.zenfulcode.commercify.api.order.dto.response;
+
+public record AddressResponse(
+        String street,
+        String city,
+        String state,
+        String zipCode,
+        String country
+) {
+}