Develop backend

.github/workflows/ci-dev.yml

@@ -28,7 +28,7 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Gradle 빌드
-        run: ./gradlew clean build -x test
+        run: ./gradlew clean build
 
       - name: DockerHub 로그인
         uses: docker/login-action@v1

backend/src/main/java/mouda/backend/common/RestResponse.java

@@ -6,5 +6,6 @@
 @Getter
 @AllArgsConstructor
 public class RestResponse<T> {
+
 	private T data;
 }

backend/src/main/java/mouda/backend/config/CorsConfig.java

@@ -4,13 +4,17 @@
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+
 @Configuration
 public class CorsConfig implements WebMvcConfigurer {
+
 	@Override
 	public void addCorsMappings(CorsRegistry registry) {
 		registry.addMapping("/**")
-			.allowedOrigins("*")
-			.allowedMethods("*")
-			.allowedHeaders("*");
+			.allowedOrigins("http://localhost:8080")
+			.allowedMethods("GET", "POST", "DELETE", "OPTIONS")
+			.allowedHeaders("Authorization", "Content-Type")
+			.allowCredentials(true)
+			.maxAge(3600);
 	}
 }

backend/src/main/java/mouda/backend/config/JacksonConfig.java

@@ -0,0 +1,32 @@
+package mouda.backend.config;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+
+@Configuration
+public class JacksonConfig {
+
+	@Bean
+	public JavaTimeModule javaTimeModule() {
+		JavaTimeModule javaTimeModule = new JavaTimeModule();
+		DateTimeFormatter dateFormat = DateTimeFormatter.ISO_LOCAL_DATE;
+		DateTimeFormatter timeFormat = DateTimeFormatter.ofPattern("HH:mm");
+
+		javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(dateFormat))
+			.addSerializer(LocalTime.class, new LocalTimeSerializer(timeFormat))
+			.addDeserializer(LocalDate.class, new LocalDateDeserializer(dateFormat))
+			.addDeserializer(LocalTime.class, new LocalTimeDeserializer(timeFormat));
+
+		return javaTimeModule;
+	}
+}

backend/src/main/java/mouda/backend/exception/ErrorResponse.java

@@ -0,0 +1,6 @@
+package mouda.backend.exception;
+
+public record ErrorResponse(
+	String message
+) {
+}

backend/src/main/java/mouda/backend/exception/GlobalExceptionHandler.java

@@ -0,0 +1,21 @@
+package mouda.backend.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+@RestControllerAdvice
+public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
+
+	@ExceptionHandler(MoudaException.class)
+	public ResponseEntity<ErrorResponse> handleMoudaException(MoudaException exception) {
+		return ResponseEntity.status(exception.getHttpStatus()).body(new ErrorResponse(exception.getMessage()));
+	}
+
+	@ExceptionHandler(Exception.class)
+	public ResponseEntity<ErrorResponse> handleException() {
+		return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ErrorResponse("서버 오류가 발생했습니다."));
+	}
+}

backend/src/main/java/mouda/backend/exception/MoudaException.java

@@ -0,0 +1,14 @@
+package mouda.backend.exception;
+
+import org.springframework.http.HttpStatus;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class MoudaException extends RuntimeException {
+
+	private HttpStatus httpStatus;
+	private String message;
+}

backend/src/main/java/mouda/backend/member/domain/Member.java

@@ -0,0 +1,36 @@
+package mouda.backend.member.domain;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import mouda.backend.moim.domain.Moim;
+
+@Entity
+@Getter
+@NoArgsConstructor
+public class Member {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+	private String nickname;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	private Moim moim;
+
+	@Builder
+	public Member(String nickname) {
+		this.nickname = nickname;
+	}
+
+	public void joinMoim(Moim moim) {
+		this.moim = moim;
+	}
+}

backend/src/main/java/mouda/backend/member/repository/MemberRepository.java

@@ -0,0 +1,12 @@
+package mouda.backend.member.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import mouda.backend.member.domain.Member;
+
+public interface MemberRepository extends JpaRepository<Member, Long> {
+
+	List<Member> findAllByMoimId(long moimId);
+}

