Update Org

Author: yunomix2834

org-service/src/main/java/com/codecampus/organization/repository/OrganizationMemberRepository.java

@@ -68,21 +68,27 @@ Page<OrganizationMember> findByScopeTypeAndScopeIdAndIsActiveIsTrue(
 
   // Đếm số membership ACTIVE cấp Organization của user
   @Query("""
-      select count(m) from OrganizationMember m, Organization o
+      select count(m) from OrganizationMember m
        where m.userId = :userId
          and m.scopeType = com.codecampus.constant.ScopeType.Organization
          and m.isActive = true
-         and o.id = m.scopeId
+         and exists (
+           select 1 from Organization o
+            where o.id = m.scopeId
+         )
       """)
   long countActiveOrganizations(@Param("userId") String userId);
 
   // Lấy tất cả membership ACTIVE của user ở cấp Organization
   @Query("""
-      select m from OrganizationMember m, Organization o
+      select m from OrganizationMember m
        where m.userId = :userId
          and m.scopeType = com.codecampus.constant.ScopeType.Organization
          and m.isActive = true
-         and o.id = m.scopeId
+         and exists (
+           select 1 from Organization o
+            where o.id = m.scopeId
+         )
       """)
   List<OrganizationMember> findActiveOrgsOfUser(@Param("userId") String userId);
 

org-service/src/main/java/com/codecampus/organization/service/MembershipService.java

@@ -16,6 +16,7 @@
 import com.codecampus.organization.helper.PageResponseHelper;
 import com.codecampus.organization.repository.OrganizationBlockRepository;
 import com.codecampus.organization.repository.OrganizationMemberRepository;
+import com.codecampus.organization.repository.OrganizationRepository;
 import com.codecampus.organization.service.cache.UserBulkLoader;
 import com.codecampus.organization.service.cache.UserSummaryCacheService;
 import com.codecampus.organization.service.kafka.OrganizationMemberEventProducer;
@@ -52,6 +53,7 @@
 public class MembershipService {
   OrganizationMemberRepository memberRepository;
   OrganizationBlockRepository blockRepository;
+  OrganizationRepository organizationRepository;
   OrganizationMemberEventProducer eventProducer;
   OrganizationMemberHelper organizationMemberHelper;
   UserBulkLoader userBulkLoader;
@@ -378,27 +380,32 @@ public void leaveBlock(String blockId) {
   }
 
   public PrimaryOrgResponse getPrimaryOrg(String userId) {
-    return memberRepository
+    var primaryOpt = memberRepository
         .findFirstByUserIdAndScopeTypeAndIsActiveIsTrueAndIsPrimaryIsTrueOrderByCreatedAtAsc(
-            userId, ScopeType.Organization)
-        .map(m -> PrimaryOrgResponse.builder()
+            userId, ScopeType.Organization);
+
+    if (primaryOpt.isPresent()
+        && organizationRepository.existsById(primaryOpt.get().getScopeId())) {
+      var m = primaryOpt.get();
+      return PrimaryOrgResponse.builder()
+          .organizationId(m.getScopeId())
+          .role(m.getRole())
+          .build();
+    }
+
+    // fallback: lấy org active đầu tiên NHƯNG còn tồn tại
+    var list = memberRepository
+        .findByUserIdAndScopeTypeAndIsActiveIsTrue(userId,
+            ScopeType.Organization);
+    for (var m : list) {
+      if (organizationRepository.existsById(m.getScopeId())) {
+        return PrimaryOrgResponse.builder()
             .organizationId(m.getScopeId())
             .role(m.getRole())
-            .build())
-        .orElseGet(() -> {
-          // fallback: lấy org active đầu tiên nếu chưa có primary
-          List<OrganizationMember> list = memberRepository
-              .findByUserIdAndScopeTypeAndIsActiveIsTrue(userId,
-                  ScopeType.Organization);
-          if (list.isEmpty()) {
-            return null;
-          }
-          OrganizationMember m = list.getFirst();
-          return PrimaryOrgResponse.builder()
-              .organizationId(m.getScopeId())
-              .role(m.getRole())
-              .build();
-        });
+            .build();
+      }
+    }
+    return null;
   }
 
   public PageResponse<MemberInBlockWithMemberResponse> listUnassignedMembers(
@@ -555,9 +562,21 @@ public BlocksOfUserWithMemberResponse listActiveBlocksOfUser(
       String userId) {
     var list = memberRepository
         .findByUserIdAndScopeTypeAndIsActiveIsTrue(userId, ScopeType.Grade);
+
+    var rawIds = list.stream().map(OrganizationMember::getScopeId)
+        .collect(Collectors.toSet());
+
+    // chỉ giữ block còn tồn tại (OrganizationBlock có @Where deleted_at IS NULL)
+    var aliveBlocks = blockRepository.findAllById(rawIds);
+    var aliveIds = aliveBlocks.stream().map(OrganizationBlock::getId)
+        .collect(java.util.stream.Collectors.toSet());
+
     return BlocksOfUserWithMemberResponse.builder()
         .user(userSummaryCacheService.getOrLoad(userId))
-        .blockIds(list.stream().map(OrganizationMember::getScopeId).toList())
+        .blockIds(list.stream()
+            .map(OrganizationMember::getScopeId)
+            .filter(aliveIds::contains)
+            .toList())
         .build();
   }
 }

org-service/src/main/java/com/codecampus/organization/service/OrganizationService.java

@@ -1,5 +1,6 @@
 package com.codecampus.organization.service;
 
+import com.codecampus.constant.ScopeType;
 import com.codecampus.organization.dto.common.PageResponse;
 import com.codecampus.organization.dto.request.CreateOrganizationForm;
 import com.codecampus.organization.dto.request.UpdateOrganizationForm;
@@ -12,6 +13,8 @@
 import com.codecampus.organization.helper.OrganizationHelper;
 import com.codecampus.organization.helper.PageResponseHelper;
 import com.codecampus.organization.mapper.OrganizationMapper;
+import com.codecampus.organization.repository.OrganizationBlockRepository;
+import com.codecampus.organization.repository.OrganizationMemberRepository;
 import com.codecampus.organization.repository.OrganizationRepository;
 import com.codecampus.organization.service.kafka.OrganizationEventProducer;
 import events.org.data.OrganizationPayload;
@@ -31,6 +34,8 @@
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class OrganizationService {
   OrganizationRepository organizationRepository;
+  OrganizationBlockRepository blockRepository;
+  OrganizationMemberRepository memberRepository;
   MembershipService membershipService;
   BlockService blockService;
   OrganizationMapper organizationMapper;
@@ -91,11 +96,35 @@ public void update(
   public void delete(String id) {
     String deletedBy = AuthenticationHelper.getMyUsername();
     Organization o = organizationRepository.findById(id)
-        .orElseThrow(
-            () -> new AppException(ErrorCode.ORGANIZATION_NOT_FOUND));
+        .orElseThrow(() -> new AppException(ErrorCode.ORGANIZATION_NOT_FOUND));
+
+    // Soft-delete organization
     o.markDeleted(deletedBy);
     organizationRepository.save(o);
 
+    // 1) Soft-delete memberships cấp Organization
+    var orgMembers = memberRepository.findByScopeTypeAndScopeId(
+        ScopeType.Organization, id);
+    for (var m : orgMembers) {
+      m.setActive(false);
+      m.setPrimary(false);
+      m.markDeleted(deletedBy);
+    }
+    memberRepository.saveAll(orgMembers);
+
+    // 2) Soft-delete memberships cấp Block thuộc org
+    var blockIds = blockRepository.findBlockIdsOfOrg(id);
+    for (String bid : blockIds) {
+      var blockMembers = memberRepository.findByScopeTypeAndScopeId(
+          ScopeType.Grade, bid);
+      for (var m : blockMembers) {
+        m.setActive(false);
+        m.markDeleted(deletedBy);
+      }
+      memberRepository.saveAll(blockMembers);
+    }
+
+    // publish DELETED event như cũ
     eventProducer.publishDeleted(o.getId());
   }
 

search-service/src/main/java/com/codecampus/search/service/OrganizationSearchService.java

@@ -81,6 +81,7 @@ public PageResponse<OrganizationSearchResponse> search(
               .id(doc.getId())
               .name(doc.getName())
               .description(doc.getDescription())
+              .ownerId(doc.getOwnerId())
               .logoUrl(doc.getLogoUrl())
               .email(doc.getEmail())
               .phone(doc.getPhone())