Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public enum SuccessCode implements BaseCode {
USER_PROFILE_IMAGE_UPDATE_SUCCESS(HttpStatus.OK, "USER_2007", "프로필 사진 이미지 업로드가 완료 되었습니다."),
USER_MYPAGE_VIEW_SUCCESS(HttpStatus.OK, "USER_2010", "마이페이지 정보 조회가 완료되었습니다."),

// MatchRequest
MATCH_REQUEST_SUCCESS(HttpStatus.OK, "MATCH_REQUEST_2001", "매치 신청이 완료되었습니다."),
;

private final HttpStatus httpStatus;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.example.silverbridgeX_user.matching.controller;

import com.example.silverbridgeX_user.global.api_payload.ApiResponse;
import com.example.silverbridgeX_user.global.api_payload.SuccessCode;
import com.example.silverbridgeX_user.matching.service.MatchingService;
import com.example.silverbridgeX_user.user.domain.User;
import com.example.silverbridgeX_user.user.jwt.CustomUserDetails;
import com.example.silverbridgeX_user.user.service.UserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequiredArgsConstructor
@Validated
@RequestMapping("/match/requests")
public class MatchingController {

private final UserService userService;
private final MatchingService matchingService;

@Operation(summary = "매치 신청", description = "매치를 신청받는 메서드입니다.")
@ApiResponses(value = {
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "MATCH_REQUEST_2001", description = "매치 신청이 완료되었습니다.")
})
@PostMapping("")
public ApiResponse<Boolean> matchRequest(
@AuthenticationPrincipal CustomUserDetails customUserDetails
) {
User user = userService.findByUserName(customUserDetails.getUsername());

matchingService.saveMatchRequest(user);

return ApiResponse.onSuccess(SuccessCode.MATCH_REQUEST_SUCCESS, true);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.example.silverbridgeX_user.matching.converter;

import com.example.silverbridgeX_user.matching.domain.MatchRequest;
import com.example.silverbridgeX_user.matching.domain.MatchStatus;
import com.example.silverbridgeX_user.user.domain.User;

public class MatchingConverter {

public static MatchRequest toMatchRequest(User user) {
return MatchRequest.builder()
.status(MatchStatus.WAITING)
.user(user)
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.example.silverbridgeX_user.matching.domain;

import com.example.silverbridgeX_user.global.entity.BaseEntity;
import com.example.silverbridgeX_user.user.domain.User;
import jakarta.persistence.*;
import lombok.*;

@Entity
@Getter
@Builder
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
@Table(name = "match_request")
public class MatchRequest extends BaseEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Enumerated(EnumType.STRING)
private MatchStatus status;

@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
private User user;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.example.silverbridgeX_user.matching.domain;

public enum MatchStatus {
WAITING,
MATCHED
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.example.silverbridgeX_user.matching.repository;

import com.example.silverbridgeX_user.matching.domain.MatchRequest;
import org.springframework.data.jpa.repository.JpaRepository;

public interface MatchingRepository extends JpaRepository<MatchRequest, Long> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.example.silverbridgeX_user.matching.service;

import com.example.silverbridgeX_user.matching.converter.MatchingConverter;
import com.example.silverbridgeX_user.matching.domain.MatchRequest;
import com.example.silverbridgeX_user.matching.repository.MatchingRepository;
import com.example.silverbridgeX_user.user.domain.User;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class MatchingService {

private final MatchingRepository matchingRepository;

@Transactional
public void saveMatchRequest(User user) {
MatchRequest matchRequest = MatchingConverter.toMatchRequest(user);

matchingRepository.save(matchRequest);
}
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
package com.example.silverbridgeX_user.user.domain;

import com.example.silverbridgeX_user.global.entity.BaseEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import com.example.silverbridgeX_user.matching.domain.MatchRequest;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.regex.MatchResult;

@Entity
@Getter
@Builder
Expand Down Expand Up @@ -41,8 +39,13 @@ public class User extends BaseEntity {

private String latitude;

private String longitude;

private String profileImage;

@OneToOne(mappedBy = "user", cascade = CascadeType.ALL)
private MatchRequest matchRequest;

public User(String username, String nickname, String email) {
this.username = username;
this.nickname = nickname;
Expand Down