chore: add noti in values.yaml, merge from main

.github/workflows/gitops.yaml

@@ -79,7 +79,7 @@ jobs:
 
       - name: Update Image Tag Values
         run: |
-          chart_dir="helm"
+          chart_dir="helm/nshm"
           new_image_tag=${{ github.sha }}
           sed -i -E "s|(repository: z1yoon/nshm-${{ matrix.service }}[[:space:]]+tag: )[^\"]*|\1$new_image_tag|g" "$chart_dir/values.yaml"
 

decrypt-run.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
-
 DOCKER_COMPOSE_FILE=docker-compose.dev.yaml
 ENVS_DIR="./envs"
 PASSPHRASE_FILE="nshm.passphrase"
-
 # Check if the passphrase file exists, if not, download it from S3
 if [[ ! -f "$PASSPHRASE_FILE" ]]; then
   echo "Passphrase file not found. Downloading from S3..."
@@ -13,7 +11,6 @@ if [[ ! -f "$PASSPHRASE_FILE" ]]; then
     exit 1
   fi
 fi
-
 # Decrypt each .env.gpg file inside the envs directory
 for env_file_gpg in "$ENVS_DIR"/*.env.gpg; do
   if [[ -f "$env_file_gpg" ]]; then
@@ -47,15 +44,12 @@ for env_file_gpg in "$ENVS_DIR"/*.env.gpg; do
     fi
   fi
 done
-
 # Check if the rabbitmq container is running, stop all containers if necessary
 if [[ "$(docker ps -q -f name=rabbitmq)" ]]; then
   echo "Stopping running containers..."
   docker compose -f "$DOCKER_COMPOSE_FILE" down
 fi
-
 # Start the Docker Compose services
 echo "Starting Docker Compose services..."
 docker compose -f "$DOCKER_COMPOSE_FILE" up --build -d
-
 echo "Docker Compose services started."

docker-compose.dev.yaml

@@ -31,8 +31,10 @@ services:
     networks:
       - bridge
     depends_on:
-      - account-postgres
-      - rabbitmq
+      account-postgres:
+        condition: service_started
+      rabbitmq:
+        condition: service_healthy
     restart: always
 
   account-postgres:
@@ -92,8 +94,10 @@ services:
     networks:
       - bridge
     depends_on:
-      - wishlist-mongo
-      - rabbitmq
+      wishlist-mongo:
+        condition: service_started
+      rabbitmq:
+        condition: service_healthy
     restart: always
 
   wishlist-mongo:

encrypt.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
-
 # Check if the passphrase file exists
 PASSPHRASE_FILE="nshm.passphrase"
 S3_BUCKET="s3://nus-backend-terraform"
 SERVICES_DIR="services"
-
 if [ ! -f "$PASSPHRASE_FILE" ]; then
   echo "Passphrase file not found, downloading from S3..."
   aws s3 cp "${S3_BUCKET}/${PASSPHRASE_FILE}" .
@@ -16,10 +14,8 @@ if [ ! -f "$PASSPHRASE_FILE" ]; then
 else
   echo "Passphrase file already exists."
 fi
-
 # Get a list of service directories
 service_dirs=($(ls -d "$SERVICES_DIR"/*))
-
 # Loop through each service directory and encrypt its .env file
 for service_dir in "${service_dirs[@]}"; do
   SERVICE_NAME=$(basename "$service_dir")
@@ -38,6 +34,5 @@ for service_dir in "${service_dirs[@]}"; do
     echo "No .env file found in $service_dir, skipping..."
   fi
 done
-
 echo "All services processed."
 

helm/nshm/values.yaml

@@ -53,3 +53,16 @@ web:
     requests:
       cpu: 250m
       memory: 256Mi
+# Notification service values
+notification:
+  image:
+    repository: z1yoon/nshm-notification
+    tag: latest
+  replicas: 1
+  resources:
+    limits:
+      cpu: 500m
+      memory: 512Mi
+    requests:
+      cpu: 250m
+      memory: 256Mi

services/account/.gitignore

@@ -1,3 +1,10 @@
+envs/currency.env.gpg
+envs/item.env.gpg
+envs/notification.env.gpg
+envs/web.env.gpg
+envs/account.env.gpg
+
+
 HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar

services/account/README.md

@@ -0,0 +1,42 @@
+# Account Service
+
+Account service is responsible for account-related operations, such as registration, profile management, log in/out, etc.
+
+## Events
+
+### Exchange
+
+- Name: account
+- Type: topic
+- Durable: true
+
+### Topic: updated
+
+- Description: A user has updated the profile with new information.
+- Message format: JSON-serialized item.
+
+```json
+{
+  {
+    "id": 1,
+    "email": "[email protected]",
+    "nickname": "mrcaidev",
+    "avatar_url": "https://avatars.githubusercontent.com/u/78269445?v=4",
+    "department_id": 1,
+    "phone_code": "65",
+    "phone_number": "80843976",
+    "preferred_currency": "CNY",
+    "created_at": "2024-09-23 12:19:10.415264+00",
+    "deleted_at": null
+  }
+}
+```
+
+### Topic: deleted
+
+- Description: A user has deleted the account.
+- Message format: Account ID.
+
+```
+1
+```

services/account/pom.xml

@@ -109,6 +109,16 @@
       <version>4.0.0</version> <!-- 根据最新版本调整 -->
       <scope>test</scope>
     </dependency>
+      <dependency>
+          <groupId>org.springframework.amqp</groupId>
+          <artifactId>spring-amqp</artifactId>
+      </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-amqp</artifactId>
+    </dependency>
+
 
 
   </dependencies>

services/account/src/main/java/edu/nus/market/config/RabbitMQConfig.java

@@ -0,0 +1,31 @@
+package edu.nus.market.config;
+
+import jakarta.annotation.Resource;
+import org.springframework.amqp.core.*;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class RabbitMQConfig {
+    // use Jackson2JsonMessageConverter to transfer the message JSON format
+    @Bean
+    public Jackson2JsonMessageConverter jsonMessageConverter() {
+        return new Jackson2JsonMessageConverter();
+    }
+
+    @Bean
+    public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) {
+        RabbitTemplate template = new RabbitTemplate(connectionFactory);
+        template.setMessageConverter(jsonMessageConverter());
+        return template;
+    }
+
+    // define account Topic exchange
+    @Bean
+    public TopicExchange topicExchange() {
+        return new TopicExchange("account");
+    }
+}

services/account/src/main/java/edu/nus/market/controller/AccountController.java

@@ -33,32 +33,32 @@ public ResponseEntity<Object> register(@Valid @RequestBody RegisterReq registerR
         return accountService.registerService(registerReq);
     }
     @DeleteMapping("/{id}")
-    public ResponseEntity<Object> deleteAccount(@PathVariable int id, @RequestHeader(value = "Cookie", required = false) String token){
+    public ResponseEntity<Object> deleteAccount(@PathVariable int id, @CookieValue(value = "access_token", required = false) String token){
         if (token == null || token.isEmpty()){
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorMsg(ErrorMsgEnum.NOT_LOGGED_IN.ErrorMsg));
         }
-        if (!JwtTokenManager.validateCookie(token)) {
+        if (!JwtTokenManager.validateToken(token)) {
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorMsg(ErrorMsgEnum.UNAUTHORIZED_ACCESS.ErrorMsg));
         }
-        int userId = JwtTokenManager.decodeCookie(token).getId();
+        int userId = JwtTokenManager.decodeAccessToken(token).getId();
         if (userId != id){
             return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ErrorMsg(ErrorMsgEnum.ACCESS_FORBIDDEN.ErrorMsg));
         }
         return accountService.deleteAccountService(id);
     }
 
     @PatchMapping("/{id}")
-    public ResponseEntity<Object> updateProfile(@PathVariable int id, @Valid @RequestBody UpdateProfileReq req, BindingResult bindingResult, @RequestHeader(value = "Cookie", required = false) String token){
+    public ResponseEntity<Object> updateProfile(@PathVariable int id, @Valid @RequestBody UpdateProfileReq req, BindingResult bindingResult, @CookieValue(value = "access_token", required = false) String token){
         if (token == null || token.isEmpty()){
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorMsg(ErrorMsgEnum.NOT_LOGGED_IN.ErrorMsg));
-        }
-        if (!JwtTokenManager.validateCookie(token)) {
+    }
+        if (!JwtTokenManager.validateToken(token)) {
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorMsg(ErrorMsgEnum.UNAUTHORIZED_ACCESS.ErrorMsg));
         }
         if (bindingResult.hasErrors()) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ErrorMsg(ErrorMsgEnum.INVALID_DATA_FORMAT.ErrorMsg));
         }
-        int userId = JwtTokenManager.decodeCookie(token).getId();
+        int userId = JwtTokenManager.decodeAccessToken(token).getId();
         if (userId != id){
             return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ErrorMsg(ErrorMsgEnum.ACCESS_FORBIDDEN.ErrorMsg));
         }

services/account/src/main/java/edu/nus/market/controller/AuthController.java

@@ -26,13 +26,13 @@ public class AuthController {
 
     // Get Account Info
     @GetMapping("/me")
-    public ResponseEntity<Object> getAccount(@RequestHeader(value = "Cookie", required = false) String token){
+    public ResponseEntity<Object> getAccount(@CookieValue(value = "access_token", required = false) String token){
         if (token == null || token.isEmpty())
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorMsg(ErrorMsgEnum.NOT_LOGGED_IN.ErrorMsg));
-        if (!JwtTokenManager.validateCookie(token)) {
+        if (!JwtTokenManager.validateToken(token)) {
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorMsg(ErrorMsgEnum.UNAUTHORIZED_ACCESS.ErrorMsg));
         }
-        return accountService.getAccountService(JwtTokenManager.decodeCookie(token).getId());
+        return accountService.getAccountService(JwtTokenManager.decodeAccessToken(token).getId());
     }
 
     // Login and Logout
@@ -61,17 +61,17 @@ public ResponseEntity<Object> resetPassword(@Valid @RequestBody ForgetPasswordRe
 
     //Updating Account
     @PutMapping("/me/password")
-    public ResponseEntity<Object> updateAccountPsw(@Valid @RequestBody UpdPswReq req, BindingResult bindingResult, @RequestHeader(value = "Cookie", required = false) String token){
+    public ResponseEntity<Object> updateAccountPsw(@Valid @RequestBody UpdPswReq req, BindingResult bindingResult, @CookieValue(value = "access_token", required = false) String token){
         if (token == null || token.isEmpty()){
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorMsg(ErrorMsgEnum.NOT_LOGGED_IN.ErrorMsg));
         }
-        if (!JwtTokenManager.validateCookie(token)) {
+        if (!JwtTokenManager.validateToken(token)) {
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ErrorMsg(ErrorMsgEnum.UNAUTHORIZED_ACCESS.ErrorMsg));
         }
         if (bindingResult.hasErrors()) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ErrorMsg(ErrorMsgEnum.INVALID_DATA_FORMAT.ErrorMsg));
         }
-        return accountService.updatePasswordService(req, JwtTokenManager.decodeCookie(token).getId());
+        return accountService.updatePasswordService(req, JwtTokenManager.decodeAccessToken(token).getId());
     }
 
     @GetMapping("/healthz")
@@ -80,3 +80,4 @@ public String checkHealth(){
     }
 
 }
+

services/account/src/main/java/edu/nus/market/pojo/Account.java

@@ -58,4 +58,15 @@ public Account(RegisterReq registerReq){
         this.preferredCurrency = null;
     }
 
+    public Account(int id, String email){
+        this.id = id;
+        this.email = email;
+        this.nickname = null;
+        this.avatarUrl = null;
+        this.departmentId = 0;
+        this.phoneCode = null;
+        this.phoneNumber = null;
+        this.preferredCurrency = null;
+    }
+
 }

services/account/src/main/java/edu/nus/market/pojo/ResEntity/UpdateMessage.java

@@ -0,0 +1,37 @@
+package edu.nus.market.pojo.ResEntity;
+
+import edu.nus.market.pojo.Account;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UpdateMessage {
+    int id;
+
+    String nickname;
+
+    String avatarUrl;
+
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("UpdateMessage{")
+            .append("id=").append(id)
+            .append(", nickname='").append(nickname).append('\'')
+            .append(", avatarUrl='").append(avatarUrl).append('\'')
+            .append('}');
+        return sb.toString();
+    }
+
+    // all args constructor, input an Account object, and convert to this UpdateMessage object
+    public UpdateMessage(Account account) {
+        this.id = account.getId();
+        this.nickname = account.getNickname();
+        this.avatarUrl = account.getAvatarUrl();
+    }
+}
+

services/account/src/main/java/edu/nus/market/service/AccountServiceImpl.java

@@ -2,6 +2,7 @@
 import edu.nus.market.pojo.ReqEntity.*;
 import edu.nus.market.pojo.ResEntity.JWTPayload;
 import edu.nus.market.pojo.ResEntity.ResAccount;
+import edu.nus.market.pojo.ResEntity.UpdateMessage;
 import edu.nus.market.security.CookieManager;
 import edu.nus.market.security.JwtTokenManager;
 import edu.nus.market.security.PasswordHasher;
@@ -35,6 +36,9 @@ public class AccountServiceImpl implements AccountService{
     @Resource
     CookieManager cookieManager;
 
+    @Resource
+    MQService mqService;
+
     /**
      *
      * @param id
@@ -135,7 +139,7 @@ public ResponseEntity<Object> updateProfileService(UpdateProfileReq updateProfil
         }
 
         account = accountDao.updateProfile(updateProfileReq, id);
-
+        mqService.sendUpdateMessage(new UpdateMessage(account));
         return ResponseEntity.status(HttpStatus.OK).body(new ResAccount(account));
 
     }
@@ -148,6 +152,7 @@ public ResponseEntity<Object> deleteAccountService(int id) {
         //delete account
         accountDao.softDeleteAccount(id);
         ResponseCookie cookie = cookieManager.deleteCookie();
+        mqService.sendDeleteMessage(String.valueOf(id));
         return ResponseEntity.status(HttpStatus.NO_CONTENT).header("Set-Cookie", cookie.toString()).build();
     }
 

services/account/src/main/java/edu/nus/market/service/MQService.java

@@ -0,0 +1,8 @@
+package edu.nus.market.service;
+
+import edu.nus.market.pojo.ResEntity.UpdateMessage;
+
+public interface MQService {
+    public void sendUpdateMessage(UpdateMessage message);
+    public void sendDeleteMessage(String message);
+}