backend/src/main/java/mouda/backend/moim/controller/MoimController.java

@@ -9,9 +9,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import lombok.RequiredArgsConstructor;
 import mouda.backend.common.RestResponse;
 import mouda.backend.moim.domain.Moim;
@@ -24,54 +21,47 @@
 @RestController
 @RequestMapping("/v1/moim")
 @RequiredArgsConstructor
-public class MoimController {
+public class MoimController implements MoimSwagger {
 
 	private final MoimService moimService;
 
-	@Operation(summary = "모임 생성", description = "모임을 생성한다.")
-	@ApiResponses({
-		@ApiResponse(responseCode = "200", description = "모임 생성 성공!"),
-	})
+	@Override
 	@PostMapping
 	public ResponseEntity<RestResponse<Long>> createMoim(@RequestBody MoimCreateRequest moimCreateRequest) {
 		Moim moim = moimService.createMoim(moimCreateRequest);
+
 		return ResponseEntity.ok().body(new RestResponse<>(moim.getId()));
 	}
 
-	@Operation(summary = "모임 전체 조회", description = "모든 모임을 조회한다.")
-	@ApiResponses({
-		@ApiResponse(responseCode = "200", description = "모임 조회 성공!"),
-	})
+	@Override
 	@GetMapping
 	public ResponseEntity<RestResponse<MoimFindAllResponses>> findAllMoim() {
-		return ResponseEntity.ok().body(new RestResponse<>(moimService.findAllMoim()));
+		MoimFindAllResponses moimFindAllResponses = moimService.findAllMoim();
+
+		return ResponseEntity.ok().body(new RestResponse<>(moimFindAllResponses));
 	}
 
-	@Operation(summary = "모임 상세 조회", description = "모임 상세 조회한다.")
-	@ApiResponses({
-		@ApiResponse(responseCode = "200", description = "모임 상세 조회 성공!"),
-	})
+	@Override
 	@GetMapping("/{moimId}")
-	public ResponseEntity<RestResponse<MoimDetailsFindResponse>> findMoimDetails(@PathVariable long moimId) {
-		return ResponseEntity.ok().body(new RestResponse<>(moimService.findMoimDetails(moimId)));
+	public ResponseEntity<RestResponse<MoimDetailsFindResponse>> findMoimDetails(@PathVariable Long moimId) {
+		MoimDetailsFindResponse moimDetailsFindResponse = moimService.findMoimDetails(moimId);
+
+		return ResponseEntity.ok().body(new RestResponse<>(moimDetailsFindResponse));
 	}
 
-	@Operation(summary = "모임 참여", description = "모임에 참여한다.")
-	@ApiResponses({
-		@ApiResponse(responseCode = "200", description = "모임 참여 성공!")
-	})
+	@Override
 	@PostMapping("/join")
-	public ResponseEntity<RestResponse<Void>> joinMoim(@RequestBody MoimJoinRequest moimJoinRequest) {
+	public ResponseEntity<Void> joinMoim(@RequestBody MoimJoinRequest moimJoinRequest) {
 		moimService.joinMoim(moimJoinRequest);
+
 		return ResponseEntity.ok().build();
 	}
 
-	@Operation(summary = "모임 삭제", description = "해당하는 id의 모임을 삭제한다.")
-	@ApiResponses({
-		@ApiResponse(responseCode = "200", description = "모임 삭제 성공!"),
-	})
+	@Override
 	@DeleteMapping("/{moimId}")
-	public void deleteMoim(@PathVariable long moimId) {
+	public ResponseEntity<Void> deleteMoim(@PathVariable Long moimId) {
 		moimService.deleteMoim(moimId);
+
+		return ResponseEntity.ok().build();
 	}
 }

backend/src/main/java/mouda/backend/moim/controller/MoimSwagger.java

@@ -0,0 +1,47 @@
+package mouda.backend.moim.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import mouda.backend.common.RestResponse;
+import mouda.backend.moim.dto.request.MoimCreateRequest;
+import mouda.backend.moim.dto.request.MoimJoinRequest;
+import mouda.backend.moim.dto.response.MoimDetailsFindResponse;
+import mouda.backend.moim.dto.response.MoimFindAllResponses;
+
+public interface MoimSwagger {
+
+	@Operation(summary = "모임 생성", description = "모임을 생성한다.")
+	@ApiResponses({
+		@ApiResponse(responseCode = "200", description = "모임 생성 성공!"),
+	})
+	ResponseEntity<RestResponse<Long>> createMoim(@RequestBody MoimCreateRequest moimCreateRequest);
+
+	@Operation(summary = "모임 전체 조회", description = "모든 모임을 조회한다.")
+	@ApiResponses({
+		@ApiResponse(responseCode = "200", description = "모임 조회 성공!"),
+	})
+	ResponseEntity<RestResponse<MoimFindAllResponses>> findAllMoim();
+
+	@Operation(summary = "모임 상세 조회", description = "모임 상세 조회한다.")
+	@ApiResponses({
+		@ApiResponse(responseCode = "200", description = "모임 상세 조회 성공!"),
+	})
+	ResponseEntity<RestResponse<MoimDetailsFindResponse>> findMoimDetails(@PathVariable Long moimId);
+
+	@Operation(summary = "모임 참여", description = "모임에 참여한다.")
+	@ApiResponses({
+		@ApiResponse(responseCode = "200", description = "모임 참여 성공!")
+	})
+	ResponseEntity<Void> joinMoim(@RequestBody MoimJoinRequest moimJoinRequest);
+
+	@Operation(summary = "모임 삭제", description = "해당하는 id의 모임을 삭제한다.")
+	@ApiResponses({
+		@ApiResponse(responseCode = "200", description = "모임 삭제 성공!"),
+	})
+	ResponseEntity<Void> deleteMoim(@PathVariable Long moimId);
+}

backend/src/main/java/mouda/backend/moim/domain/Moim.java

@@ -3,21 +3,23 @@
 import java.time.LocalDate;
 import java.time.LocalTime;
 
+import org.springframework.http.HttpStatus;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import mouda.backend.moim.exception.MoimErrorMessage;
+import mouda.backend.moim.exception.MoimException;
 
 @Entity
 @Getter
-@Builder
 @NoArgsConstructor
-@AllArgsConstructor
 public class Moim {
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
@@ -30,18 +32,34 @@ public class Moim {
 
 	private String place;
 
-	private int currentPeople;
-
 	private int maxPeople;
 
 	private String authorNickname;
 
 	private String description;
 
-	public void join() {
+	@Builder
+	public Moim(
+		String title,
+		LocalDate date,
+		LocalTime time,
+		String place,
+		int maxPeople,
+		String authorNickname,
+		String description
+	) {
+		this.title = title;
+		this.date = date;
+		this.time = time;
+		this.place = place;
+		this.maxPeople = maxPeople;
+		this.authorNickname = authorNickname;
+		this.description = description;
+	}
+
+	public void validateAlreadyFullMoim(int currentPeople) {
 		if (currentPeople + 1 > maxPeople) {
-			throw new IllegalArgumentException();
+			throw new MoimException(HttpStatus.BAD_REQUEST, MoimErrorMessage.MAX_PEOPLE);
 		}
-		currentPeople++;
 	}
 }

backend/src/main/java/mouda/backend/moim/dto/request/MoimCreateRequest.java

@@ -10,10 +10,11 @@ public record MoimCreateRequest(
 	LocalDate date,
 	LocalTime time,
 	String place,
-	int maxPeople,
+	Integer maxPeople,
 	String authorNickname,
 	String description
 ) {
+
 	public Moim toEntity() {
 		return Moim.builder()
 			.title(title)

backend/src/main/java/mouda/backend/moim/dto/request/MoimJoinRequest.java

@@ -1,6 +1,7 @@
 package mouda.backend.moim.dto.request;
 
 public record MoimJoinRequest(
-	Long moimId
+	Long moimId,
+	String nickname
 ) {
 }