Feat/#27 조직 멤버 초대 및 수락 구현

src/main/java/com/whereyouad/WhereYouAd/domains/organization/application/dto/request/OrgRequest.java

@@ -1,5 +1,6 @@
 package com.whereyouad.WhereYouAd.domains.organization.application.dto.request;
 
+import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 
 public class OrgRequest {
@@ -22,4 +23,9 @@ public record Update (
             String logoUrl
     ) {}
 
+    public record Invite(
+            @NotBlank(message = "이메일은 필수입니다.")
+            @Email(message = "이메일 형식이 올바르지 않습니다.")
+            String email
+    ) {}
 }

src/main/java/com/whereyouad/WhereYouAd/domains/organization/application/dto/response/OrgResponse.java

@@ -68,4 +68,10 @@ public record OrgMemberDTO(
             String profileImageUrl,
             String role
     ) {}
+
+    public record OrgInvitationResponse(
+            Long orgId,
+            String message,
+            String email
+    ) {}
 }

src/main/java/com/whereyouad/WhereYouAd/domains/organization/application/mapper/OrgMemberConverter.java

@@ -5,14 +5,25 @@
 import com.whereyouad.WhereYouAd.domains.organization.persistence.entity.Organization;
 import com.whereyouad.WhereYouAd.domains.user.persistence.entity.User;
 
+import java.time.LocalDateTime;
+
 public class OrgMemberConverter {
 
     public static OrgMember toOrgMemberADMIN(User user, Organization organization) {
         return OrgMember.builder()
                 .user(user)
                 .organization(organization)
-                .joinedAt(organization.getCreatedAt()) //생성한 사람의 조직 합류 시간은 조직 생성 시간과 동일
-                .role(OrgRole.ADMIN) //생성한 사람은 ADMIN
+                .joinedAt(organization.getCreatedAt()) // 생성한 사람의 조직 합류 시간은 조직 생성 시간과 동일
+                .role(OrgRole.ADMIN) // 생성한 사람은 ADMIN
+                .build();
+    }
+
+    public static OrgMember toOrgMemberMEMBER(User user, Organization organization) {
+        return OrgMember.builder()
+                .user(user)
+                .organization(organization)
+                .joinedAt(LocalDateTime.now()) // 조직 초대 완료 시점
+                .role(OrgRole.MEMBER) // 초대된 사람은 MEMBER (default)
                 .build();
     }
 }

src/main/java/com/whereyouad/WhereYouAd/domains/organization/domain/service/OrgService.java

@@ -21,4 +21,8 @@ public interface OrgService {
 
     // orgId 조직에서 memberId에 해당하는 맴버 제거
     void removeMemberFromOrg(Long userId, Long orgId, Long memberId);
+
+    OrgResponse.OrgInvitationResponse sendOrgInvitation(Long userId, Long orgId, String email);
+
+    OrgResponse.OrgInvitationResponse acceptOrgInvitation(Long userId, String token);
 }

src/main/java/com/whereyouad/WhereYouAd/domains/organization/domain/service/OrgServiceImpl.java

@@ -12,16 +12,19 @@
 import com.whereyouad.WhereYouAd.domains.organization.persistence.entity.Organization;
 import com.whereyouad.WhereYouAd.domains.organization.persistence.repository.OrgMemberRepository;
 import com.whereyouad.WhereYouAd.domains.organization.persistence.repository.OrgRepository;
+import com.whereyouad.WhereYouAd.domains.user.domain.service.EmailService;
 import com.whereyouad.WhereYouAd.domains.user.exception.code.UserErrorCode;
 import com.whereyouad.WhereYouAd.domains.user.exception.handler.UserHandler;
 import com.whereyouad.WhereYouAd.domains.user.persistence.entity.User;
 import com.whereyouad.WhereYouAd.domains.user.persistence.repository.UserRepository;
+import com.whereyouad.WhereYouAd.global.utils.RedisUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 @Service
 @Transactional
