Merge pull request #298 from 6QuizOnTheBlock/be/feat/#294-makeRelatio…

…nship Be/feat/#294 make relationship
6QuizOnTheBlock · May 12, 2024 · 07dcb15 · 07dcb15
2 parents 92615b5 + 3b68050
commit 07dcb15
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/backEnd/src/main/java/com/quiz/ourclass/domain/organization/entity/Relationship.java b/backEnd/src/main/java/com/quiz/ourclass/domain/organization/entity/Relationship.java
@@ -7,9 +7,15 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @Entity
 public class Relationship {
 

diff --git a/...n/java/com/quiz/ourclass/domain/organization/repository/MemberOrganizationRepository.java b/...n/java/com/quiz/ourclass/domain/organization/repository/MemberOrganizationRepository.java
@@ -12,6 +12,8 @@ public interface MemberOrganizationRepository extends JpaRepository<MemberOrgani
 
     List<MemberOrganization> findByMember(Member member);
 
+    List<MemberOrganization> findByOrganization(Organization organization);
+
     Optional<MemberOrganization> findByMemberIdAndOrganizationId(Long memberId,
         Long organizationId);
 

diff --git a/...End/src/main/java/com/quiz/ourclass/domain/organization/service/MemberOrgServiceImpl.java b/...End/src/main/java/com/quiz/ourclass/domain/organization/service/MemberOrgServiceImpl.java
@@ -134,7 +134,7 @@ public int tagGreeting(TagGreetingRequest tagGreetingRequest) {
         Member loginMember = accessUtil.getMember()
             .orElseThrow(() -> new GlobalException(ErrorCode.MEMBER_NOT_FOUND));
         long member1 = Math.min(loginMember.getId(), tagGreetingRequest.memberId());
-        long member2 = Math.min(tagGreetingRequest.memberId(), loginMember.getId());
+        long member2 = Math.max(loginMember.getId(), tagGreetingRequest.memberId());
         Relationship relationship = relationshipRepository.findByOrganizationIdAndMember1IdAndMember2Id(
                 tagGreetingRequest.organizationId(), member1, member2)
             .orElseThrow(() -> new GlobalException(ErrorCode.RELATION_NOT_FOUND));

diff --git a/.../src/main/java/com/quiz/ourclass/domain/organization/service/OrganizationServiceImpl.java b/.../src/main/java/com/quiz/ourclass/domain/organization/service/OrganizationServiceImpl.java
@@ -15,9 +15,11 @@
 import com.quiz.ourclass.domain.organization.dto.response.UpdateOrganizationResponse;
 import com.quiz.ourclass.domain.organization.entity.MemberOrganization;
 import com.quiz.ourclass.domain.organization.entity.Organization;
+import com.quiz.ourclass.domain.organization.entity.Relationship;
 import com.quiz.ourclass.domain.organization.mapper.OrganizationMapper;
 import com.quiz.ourclass.domain.organization.repository.MemberOrganizationRepository;
 import com.quiz.ourclass.domain.organization.repository.OrganizationRepository;
+import com.quiz.ourclass.domain.organization.repository.RelationshipRepository;
 import com.quiz.ourclass.global.dto.MemberSimpleDTO;
 import com.quiz.ourclass.global.exception.ErrorCode;
 import com.quiz.ourclass.global.exception.GlobalException;
@@ -41,6 +43,7 @@ public class OrganizationServiceImpl implements OrganizationService {
     private final OrganizationRepository organizationRepository;
     private final MemberOrganizationRepository memberOrganizationRepository;
     private final PostRepository postRepository;
+    private final RelationshipRepository relationshipRepository;
     private final OrganizationMapper organizationMapper;
     private final MemberMapper memberMapper;
     private final RedisUtil redisUtil;
@@ -128,9 +131,30 @@ public Long joinOrganization(long id, InviteCodeDTO inviteCodeDTO) {
             .organization(organization)
             .build();
         memberOrganizationRepository.save(memberOrganization);
+        makeRelationships(organization, member);
         return organization.getId();
     }
 
+    private void makeRelationships(Organization organization, Member member) {
+        List<MemberOrganization> orgMembers = memberOrganizationRepository.findByOrganization(
+            organization);
+        for (MemberOrganization orgMember : orgMembers) {
+            if (orgMember.getMember().equals(member)) {
+                continue;
+            }
+            Member member1 =
+                member.getId() < orgMember.getMember().getId() ? member : orgMember.getMember();
+            Member member2 =
+                member.getId() > orgMember.getMember().getId() ? member : orgMember.getMember();
+            Relationship relationship = Relationship.builder()
+                .organization(organization)
+                .member1(member1)
+                .member2(member2)
+                .build();
+            relationshipRepository.save(relationship);
+        }
+    }
+
     @Override
     public List<MemberSimpleDTO> getOrganizationMembers(long id) {
         Organization organization = organizationRepository.findById(id)