Update Org

Author: yunomix2834

org-service/src/main/java/com/codecampus/organization/mapper/OrganizationMapper.java

@@ -28,6 +28,7 @@ default OrganizationPayload toOrganizationPayloadFromOrganization(
     return OrganizationPayload.builder()
         .name(organization.getName())
         .description(organization.getDescription())
+        .ownerId(organization.getOwnerId())
         .logoUrl(organization.getLogoUrl())
         .email(organization.getEmail())
         .phone(organization.getPhone())
@@ -43,6 +44,7 @@ default OrganizationResponse toOrganizationResponseFromOrganization(
         .id(o.getId())
         .name(o.getName())
         .description(o.getDescription())
+        .ownerId(o.getOwnerId())
         .logoUrl(o.getLogoUrl())
         .email(o.getEmail())
         .phone(o.getPhone())

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

@@ -58,11 +58,7 @@ public void create(
 
     o = organizationRepository.save(o);
 
-    String creatorUserId = AuthenticationHelper.getMyUserId();
-    if (creatorUserId != null && !creatorUserId.isBlank()) {
-      // mặc định role=Admin, active=true
-      membershipService.addCreatorToOrg(creatorUserId, o.getId());
-    }
+    membershipService.addCreatorToOrg(userId, o.getId());
 
     // publish CREATED
     OrganizationPayload payload =

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

@@ -206,7 +206,7 @@ BoolQuery.Builder buildQuery(
       bv.should(s -> s.term(t -> t.field("visibility").value(true)));
       if (viewerOrgId != null) {
         bv.should(s -> s.terms(ts -> ts.field("orgId").terms(tv -> tv.value(
-            java.util.List.of(FieldValue.of(viewerOrgId))
+            List.of(FieldValue.of(viewerOrgId))
         ))));
       }
       return bv;