Update Query

Author: yunomix2834

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

@@ -15,7 +15,7 @@
 public interface OrganizationMemberRepository
     extends JpaRepository<OrganizationMember, String> {
   @Query(value = """
-      select m.* 
+      select m.*
       from organization_members m
       join organizations o on o.id = m.scope_id
       where m.user_id   = :userId
@@ -29,12 +29,12 @@ public interface OrganizationMemberRepository
       """, nativeQuery = true)
   Optional<OrganizationMember> findFirstByUserIdAndScopeTypeAndIsActiveIsTrueAndIsPrimaryIsTrueOrderByCreatedAtAsc(
       @Param("userId") String userId,
-      @Param("scopeType") ScopeType scopeType
+      @Param("scopeType") String scopeType
   );
 
 
   @Query(value = """
-      select m.* 
+      select m.*
       from organization_members m
       join organizations o on o.id = m.scope_id
       where m.user_id   = :userId
@@ -46,7 +46,7 @@ Optional<OrganizationMember> findFirstByUserIdAndScopeTypeAndIsActiveIsTrueAndIs
       """, nativeQuery = true)
   List<OrganizationMember> findByUserIdAndScopeTypeAndIsActiveIsTrue(
       @Param("userId") String userId,
-      @Param("scopeType") ScopeType scopeType
+      @Param("scopeType") String scopeType
   );
 
   List<OrganizationMember> findByScopeTypeAndScopeIdAndIsActiveIsTrue(
@@ -72,9 +72,10 @@ select count(m) from OrganizationMember m
        where m.userId = :userId
          and m.scopeType = com.codecampus.constant.ScopeType.Organization
          and m.isActive = true
+         and m.deletedAt is null
          and exists (
            select 1 from Organization o
-            where o.id = m.scopeId
+           where o.id = m.scopeId and o.deletedAt is null
          )
       """)
   long countActiveOrganizations(@Param("userId") String userId);
@@ -85,9 +86,10 @@ and exists (
        where m.userId = :userId
          and m.scopeType = com.codecampus.constant.ScopeType.Organization
          and m.isActive = true
+         and m.deletedAt is null
          and exists (
            select 1 from Organization o
-            where o.id = m.scopeId
+           where o.id = m.scopeId and o.deletedAt is null
          )
       """)
   List<OrganizationMember> findActiveOrgsOfUser(@Param("userId") String userId);

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

@@ -382,7 +382,7 @@ public void leaveBlock(String blockId) {
   public PrimaryOrgResponse getPrimaryOrg(String userId) {
     var primaryOpt = memberRepository
         .findFirstByUserIdAndScopeTypeAndIsActiveIsTrueAndIsPrimaryIsTrueOrderByCreatedAtAsc(
-            userId, ScopeType.Organization);
+            userId, ScopeType.Organization.name());
 
     if (primaryOpt.isPresent()
         && organizationRepository.existsById(primaryOpt.get().getScopeId())) {
@@ -396,7 +396,7 @@ public PrimaryOrgResponse getPrimaryOrg(String userId) {
     // fallback: lấy org active đầu tiên NHƯNG còn tồn tại
     var list = memberRepository
         .findByUserIdAndScopeTypeAndIsActiveIsTrue(userId,
-            ScopeType.Organization);
+            ScopeType.Organization.name());
     for (var m : list) {
       if (organizationRepository.existsById(m.getScopeId())) {
         return PrimaryOrgResponse.builder()
@@ -561,7 +561,8 @@ public void bulkAddToBlock(String blockId, BulkAddMembersRequest req) {
   public BlocksOfUserWithMemberResponse listActiveBlocksOfUser(
       String userId) {
     var list = memberRepository
-        .findByUserIdAndScopeTypeAndIsActiveIsTrue(userId, ScopeType.Grade);
+        .findByUserIdAndScopeTypeAndIsActiveIsTrue(userId,
+            ScopeType.Grade.name());
 
     var rawIds = list.stream().map(OrganizationMember::getScopeId)
         .collect(Collectors.toSet());