Add Profile

yunomix2834 · yunomix2834 · commit 595ca03ca525 · 2025-08-12T23:37:24.000+07:00
diff --git a/identity-service/src/main/java/com/codecampus/identity/configuration/config/init/ApplicationInitializationService.java b/identity-service/src/main/java/com/codecampus/identity/configuration/config/init/ApplicationInitializationService.java
@@ -1,13 +1,15 @@
 package com.codecampus.identity.configuration.config.init;
 
-import com.codecampus.identity.dto.request.profile.UserProfileCreationRequest;
 import com.codecampus.identity.entity.account.Role;
 import com.codecampus.identity.entity.account.User;
+import com.codecampus.identity.mapper.kafka.UserPayloadMapper;
 import com.codecampus.identity.repository.account.PermissionRepository;
 import com.codecampus.identity.repository.account.RoleRepository;
 import com.codecampus.identity.repository.account.UserRepository;
 import com.codecampus.identity.repository.httpclient.profile.ProfileClient;
+import com.codecampus.identity.service.kafka.UserEventProducer;
 import com.codecampus.identity.utils.ConvertUtils;
+import events.user.data.UserProfileCreationPayload;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.RequiredArgsConstructor;
@@ -32,11 +34,19 @@ public class ApplicationInitializationService {
     RoleRepository roleRepository;
     PermissionRepository permissionRepository;
     UserRepository userRepository;
+
     PasswordEncoder passwordEncoder;
     ProfileClient profileClient;
 
+    UserPayloadMapper userPayloadMapper;
+
+    UserEventProducer userEventProducer;
+
     @Transactional
-    void createAdminUser(String username, String password, String email) {
+    void createAdminUser(
+            String username,
+            String password,
+            String email) {
         Role adminRole = checkRoleAndCreate(ADMIN_ROLE);
 
         Set<Role> roles = new HashSet<>();
@@ -50,9 +60,10 @@ void createAdminUser(String username, String password, String email) {
                 .roles(roles)
                 .build());
 
-        profileClient.internalCreateUserProfile(
-                UserProfileCreationRequest.builder()
-                        .userId(user.getId())
+        userEventProducer.publishCreatedUserEvent(user);
+
+        UserProfileCreationPayload payload =
+                UserProfileCreationPayload.builder()
                         .firstName("Admin")
                         .lastName("Sys")
                         .dob(ConvertUtils.parseDdMmYyyyToInstant("28/03/2004"))
@@ -63,8 +74,9 @@ void createAdminUser(String username, String password, String email) {
                         .links(new String[] {"https://github.com/yunomix2834",
                                 "https://github.com/CapstoneProjectCMC/backend"})
                         .city("Vietnam")
-                        .build()
-        );
+                        .build();
+
+        userEventProducer.publishRegisteredUserEvent(user, payload);
     }
 
     @Transactional
@@ -82,9 +94,10 @@ void createUser(String username, String password, String email) {
                 .roles(roles)
                 .build());
 
-        profileClient.internalCreateUserProfile(
-                UserProfileCreationRequest.builder()
-                        .userId(user.getId())
+        userEventProducer.publishCreatedUserEvent(user);
+
+        UserProfileCreationPayload payload =
+                UserProfileCreationPayload.builder()
                         .firstName("Code")
                         .lastName("Campus")
                         .dob(ConvertUtils.parseDdMmYyyyToInstant("28/03/2004"))
@@ -95,8 +108,9 @@ void createUser(String username, String password, String email) {
                         .links(new String[] {"https://github.com/yunomix2834",
                                 "https://github.com/CapstoneProjectCMC/backend"})
                         .city("Vietnam")
-                        .build()
-        );
+                        .build();
+
+        userEventProducer.publishRegisteredUserEvent(user, payload);
     }
 
     Role checkRoleAndCreate(String roleName) {
diff --git a/identity-service/src/main/java/com/codecampus/identity/mapper/authentication/UserMapper.java b/identity-service/src/main/java/com/codecampus/identity/mapper/authentication/UserMapper.java
@@ -13,16 +13,17 @@
 @Mapper(componentModel = "spring",
         nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
 public interface UserMapper {
-    User toUser(UserCreationRequest userCreationRequest);
+    User toUserFromUserCreationRequest(UserCreationRequest userCreationRequest);
 
     @Mapping(target = "userId", ignore = true)
-    UserProfileCreationRequest toUserProfileCreationRequest(
-            UserCreationRequest req);
+    UserProfileCreationRequest toUserProfileCreationRequestFromUserCreationRequest(
+            UserCreationRequest userCreationRequest);
 
-    UserResponse toUserResponse(User user);
+    UserResponse toUserResponseFromUser(
+            User user);
 
     @Mapping(target = "roles", ignore = true)
-    void updateUser(
+    void updateUserUpdateRequestToUser(
             @MappingTarget User user,
             UserUpdateRequest userUpdateRequest
     );
diff --git a/identity-service/src/main/java/com/codecampus/identity/mapper/kafka/UserPayloadMapper.java b/identity-service/src/main/java/com/codecampus/identity/mapper/kafka/UserPayloadMapper.java
@@ -1,8 +1,10 @@
 package com.codecampus.identity.mapper.kafka;
 
+import com.codecampus.identity.dto.request.authentication.UserCreationRequest;
 import com.codecampus.identity.entity.account.Role;
 import com.codecampus.identity.entity.account.User;
 import events.user.data.UserPayload;
+import events.user.data.UserProfileCreationPayload;
 import org.mapstruct.Mapper;
 
 import java.time.Instant;
@@ -11,6 +13,9 @@
 @Mapper(componentModel = "spring")
 public interface UserPayloadMapper {
 
+    UserProfileCreationPayload toUserProfileCreationPayloadFromUserCreationRequest(
+            UserCreationRequest userCreationRequest);
+
     default UserPayload toUserPayloadFromUser(User user) {
         return UserPayload.builder()
                 .userId(user.getId())
diff --git a/identity-service/src/main/java/com/codecampus/identity/service/account/UserService.java b/identity-service/src/main/java/com/codecampus/identity/service/account/UserService.java
@@ -13,11 +13,13 @@
 import com.codecampus.identity.helper.ProfileSyncHelper;
 import com.codecampus.identity.mapper.authentication.UserMapper;
 import com.codecampus.identity.mapper.client.UserProfileMapper;
+import com.codecampus.identity.mapper.kafka.UserPayloadMapper;
 import com.codecampus.identity.repository.account.RoleRepository;
 import com.codecampus.identity.repository.account.UserRepository;
 import com.codecampus.identity.repository.httpclient.profile.ProfileClient;
 import com.codecampus.identity.service.authentication.OtpService;
 import com.codecampus.identity.service.kafka.UserEventProducer;
+import events.user.data.UserProfileCreationPayload;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.RequiredArgsConstructor;
@@ -63,6 +65,7 @@ public class UserService {
 
     UserMapper userMapper;
     UserProfileMapper userProfileMapper;
+    UserPayloadMapper userPayloadMapper;
 
     PasswordEncoder passwordEncoder;
     ProfileClient profileClient;
@@ -91,9 +94,8 @@ public void createUser(UserCreationRequest request) {
                 request.getEmail()
         );
 
-        User user = userMapper.toUser(request);
+        User user = userMapper.toUserFromUserCreationRequest(request);
         user.setPassword(passwordEncoder.encode(user.getPassword()));
-
         HashSet<Role> roles = new HashSet<>();
         roleRepository.findById(USER_ROLE)
                 .ifPresent(roles::add);
@@ -103,6 +105,11 @@ public void createUser(UserCreationRequest request) {
         try {
             user = userRepository.save(user);
             userEventProducer.publishCreatedUserEvent(user);
+            UserProfileCreationPayload profilePayload =
+                    userPayloadMapper.toUserProfileCreationPayloadFromUserCreationRequest(
+                            request);
+            userEventProducer.publishRegisteredUserEvent(
+                    user, profilePayload);
         } catch (DataIntegrityViolationException e) {
             throw new AppException(ErrorCode.USER_ALREADY_EXISTS);
         }
@@ -170,7 +177,7 @@ public void updateMyInfo(
     private void updateUser(
             UserUpdateRequest request,
             User user) {
-        userMapper.updateUser(user, request);
+        userMapper.updateUserUpdateRequestToUser(user, request);
         user.setPassword(passwordEncoder.encode(user.getPassword()));
 
 //    List<Role> roles = roleRepository.findAllById(request.getRoles());
@@ -197,6 +204,19 @@ public void deleteUser(String userId) {
         userEventProducer.publishDeletedUserEvent(user);
     }
 
+    @PreAuthorize("hasRole('ADMIN')")
+    @Transactional
+    public void restoreUser(String userId) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new AppException(ErrorCode.USER_NOT_FOUND));
+        if (user.getDeletedAt() != null) {
+            user.setDeletedAt(null);
+            user.setDeletedBy(null);
+            userRepository.save(user);
+            userEventProducer.publishRestoredUserEvent(user);
+        }
+    }
+
     /**
      * Lấy danh sách người dùng với phân trang.
      *
@@ -212,7 +232,7 @@ public PageResponse<UserResponse> getUsers(
         Pageable pageable = PageRequest.of(page - 1, size);
         Page<UserResponse> pageData = userRepository
                 .findAll(pageable)
-                .map(userMapper::toUserResponse);
+                .map(userMapper::toUserResponseFromUser);
 
         return toPageResponse(pageData, page);
     }
@@ -225,7 +245,7 @@ public PageResponse<UserResponse> getUsers(
      * @throws AppException nếu không tìm thấy
      */
     public UserResponse getUser(String userId) {
-        return userMapper.toUserResponse(
+        return userMapper.toUserResponseFromUser(
                 userRepository.findById(userId)
                         .orElseThrow(() -> new AppException(
                                 ErrorCode.USER_NOT_FOUND))
diff --git a/identity-service/src/main/java/com/codecampus/identity/service/authentication/AuthenticationService.java b/identity-service/src/main/java/com/codecampus/identity/service/authentication/AuthenticationService.java
@@ -16,8 +16,8 @@
 import com.codecampus.identity.exception.AppException;
 import com.codecampus.identity.exception.ErrorCode;
 import com.codecampus.identity.helper.AuthenticationHelper;
-import com.codecampus.identity.helper.ProfileSyncHelper;
 import com.codecampus.identity.mapper.authentication.UserMapper;
+import com.codecampus.identity.mapper.kafka.UserPayloadMapper;
 import com.codecampus.identity.repository.account.InvalidatedTokenRepository;
 import com.codecampus.identity.repository.account.RoleRepository;
 import com.codecampus.identity.repository.account.UserRepository;
@@ -34,6 +34,7 @@
 import com.nimbusds.jose.crypto.MACVerifier;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
+import events.user.data.UserProfileCreationPayload;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
@@ -85,13 +86,13 @@ public class AuthenticationService {
     OtpService otpService;
 
     UserMapper userMapper;
+    UserPayloadMapper userPayloadMapper;
 
     PasswordEncoder passwordEncoder;
 
     OutboundGoogleIdentityClient outboundGoogleIdentityClient;
     OutboundGoogleUserClient outboundGoogleUserClient;
     AuthenticationHelper authenticationHelper;
-    ProfileSyncHelper profileSyncHelper;
     UserEventProducer userEventProducer;
 
     @NonFinal
@@ -192,6 +193,11 @@ public AuthenticationResponse outboundGoogleLogin(
                                             .build();
 
                             userEventProducer.publishCreatedUserEvent(newUser);
+                            UserProfileCreationPayload profilePayload =
+                                    userPayloadMapper.toUserProfileCreationPayloadFromUserCreationRequest(
+                                            googleRequest);
+                            userEventProducer.publishRegisteredUserEvent(newUser,
+                                    profilePayload);
                             return newUser;
                         }
                 );
@@ -267,18 +273,22 @@ public void register(UserCreationRequest request) {
         );
 
         // Tạo user nhưng chưa kích hoạt
-        User user = userMapper.toUser(request);
+        User user = userMapper.toUserFromUserCreationRequest(request);
         user.setPassword(passwordEncoder.encode(user.getPassword()));
         user.setEnabled(false); // Chưa kích hoạt
-
-        // Gán role mặc định
-        HashSet<Role> roles = new HashSet<>();
-        roleRepository.findById(USER_ROLE).ifPresent(roles::add);
-        user.setRoles(roles);
+        user.setRoles(new HashSet<>());
+        roleRepository.findById(USER_ROLE)
+                .ifPresent(r -> user.getRoles().add(r));
 
         try {
             userRepository.save(user);
-            profileSyncHelper.createProfile(user, request);
+            // Sự kiện định danh
+            userEventProducer.publishCreatedUserEvent(user);
+            // Sự kiện khởi tạo profile giàu dữ liệu
+            var profilePayload =
+                    userPayloadMapper.toUserProfileCreationPayloadFromUserCreationRequest(
+                            request);
+            userEventProducer.publishRegisteredUserEvent(user, profilePayload);
         } catch (DataIntegrityViolationException e) {
             throw new AppException(ErrorCode.USER_ALREADY_EXISTS);
         }
diff --git a/identity-service/src/main/java/com/codecampus/identity/service/kafka/UserEventProducer.java b/identity-service/src/main/java/com/codecampus/identity/service/kafka/UserEventProducer.java
@@ -5,6 +5,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import events.user.UserEvent;
+import events.user.UserRegisteredEvent;
+import events.user.data.UserProfileCreationPayload;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
@@ -20,14 +22,17 @@
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class UserEventProducer {
 
-    @Value("${app.event.user-events}")
-    @NonFinal
-    static String USER_EVENTS_TOPIC;
-
     KafkaTemplate<String, String> kafkaTemplate;
     ObjectMapper objectMapper;
     UserPayloadMapper userPayloadMapper;
 
+    @NonFinal
+    @Value("${app.event.user-registrations}")
+    String USER_REGISTRATIONS_TOPIC;
+    @Value("${app.event.user-events}")
+    @NonFinal
+    String USER_EVENTS_TOPIC;
+
     public void publishCreatedUserEvent(
             User user) {
         publishEvent(UserEvent.Type.CREATED, user);
@@ -41,6 +46,10 @@ public void publishDeletedUserEvent(User user) {
         publishEvent(UserEvent.Type.DELETED, user);
     }
 
+    public void publishRestoredUserEvent(User user) {
+        publishEvent(UserEvent.Type.RESTORED, user);
+    }
+
     void publishEvent(
             UserEvent.Type type,
             User user) {
@@ -52,13 +61,38 @@ void publishEvent(
                         user))
                 .build();
 
+        sendEvent(USER_EVENTS_TOPIC,
+                user.getId(),
+                userEvent
+        );
+    }
+
+    public void publishRegisteredUserEvent(
+            User user,
+            UserProfileCreationPayload profilePayload) {
+        UserRegisteredEvent userRegisteredEvent = UserRegisteredEvent.builder()
+                .id(user.getId())
+                .user(userPayloadMapper.toUserPayloadFromUser(user))
+                .profile(profilePayload)
+                .build();
+
+        sendEvent(USER_REGISTRATIONS_TOPIC,
+                user.getId(),
+                userRegisteredEvent
+        );
+    }
+
+    private void sendEvent(
+            String topic,
+            String key,
+            Object event) {
         try {
             String jsonObject = objectMapper.writeValueAsString(
-                    userEvent);
+                    event);
 
             kafkaTemplate.send(
-                    USER_EVENTS_TOPIC,
-                    user.getId(),
+                    topic,
+                    key,
                     jsonObject);
         } catch (JsonProcessingException exception) {
             log.error("[Kafka] Serialize thất bại", exception);
diff --git a/identity-service/src/main/resources/application.yml b/identity-service/src/main/resources/application.yml
@@ -65,4 +65,5 @@ app:
     redirect-uri: "http://localhost:4200/auth/identity/authenticate"
   event:
     user-events: "user-events"
+    user-registrations: "user-registrations"
 
diff --git a/profile-service/src/main/java/com/codecampus/profile/service/kafka/UserEventListener.java b/profile-service/src/main/java/com/codecampus/profile/service/kafka/UserEventListener.java
@@ -25,7 +25,7 @@ public class UserEventListener {
     UserProfileRepository userProfileRepository;
     ObjectMapper objectMapper;
 
-    @KafkaListener(topics = "user-events",
+    @KafkaListener(topics = "${app.event.user-events}",
             groupId = "profile-service"
     )
     public void onMessageUser(String raw) {
diff --git a/profile-service/src/main/java/com/codecampus/profile/service/kafka/UserRegistrationListener.java b/profile-service/src/main/java/com/codecampus/profile/service/kafka/UserRegistrationListener.java

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class UserEventListener {`
`25`	`25`	`UserProfileRepository userProfileRepository;`
`26`	`26`	`ObjectMapper objectMapper;`
`27`	`27`
`28`		`- @KafkaListener(topics = "user-events",`
	`28`	`+ @KafkaListener(topics = "${app.event.user-events}",`
`29`	`29`	`groupId = "profile-service"`
`30`	`30`	`)`
`31`	`31`	`public void onMessageUser(String raw) {`