Merge branch 'dev' of https://github.com/TranHoan2004/LabVerse into feat/create-login-web

Author: HieuDMHE181908

services/AccountService/pom.xml

@@ -81,6 +81,12 @@
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
 
+        <!-- OpenFeign Client -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
         <!-- Validation -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

services/AccountService/src/main/java/com/se1853_jv/AccountServiceApplication.java

@@ -3,9 +3,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
 @EnableDiscoveryClient
+@EnableFeignClients
 public class AccountServiceApplication {
 
     public static void main(String[] args) {

services/AccountService/src/main/java/com/se1853_jv/service/GroupServiceClient.java

@@ -0,0 +1,13 @@
+package com.se1853_jv.service;
+
+import com.se1853_jv.dto.response.WrapperApiResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(name = "GROUP-SERVICE", path = "/v1/api/collections")
+public interface GroupServiceClient {
+    
+    @GetMapping("/internal/statistics")
+    WrapperApiResponse getCollectionStatistics();
+}
+

services/AccountService/src/main/java/com/se1853_jv/service/PaperServiceClient.java

@@ -0,0 +1,13 @@
+package com.se1853_jv.service;
+
+import com.se1853_jv.dto.response.WrapperApiResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(name = "PAPER-SERVICE", path = "/v1/api")
+public interface PaperServiceClient {
+    
+    @GetMapping("/internal/api/papers/statistics")
+    WrapperApiResponse getPaperStatistics();
+}
+

services/AccountService/src/main/java/com/se1853_jv/service/impl/AdminServiceImpl.java

@@ -14,31 +14,46 @@
 import com.se1853_jv.repository.TeamRepository;
 import com.se1853_jv.repository.UserRepository;
 import com.se1853_jv.service.AdminService;
+import com.se1853_jv.service.GroupServiceClient;
+import com.se1853_jv.service.PaperServiceClient;
 import com.se1853_jv.util.IdEncoder;
+import feign.FeignException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Map;
+
 @Service
 public class AdminServiceImpl implements AdminService {
+    
+    private static final Logger log = LoggerFactory.getLogger(AdminServiceImpl.class);
 
     private final UserRepository userRepository;
     private final RoleRepository roleRepository;
     private final TeamRepository teamRepository;
     private final TeamMemberRepository teamMemberRepository;
+    private final PaperServiceClient paperServiceClient;
+    private final GroupServiceClient groupServiceClient;
 
     @Autowired
     public AdminServiceImpl(UserRepository userRepository,
                            RoleRepository roleRepository,
                            TeamRepository teamRepository,
-                           TeamMemberRepository teamMemberRepository) {
+                           TeamMemberRepository teamMemberRepository,
+                           PaperServiceClient paperServiceClient,
+                           GroupServiceClient groupServiceClient) {
         this.userRepository = userRepository;
         this.roleRepository = roleRepository;
         this.teamRepository = teamRepository;
         this.teamMemberRepository = teamMemberRepository;
+        this.paperServiceClient = paperServiceClient;
+        this.groupServiceClient = groupServiceClient;
     }
 
     @Override
@@ -168,10 +183,49 @@ public OverviewStatisticsResponse getOverviewStatistics() {
         Long publicTeams = teamRepository.countPublicTeams() != null ? teamRepository.countPublicTeams() : 0L;
         Long privateTeams = teamRepository.countPrivateTeams() != null ? teamRepository.countPrivateTeams() : 0L;
 
-        // Papers and collections would need to call other services
-        Long totalPapers = 0L; // TODO: Call PaperService
-        Long papersThisMonth = 0L; // TODO: Call PaperService
-        Long totalCollections = 0L; // TODO: Call GroupService
+        // Get papers statistics from PaperService
+        Long totalPapers = 0L;
+        Long papersThisMonth = 0L;
+        try {
+            var paperStatsResponse = paperServiceClient.getPaperStatistics();
+            if (paperStatsResponse != null && paperStatsResponse.getData() != null) {
+                Object data = paperStatsResponse.getData();
+                if (data instanceof Map) {
+                    Map<String, Object> statsMap = (Map<String, Object>) data;
+                    if (statsMap.get("totalPapers") instanceof Number) {
+                        totalPapers = ((Number) statsMap.get("totalPapers")).longValue();
+                    }
+                    if (statsMap.get("papersThisMonth") instanceof Number) {
+                        papersThisMonth = ((Number) statsMap.get("papersThisMonth")).longValue();
+                    }
+                }
+            }
+        } catch (FeignException e) {
+            log.error("Error calling PaperService for statistics: {}", e.getMessage());
+        } catch (Exception e) {
+            log.error("Unexpected error getting paper statistics: {}", e.getMessage(), e);
+        }
+        
+        // Get collections statistics from GroupService
+        Long totalCollections = 0L;
+        try {
+            var collectionStatsResponse = groupServiceClient.getCollectionStatistics();
+            if (collectionStatsResponse != null && collectionStatsResponse.getData() != null) {
+                Object data = collectionStatsResponse.getData();
+                if (data instanceof Map) {
+                    Map<String, Object> statsMap = (Map<String, Object>) data;
+                    if (statsMap.get("totalCollections") instanceof Number) {
+                        totalCollections = ((Number) statsMap.get("totalCollections")).longValue();
+                    }
+                }
+            }
+        } catch (FeignException e) {
+            log.error("Error calling GroupService for statistics: {}", e.getMessage());
+        } catch (Exception e) {
+            log.error("Unexpected error getting collection statistics: {}", e.getMessage(), e);
+        }
+        
+        // Reading lists would need to call ReadingService
         Long totalReadingLists = 0L; // TODO: Call ReadingService
 
         return new OverviewStatisticsResponse(

services/AccountService/src/main/resources/application.yaml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: account-service
+    name: ACCOUNT-SERVICE
   profiles:
     active: dev
   jpa:

services/GroupService/src/main/java/com/se1853_jv/controller/CollectionController.java

@@ -8,6 +8,8 @@
 import org.springframework.web.bind.annotation.*;
 import jakarta.validation.Valid;
 
+import java.util.Map;
+
 @RestController
 @RequestMapping("/collections")
 @RequiredArgsConstructor
@@ -97,4 +99,10 @@ public ResponseEntity<WrapperApiResponse> recalculatePaperStatus(
         collectionService.recalculatePaperStatus(encodedCollectionId, encodedPaperId);
         return ResponseEntity.ok(WrapperApiResponse.success("Paper status recalculated successfully"));
     }
+    
+    @GetMapping("/internal/statistics")
+    public ResponseEntity<WrapperApiResponse> getStatistics() {
+        long totalCollections = collectionService.getTotalCollectionsCount();
+        return ResponseEntity.ok(WrapperApiResponse.success(Map.of("totalCollections", totalCollections)));
+    }
 }

services/GroupService/src/main/java/com/se1853_jv/dto/response/CollectionResponse.java

@@ -12,6 +12,7 @@ public class CollectionResponse {
     private Long paperCount;
     private Long memberCount;
     private String creatorName;
+    private String creatorEmail;
     private String creatorAvatarUrl;
     private AccessLevel currentUserAccessLevel; // Access level of the current user in this collection
 

services/GroupService/src/main/java/com/se1853_jv/service/CollectionService.java

@@ -37,5 +37,11 @@ public interface CollectionService {
      * This is called after ReadingWorkflow is updated to keep collection status in sync
      */
     void recalculatePaperStatus(String encodedCollectionId, String encodedPaperId);
+    
+    /**
+     * Get total count of collections
+     * Used by admin service for statistics
+     */
+    long getTotalCollectionsCount();
 }
 

services/GroupService/src/main/java/com/se1853_jv/service/impl/CollectionServiceImpl.java

@@ -54,6 +54,47 @@ public CollectionResponse createCollection(CollectionRequest request) {
                 throw new IllegalArgumentException("User ID is required to create collection");
             }
 
+            // Verify user has PI role to create collection
+            String userId = IdEncoder.decode(request.getUserId());
+            try {
+                String encodedUserId = IdEncoder.encode(userId);
+                var userResponse = userServiceClient.getUserById(encodedUserId);
+                
+                if (userResponse == null || userResponse.getData() == null) {
+                    throw new BadRequestException("User not found");
+                }
+                
+                Object data = userResponse.getData();
+                String userRole = null;
+                
+                // Handle different response types
+                if (data instanceof Map) {
+                    Map<String, Object> userMap = (Map<String, Object>) data;
+                    userRole = (String) userMap.get("role");
+                } else {
+                    // Try to use reflection or handle as UserResponse object
+                    try {
+                        java.lang.reflect.Method getRoleMethod = data.getClass().getMethod("getRole");
+                        Object roleObj = getRoleMethod.invoke(data);
+                        userRole = roleObj != null ? roleObj.toString() : null;
+                    } catch (Exception e) {
+                        log.warn("Cannot extract role from user response: {}", e.getMessage());
+                    }
+                }
+                
+                if (userRole == null || !"PI".equalsIgnoreCase(userRole.trim())) {
+                    throw new BadRequestException("Only users with PI role can create collections");
+                }
+            } catch (BadRequestException e) {
+                throw e; // Re-throw BadRequestException as is
+            } catch (FeignException.NotFound e) {
+                log.error("User not found when creating collection: {}", userId);
+                throw new BadRequestException("User not found");
+            } catch (Exception e) {
+                log.error("Error verifying user role when creating collection: {}", e.getMessage(), e);
+                throw new BadRequestException("Unable to verify user permissions");
+            }
+
             // Kiểm tra trùng tên, nếu trùng thì thêm (1), (2)
             String baseName = request.getName().trim();
             String newName = baseName;
@@ -72,7 +113,7 @@ public CollectionResponse createCollection(CollectionRequest request) {
             Collection saved = collectionRepository.save(entity);
 
             // Automatically add creator as author (isAuthor = true)
-            String userId = IdEncoder.decode(request.getUserId());
+            // Note: userId was already decoded above for role verification
             CollectionUserId compositeId = new CollectionUserId();
             compositeId.setCollectionId(saved.getId());
             compositeId.setMemberId(userId);
@@ -461,35 +502,43 @@ private void setCreatorInfo(CollectionResponse response, String collectionId) {
                         if (data instanceof Map) {
                             Map<String, Object> userMap = (Map<String, Object>) data;
                             String fullName = (String) userMap.get("fullName");
+                            String email = (String) userMap.get("email");
                             String avatarUrl = (String) userMap.get("avatarUrl");
                             response.setCreatorName(fullName != null ? fullName : null);
+                            response.setCreatorEmail(email != null ? email : null);
                             response.setCreatorAvatarUrl(avatarUrl != null ? avatarUrl : null);
                         } else {
                             // Try to use reflection or handle as UserResponse object
                             log.warn("Unexpected user data type for creator ID {}: {}", creatorId, data.getClass().getName());
                             response.setCreatorName(null);
+                            response.setCreatorEmail(null);
                             response.setCreatorAvatarUrl(null);
                         }
                     } else {
                         response.setCreatorName(null);
+                        response.setCreatorEmail(null);
                         response.setCreatorAvatarUrl(null);
                     }
                 } catch (FeignException.NotFound e) {
                     log.warn("User not found for creator ID {}: {}", creatorId, e.getMessage());
                     response.setCreatorName(null);
+                    response.setCreatorEmail(null);
                     response.setCreatorAvatarUrl(null);
                 } catch (Exception e) {
                     log.warn("Error fetching user info for creator ID {}: {}", creatorId, e.getMessage());
                     response.setCreatorName(null);
+                    response.setCreatorEmail(null);
                     response.setCreatorAvatarUrl(null);
                 }
             } else {
                 response.setCreatorName(null);
+                response.setCreatorEmail(null);
                 response.setCreatorAvatarUrl(null);
             }
         } catch (Exception e) {
             log.warn("Error setting creator info for collection {}: {}", collectionId, e.getMessage());
             response.setCreatorName(null);
+            response.setCreatorEmail(null);
             response.setCreatorAvatarUrl(null);
         }
     }
@@ -827,6 +876,11 @@ public void recalculatePaperStatus(String encodedCollectionId, String encodedPap
         }
     }
 
+    @Override
+    public long getTotalCollectionsCount() {
+        return collectionRepository.count();
+    }
+
     private void storeToFirestore(CollectionResponse response) {
         try {
             Map<String, Object> data = new HashMap<>();