merge

Author: AhmedNasserG

.github/workflows/maven-publish.yaml

@@ -0,0 +1,65 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Publish Docker Packeges
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v3
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -DskipTests -B package --file pom.xml
+
+    - uses: actions/upload-artifact@v4
+      name: Upload JAR artifacts
+      with:
+        name: jarfiles
+        path: '**/target/*.jar'
+
+    - name: Log in to the Container registry
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push Jobs Image
+      run: |
+        docker build ./services/jobs --tag ahmad45123/workup:service_jobs
+        docker push ahmad45123/workup:service_jobs
+
+    - name: Build and push Payments Image
+      run: |
+        docker build ./services/payments --tag ahmad45123/workup:service_payments
+        docker push ahmad45123/workup:service_payments
+    
+    - name: Build and push Users Image
+      run: |
+        docker build ./services/users --tag ahmad45123/workup:service_users
+        docker push ahmad45123/workup:service_users
+
+    - name: Build and push Contracts Image
+      run: |
+        docker build ./services/contracts --tag ahmad45123/workup:service_contracts
+        docker push ahmad45123/workup:service_contracts

compose.yaml

@@ -16,6 +16,18 @@ services:
       - "5672:5672"
       - "15672:15672"
 
+  service_redis:
+    image: redis:latest
+    healthcheck:
+      test: redis-cli ping
+      interval: 30s
+      timeout: 30s
+      retries: 3
+    networks:
+      - microservices
+    ports:
+      - "6379:6379"
+
   # ----- JOBS MICROSERVICE -------
   service_jobs:
     build: ./services/jobs
@@ -35,7 +47,9 @@ services:
       payments_db:
         condition: service_healthy
       service_mq:
-        condition: service_started
+        condition: service_healthy
+      service_redis:
+        condition: service_healthy
     networks:
       - microservices
       - payments

services/payments/pom.xml

@@ -89,6 +89,18 @@
             <version>1.19.7</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>1.19.7</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.redis.testcontainers</groupId>
+            <artifactId>testcontainers-redis-junit-jupiter</artifactId>
+            <version>1.4.6</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

services/payments/src/main/java/com/workup/payments/PaymentsApplication.java