@@ -32,6 +35,9 @@ public class OrgServiceImpl implements OrgService {
     private final OrgMemberRepository orgMemberRepository;
     private final UserRepository userRepository;
 
+    private final RedisUtil redisUtil;
+    private final EmailService emailService;
+
     // 조직(워크스페이스) 생성 메서드
     public OrgResponse.Create createOrganization(Long userId, OrgRequest.Create request) {
 
@@ -190,4 +196,77 @@ public void removeMemberFromOrg(Long userId, Long orgId, Long memberId) {
         // 5. 중간 테이블에서 해당 멤버 삭제
         orgMemberRepository.delete(targetMember);
     }
+
+    @Override
+    // 조직 초대 이메일 보내기
+    public OrgResponse.OrgInvitationResponse sendOrgInvitation(Long userId, Long orgId, String email) {
+        Organization organization = orgRepository.findById(orgId)
+                .orElseThrow(() -> new OrgHandler(OrgErrorCode.ORG_NOT_FOUND));
+
+        // 초대자와 조직 관계 검증 (초대자가 조직의 멤버인지 확인)
+        User sender = userRepository.findById(userId)
+                .orElseThrow(() -> new UserHandler(UserErrorCode.USER_NOT_FOUND));
+
+        if (!orgMemberRepository.existsByUserAndOrganization(sender, organization)) {
+            // 초대자가 조직 멤버가 아님 -> 권한 없음
+            throw new OrgHandler(OrgErrorCode.ORG_FORBIDDEN);
+        }
+
+        // 초대 완료 여부 확인, 가입 여부에 상관 없이 이메일 발송
+        userRepository.findUserByEmail(email).ifPresent(user -> {
+            if (orgMemberRepository.existsByUserAndOrganization(user, organization)) {
+                throw new OrgHandler(OrgErrorCode.ORG_MEMBER_ALREADY_ACTIVE);
+            }
+        });
+
+        // Redis key = 임의의 UUID 토큰(조직 초대 이메일 내 링크를 구별)
+        String token = UUID.randomUUID().toString();
+        // Redis value = 조직 아이디와 이메일의 조합
+        String value = orgId + ":" + email;
+        redisUtil.setDataExpire("INVITE:" + token, value, 3600 * 24L);
+
+        emailService.sendEmailForOrgInvitation(token, email, organization.getName());
+
+        return new OrgResponse.OrgInvitationResponse(orgId, "조직 멤버 초대 이메일을 전송하였습니다.", email);
+    }
+
+    @Override
+    // 조직 초대 수락 (이메일 내 링크 클릭 시)
+    public OrgResponse.OrgInvitationResponse acceptOrgInvitation(Long userId, String token) {
+        // 링크 만료 또는 유효하지 않을 시
+        if (token == null)
+            throw new OrgHandler(OrgErrorCode.ORG_INVITATION_INVALID);
+
+        // Redis 내 UUID(key)에 대한 email(value) 비교
+        String value = redisUtil.getData("INVITE:" + token);
+        if (value == null) {
+            throw new OrgHandler(OrgErrorCode.ORG_INVITATION_INVALID);
+        }
+
+        String[] valueForSplit = value.split(":");
+        String email = valueForSplit[1];
+
+        // 로그인한 사용자 검증
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new UserHandler(UserErrorCode.USER_NOT_FOUND));
+
+        // 초대된 이메일과 현재 로그인한 사용자의 이메일이 일치하는지 확인
+        if (!user.getEmail().equals(email)) {
+            throw new OrgHandler(OrgErrorCode.ORG_INVITATION_FORBIDDEN_USER);
+        }
+
+        Organization organization = orgRepository.findById(Long.parseLong(valueForSplit[0]))
+                .orElseThrow(() -> new OrgHandler(OrgErrorCode.ORG_NOT_FOUND));
+
+        // 이미 멤버인지 중복 체크
+        if (orgMemberRepository.existsByUserAndOrganization(user, organization))
+            throw new OrgHandler(OrgErrorCode.ORG_MEMBER_ALREADY_ACTIVE);
+
+        orgMemberRepository.save(OrgMemberConverter.toOrgMemberMEMBER(user, organization));
+
+        // Redis 사용 토큰 삭제
+        redisUtil.deleteData("INVITE:" + token);
+
+        return new OrgResponse.OrgInvitationResponse(organization.getId(), "조직 멤버 초대 이메일을 수락하였습니다.", email);
+    }
 }

src/main/java/com/whereyouad/WhereYouAd/domains/organization/exception/code/OrgErrorCode.java

@@ -24,9 +24,17 @@ public enum OrgErrorCode implements BaseErrorCode {
     //409
     ORG_ALREADY_ACTIVE(HttpStatus.CONFLICT, "ORG_409_1", "해당 조직은 이미 활성화 상태 입니다."),
 
-
     //410
     ORG_SOFT_DELETED(HttpStatus.GONE, "ORG_410_1", "해당 조직은 삭제된 조직입니다.(Soft Delete)"),
+
+    // 409
+    ORG_MEMBER_ALREADY_ACTIVE(HttpStatus.CONFLICT, "ORG_MEMBER_409_1", "이미 해당 조직에 초대되어있습니다."),
+
+    // 400
+    ORG_INVITATION_INVALID(HttpStatus.BAD_REQUEST, "ORG_INVITATION_400", "조직 초대 토큰이 만료되었거나 유효하지 않습니다."),
+
+    // 403
+    ORG_INVITATION_FORBIDDEN_USER(HttpStatus.FORBIDDEN, "ORG_INVITATION_403_1", "초대된 이메일과 현재 로그인한 사용자의 이메일이 일치하지 않습니다."),
     ;
 
     private final HttpStatus httpStatus;

src/main/java/com/whereyouad/WhereYouAd/domains/organization/persistence/repository/OrgMemberRepository.java

@@ -56,4 +56,6 @@ int countByOrganizationIdAndUserStatus(
             @Param("orgId") Long orgId,
             @Param("status") UserStatus status
     );
+
+        Boolean existsByUserAndOrganization(User user, Organization organization);
 }

src/main/java/com/whereyouad/WhereYouAd/domains/organization/presentation/OrgController.java

@@ -53,7 +53,6 @@ public ResponseEntity<DataResponse<OrgResponse.OrgDetail>> getOrganizationDetail
         );
     }
 
-
     @PatchMapping("/{orgId}")
     public ResponseEntity<DataResponse<OrgResponse.Update>> modifyOrganization(
             @AuthenticationPrincipal(expression = "userId") Long userId,
@@ -125,4 +124,20 @@ public ResponseEntity<DataResponse<String>> removeMember(
         orgService.removeMemberFromOrg(userId, orgId, memberId);
         return ResponseEntity.ok(DataResponse.from("해당 맴버가 조직에서 제외되었습니다."));
     }
+
+    @PostMapping("/members/{orgId}/invitation")
+    public ResponseEntity<DataResponse<OrgResponse.OrgInvitationResponse>> sendOrgInvitation(
+            @AuthenticationPrincipal(expression = "userId") Long userId, @PathVariable Long orgId,
+            @RequestBody @Valid OrgRequest.Invite request) {
+        OrgResponse.OrgInvitationResponse orgInvitationResponse = orgService.sendOrgInvitation(userId, orgId,
+                request.email());
+        return ResponseEntity.ok(DataResponse.from(orgInvitationResponse));
+    }
+
+    @PostMapping("/invitations/{token}")
+    public ResponseEntity<DataResponse<OrgResponse.OrgInvitationResponse>> acceptOrgInvitation(
+            @AuthenticationPrincipal(expression = "userId") Long userId, @PathVariable String token) {
+        OrgResponse.OrgInvitationResponse orgInvitationResponse = orgService.acceptOrgInvitation(userId, token);
+        return ResponseEntity.ok(DataResponse.from(orgInvitationResponse));
+    }
 }

src/main/java/com/whereyouad/WhereYouAd/domains/organization/presentation/docs/OrgControllerDocs.java

@@ -134,4 +134,30 @@ public ResponseEntity<DataResponse<String>> removeMember(
             @PathVariable Long orgId,
             @PathVariable Long memberId
     );
+
+    @Operation(summary = "조직 초대 이메일 발송 API", description = "조직 관리자가 이메일을 입력하여 새로운 멤버를 초대합니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "성공"),
+            @ApiResponse(responseCode = "401", description = "로그인 필요"),
+            @ApiResponse(responseCode = "403", description = "조직 멤버가 아닌 사용자의 요청"),
+            @ApiResponse(responseCode = "404", description = "조직을 찾을 수 없음"),
+            @ApiResponse(responseCode = "409", description = "이미 조직에 가입된 사용자")
+    })
+    public ResponseEntity<DataResponse<OrgResponse.OrgInvitationResponse>> sendOrgInvitation(
+            @AuthenticationPrincipal(expression = "userId") Long userId,
+            @PathVariable Long orgId,
+            @RequestBody @Valid OrgRequest.Invite request
+    );
+
+    @Operation(summary = "조직 초대 수락 API", description = "이메일로 받은 초대 토큰을 통해 조직 가입을 수락합니다. (로그인 필수, 본인 확인)")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "성공"),
+            @ApiResponse(responseCode = "400", description = "유효하지 않거나 만료된 토큰"),
+            @ApiResponse(responseCode = "401", description = "로그인 필요"),
+            @ApiResponse(responseCode = "403", description = "초대된 이메일과 로그인한 사용자가 불일치")
+    })
+    public ResponseEntity<DataResponse<OrgResponse.OrgInvitationResponse>> acceptOrgInvitation(
+            @AuthenticationPrincipal(expression = "userId") Long userId,
+            @PathVariable String token
+    );
 }