@@ -6,9 +6,13 @@
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
+@ComponentScan(basePackages = "com.workup")
+@EnableCaching
 public class PaymentsApplication {
 
   public static void main(String[] args) {

services/payments/src/main/java/com/workup/payments/commands/PaymentCommand.java

@@ -7,6 +7,7 @@
 import com.workup.shared.commands.Command;
 import com.workup.shared.commands.CommandRequest;
 import com.workup.shared.commands.CommandResponse;
+import com.workup.shared.redis.RedisService;
 import lombok.Data;
 
 @Data
@@ -17,4 +18,5 @@ public abstract class PaymentCommand<T extends CommandRequest, Q extends Command
   private PaymentTransactionRepository paymentTransactionRepository;
   private WalletRepository walletRepository;
   private WalletTransactionRepository walletTransactionRepository;
+  private RedisService redisService;
 }

services/payments/src/main/java/com/workup/payments/commands/PaymentCommandMap.java

@@ -16,6 +16,7 @@
 import com.workup.shared.commands.CommandMap;
 import com.workup.shared.commands.CommandRequest;
 import com.workup.shared.commands.CommandResponse;
+import com.workup.shared.redis.RedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -31,6 +32,8 @@ public class PaymentCommandMap
 
   @Autowired private WalletTransactionRepository walletTransactionRepository;
 
+  @Autowired private RedisService redisService;
+
   public void registerCommands() {
     /* PaymentRequest commands */
     commands.put("CreatePaymentRequest", CreatePaymentRequestCommand.class);
@@ -61,5 +64,7 @@ public void setupCommand(
     command.setPaymentTransactionRepository(paymentTransactionRepository);
     command.setWalletRepository(walletRepository);
     command.setWalletTransactionRepository(walletTransactionRepository);
+
+    command.setRedisService(redisService);
   }
 }

services/payments/src/main/java/com/workup/payments/commands/paymentrequest/GetPaymentRequestCommand.java

@@ -7,13 +7,26 @@
 import com.workup.shared.commands.payments.paymentrequest.requests.GetPaymentRequestRequest;
 import com.workup.shared.commands.payments.paymentrequest.responses.GetPaymentRequestResponse;
 import com.workup.shared.enums.HttpStatusCode;
+import com.workup.shared.redis.RedisService;
 import java.util.Optional;
 
 public class GetPaymentRequestCommand
     extends PaymentCommand<GetPaymentRequestRequest, GetPaymentRequestResponse> {
 
   @Override
   public GetPaymentRequestResponse Run(GetPaymentRequestRequest request) {
+    RedisService redisService = getRedisService();
+
+    GetPaymentRequestResponse cachedResponse =
+        (GetPaymentRequestResponse)
+            redisService.getValue(request.getPaymentRequestId(), GetPaymentRequestResponse.class);
+    if (cachedResponse != null) {
+      System.out.println(
+          "[x] Payment request response fetched from cache : " + cachedResponse.getRequest());
+
+      return cachedResponse;
+    }
+
     Optional<PaymentRequest> savedPaymentRequest =
         getPaymentRequestRepository().findById(request.getPaymentRequestId());
 
@@ -30,9 +43,14 @@ public GetPaymentRequestResponse Run(GetPaymentRequestRequest request) {
     PaymentRequestDTO paymentRequestDTO =
         PaymentRequestMapper.mapToPaymentRequestDTO(savedPaymentRequest.get());
 
-    return GetPaymentRequestResponse.builder()
-        .withStatusCode(HttpStatusCode.OK)
-        .withRequest(paymentRequestDTO)
-        .build();
+    GetPaymentRequestResponse response =
+        GetPaymentRequestResponse.builder()
+            .withStatusCode(HttpStatusCode.OK)
+            .withRequest(paymentRequestDTO)
+            .build();
+
+    redisService.setValue(request.getPaymentRequestId(), response);
+
+    return response;
   }
 }

services/payments/src/test/java/com/workup/payments/PaymentsApplicationTests.java

@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import com.redis.testcontainers.RedisContainer;
 import com.workup.payments.models.PaymentRequest;
 import com.workup.payments.models.PaymentTransaction;
 import com.workup.payments.models.Wallet;
@@ -13,10 +14,6 @@
 import com.workup.shared.commands.payments.dto.PaymentRequestDTO;
 import com.workup.shared.commands.payments.paymentrequest.requests.*;
 import com.workup.shared.commands.payments.paymentrequest.responses.*;
-import com.workup.shared.commands.payments.paymenttransaction.requests.GetClientPaymentTransactionsRequest;
-import com.workup.shared.commands.payments.paymenttransaction.requests.GetFreelancerPaymentTransactionsRequest;
-import com.workup.shared.commands.payments.paymenttransaction.responses.GetClientPaymentTransactionsResponse;
-import com.workup.shared.commands.payments.paymenttransaction.responses.GetFreelancerPaymentTransactionsResponse;
 import com.workup.shared.commands.payments.wallet.requests.CreateWalletRequest;
 import com.workup.shared.commands.payments.wallet.requests.GetWalletRequest;
 import com.workup.shared.commands.payments.wallet.responses.CreateWalletResponse;
@@ -34,6 +31,7 @@
 import com.workup.shared.enums.payments.PaymentRequestStatus;
 import com.workup.shared.enums.payments.PaymentTransactionStatus;
 import com.workup.shared.enums.payments.WalletTransactionType;
+import com.workup.shared.redis.RedisService;
 import java.util.Optional;
 import java.util.UUID;
 import org.junit.jupiter.api.AfterAll;
@@ -49,6 +47,7 @@
 import org.testcontainers.containers.RabbitMQContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
 
 @SpringBootTest
 @Testcontainers
@@ -63,24 +62,32 @@ class PaymentsApplicationTests {
   static final RabbitMQContainer rabbitMQContainer =
       new RabbitMQContainer("rabbitmq:3.13-management");
 
+  @Container
+  static final RedisContainer redisContainer =
+      new RedisContainer(DockerImageName.parse("redis:latest"));
+
   @Autowired private AmqpTemplate template;
   @Autowired private PaymentRequestRepository paymentRequestRepository;
   @Autowired private PaymentTransactionRepository paymentTransactionRepository;
   @Autowired private WalletRepository walletRepository;
   @Autowired private WalletTransactionRepository walletTransactionRepository;
+  @Autowired private RedisService redisService;
 
   @BeforeEach
   void clearAll() {
     paymentRequestRepository.deleteAll();
     paymentTransactionRepository.deleteAll();
     walletRepository.deleteAll();
     walletTransactionRepository.deleteAll();
+
+    redisService.clearCache();
   }
 
   @AfterAll
   static void stopContainers() {
     postgreSQLContainer.stop();
     rabbitMQContainer.stop();
+    redisContainer.stop();
   }
 
   @DynamicPropertySource
@@ -94,6 +101,9 @@ static void setDatasourceProperties(DynamicPropertyRegistry registry) {
     registry.add("spring.rabbitmq.port", rabbitMQContainer::getFirstMappedPort);
     registry.add("spring.rabbitmq.username", rabbitMQContainer::getAdminUsername);
     registry.add("spring.rabbitmq.password", rabbitMQContainer::getAdminPassword);
+
+    registry.add("spring.redis.host", redisContainer::getHost);
+    registry.add("spring.redis.port", () -> redisContainer.getMappedPort(6379));
   }
 
   @Test
@@ -736,72 +746,49 @@ void testGetInvalidWallet() {
   }
 
   @Test
-  void testGetClientPaymentTransactions() {
-    PaymentRequest paymentRequest1 =
-        PaymentRequest.builder().withAmount(1200).withClientId("3").withFreelancerId("4").build();
-    PaymentRequest paymentRequest2 =
-        PaymentRequest.builder().withAmount(3600).withClientId("3").withFreelancerId("1").build();
-    paymentRequestRepository.save(paymentRequest1);
-    paymentRequestRepository.save(paymentRequest2);
-    PaymentTransaction paymentTransaction1 =
-        PaymentTransaction.builder()
+  void testGetPaymentRequestResponseFromCache() {
+    PaymentRequest paymentRequest =
+        PaymentRequest.builder()
             .withAmount(1200)
-            .withPaymentRequestId(paymentRequest1.getId())
-            .build();
-    PaymentTransaction paymentTransaction2 =
-        PaymentTransaction.builder()
-            .withAmount(3600)
-            .withPaymentRequestId(paymentRequest2.getId())
+            .withDescription("Payment for services rendered")
+            .withClientId("3")
+            .withFreelancerId("4")
             .build();
-    paymentTransactionRepository.save(paymentTransaction1);
-    paymentTransactionRepository.save(paymentTransaction2);
+    paymentRequestRepository.save(paymentRequest);
 
-    GetClientPaymentTransactionsRequest getClientPaymentTransactionsRequest =
-        GetClientPaymentTransactionsRequest.builder().withClientId("3").build();
+    GetPaymentRequestRequest getPaymentRequest =
+        GetPaymentRequestRequest.builder().withPaymentRequestId(paymentRequest.getId()).build();
 
-    GetClientPaymentTransactionsResponse response =
-        (GetClientPaymentTransactionsResponse)
-            template.convertSendAndReceive(
-                ServiceQueueNames.PAYMENTS, getClientPaymentTransactionsRequest);
+    GetPaymentRequestResponse response =
+        (GetPaymentRequestResponse)
+            template.convertSendAndReceive(ServiceQueueNames.PAYMENTS, getPaymentRequest);
 
     assertNotNull(response);
     assertEquals(HttpStatusCode.OK, response.getStatusCode());
-    assertNotNull(response.getTransactions());
-    assertEquals(2, response.getTransactions().size());
-  }
-
-  @Test
-  void testGetFreelancerPaymentTransactions() {
-    PaymentRequest paymentRequest1 =
-        PaymentRequest.builder().withAmount(1200).withClientId("3").withFreelancerId("4").build();
-    PaymentRequest paymentRequest2 =
-        PaymentRequest.builder().withAmount(3600).withClientId("10").withFreelancerId("4").build();
-    paymentRequestRepository.save(paymentRequest1);
-    paymentRequestRepository.save(paymentRequest2);
-    PaymentTransaction paymentTransaction1 =
-        PaymentTransaction.builder()
-            .withAmount(1200)
-            .withPaymentRequestId(paymentRequest1.getId())
-            .build();
-    PaymentTransaction paymentTransaction2 =
-        PaymentTransaction.builder()
-            .withAmount(3600)
-            .withPaymentRequestId(paymentRequest2.getId())
-            .build();
-    paymentTransactionRepository.save(paymentTransaction1);
-    paymentTransactionRepository.save(paymentTransaction2);
 
-    GetFreelancerPaymentTransactionsRequest getFreelancerPaymentTransactionsRequest =
-        GetFreelancerPaymentTransactionsRequest.builder().withFreelancerId("4").build();
+    GetPaymentRequestResponse cachedResponse =
+        (GetPaymentRequestResponse)
+            redisService.getValue(
+                getPaymentRequest.getPaymentRequestId(), GetPaymentRequestResponse.class);
 
-    GetFreelancerPaymentTransactionsResponse response =
-        (GetFreelancerPaymentTransactionsResponse)
-            template.convertSendAndReceive(
-                ServiceQueueNames.PAYMENTS, getFreelancerPaymentTransactionsRequest);
+    assertNotNull(cachedResponse);
+    assertEquals(HttpStatusCode.OK, cachedResponse.getStatusCode());
 
-    assertNotNull(response);
-    assertEquals(HttpStatusCode.OK, response.getStatusCode());
-    assertNotNull(response.getTransactions());
-    assertEquals(2, response.getTransactions().size());
+    assertAll(
+        () -> assertEquals(response.getRequest().getId(), cachedResponse.getRequest().getId()),
+        () ->
+            assertEquals(
+                response.getRequest().getAmount(), cachedResponse.getRequest().getAmount()),
+        () ->
+            assertEquals(
+                response.getRequest().getDescription(),
+                cachedResponse.getRequest().getDescription()),
+        () ->
+            assertEquals(
+                response.getRequest().getClientId(), cachedResponse.getRequest().getClientId()),
+        () ->
+            assertEquals(
+                response.getRequest().getFreelancerId(),
+                cachedResponse.getRequest().getFreelancerId()));
   }
 }