Merge pull request #70 from woowacourse-teams/develop-backend

develop-backend 브랜치를 develop으로 머지

.github/workflows/cd-dev.yml

@@ -0,0 +1,27 @@
+name: cd-dev
+
+on:
+  push:
+    branches:
+      - develop-backend
+
+jobs:
+  deploy:
+    runs-on: self-hosted
+
+    steps:
+      - name: change permission
+        run: |
+          sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/_work/2024-mouda
+
+      - name: DockerHub login
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Docker Compose up
+        run: |
+          docker compose -f ./backend/docker-compose.yml down mouda-be
+          docker compose -f ./backend/docker-compose.yml pull mouda-be
+          docker compose -f ./backend/docker-compose.yml up -d mouda-be

.github/workflows/ci-dev.yml

@@ -0,0 +1,42 @@
+name: ci-dev
+
+on:
+  pull_request:
+    branches:
+      - develop-backend
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+
+    defaults:
+      run:
+        shell: bash
+        working-directory: ./backend
+
+    steps:
+      - name: 레포지토리 체크아웃
+        uses: actions/checkout@v4
+
+      - name: JDK 17을 설치
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+
+      - name: gradlew 권한 부여
+        run: chmod +x ./gradlew
+
+      - name: Gradle 빌드
+        run: ./gradlew clean build -x test
+
+      - name: DockerHub 로그인
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: 도커 이미지 빌드 및 푸시
+        run: |
+          docker buildx build ./ --platform=linux/arm64 -t 2024mouda/mouda-be:latest
+          docker push 2024mouda/mouda-be:latest

backend/Dockerfile

@@ -0,0 +1,9 @@
+FROM openjdk:17-jdk
+
+ARG JAR_FILE=./build/libs/backend-0.0.1-SNAPSHOT.jar
+
+COPY ${JAR_FILE} /app.jar
+
+EXPOSE 8080
+
+ENTRYPOINT ["java", "-jar", "/app.jar"]

backend/docker-compose.yml

@@ -0,0 +1,11 @@
+version: "3.7" # 파일 규격 버전
+services:
+  mouda-be:
+    build: .
+    container_name: mouda-be # 컨테이너 이름 설정
+    ports:
+      - "8080:8080"
+    command:
+      - run
+      - --cors
+      - "*"

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

@@ -16,6 +16,8 @@
 import mouda.backend.common.RestResponse;
 import mouda.backend.moim.domain.Moim;
 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;
 import mouda.backend.moim.service.MoimService;
 
@@ -45,12 +47,31 @@ public ResponseEntity<RestResponse<MoimFindAllResponses>> findAllMoim() {
 		return ResponseEntity.ok().body(new RestResponse<>(moimService.findAllMoim()));
 	}
 
+	@Operation(summary = "모임 상세 조회", description = "모임 상세 조회한다.")
+	@ApiResponses({
+		@ApiResponse(responseCode = "200", description = "모임 상세 조회 성공!"),
+	})
+	@GetMapping("/{moimId}")
+	public ResponseEntity<RestResponse<MoimDetailsFindResponse>> findMoimDetails(@PathVariable long moimId) {
+		return ResponseEntity.ok().body(new RestResponse<>(moimService.findMoimDetails(moimId)));
+	}
+
+	@Operation(summary = "모임 참여", description = "모임에 참여한다.")
+	@ApiResponses({
+		@ApiResponse(responseCode = "200", description = "모임 참여 성공!")
+	})
+	@PostMapping("/join")
+	public ResponseEntity<RestResponse<Void>> joinMoim(@RequestBody MoimJoinRequest moimJoinRequest) {
+		moimService.joinMoim(moimJoinRequest);
+		return ResponseEntity.ok().build();
+	}
+
 	@Operation(summary = "모임 삭제", description = "해당하는 id의 모임을 삭제한다.")
 	@ApiResponses({
 		@ApiResponse(responseCode = "200", description = "모임 삭제 성공!"),
 	})
-	@DeleteMapping("/{id}")
-	public void deleteMoim(@PathVariable long id) {
-		moimService.deleteMoim(id);
+	@DeleteMapping("/{moimId}")
+	public void deleteMoim(@PathVariable long moimId) {
+		moimService.deleteMoim(moimId);
 	}
 }

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

@@ -30,9 +30,18 @@ public class Moim {
 
 	private String place;
 
+	private int currentPeople;
+
 	private int maxPeople;
 
 	private String authorNickname;
 
 	private String description;
+
+	public void join() {
+		if (currentPeople + 1 > maxPeople) {
+			throw new IllegalArgumentException();
+		}
+		currentPeople++;
+	}
 }

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

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

backend/src/main/java/mouda/backend/moim/dto/response/MoimDetailsFindResponse.java

@@ -0,0 +1,32 @@
+package mouda.backend.moim.dto.response;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+import lombok.Builder;
+import mouda.backend.moim.domain.Moim;
+
+@Builder
+public record MoimDetailsFindResponse(
+	String title,
+	LocalDate date,
+	LocalTime time,
+	String place,
+	int currentPeople,
+	int maxPeople,
+	String authorNickname,
+	String description
+) {
+	public static MoimDetailsFindResponse toResponse(Moim moim) {
+		return MoimDetailsFindResponse.builder()
+			.title(moim.getTitle())
+			.date(moim.getDate())
+			.time(moim.getTime())
+			.place(moim.getPlace())
+			.currentPeople(moim.getCurrentPeople())
+			.maxPeople(moim.getMaxPeople())
+			.authorNickname(moim.getAuthorNickname())
+			.description(moim.getDescription())
+			.build();
+	}
+}

backend/src/main/java/mouda/backend/moim/dto/response/MoimFindAllResponse.java

@@ -8,20 +8,24 @@
 
 @Builder
 public record MoimFindAllResponse(
+	long moimId,
 	String title,
 	LocalDate date,
 	LocalTime time,
 	String place,
+	int currentPeople,
 	int maxPeople,
 	String authorNickname,
 	String description
 ) {
 	public static MoimFindAllResponse toResponse(Moim moim) {
 		return MoimFindAllResponse.builder()
+			.moimId(moim.getId())
 			.title(moim.getTitle())
 			.date(moim.getDate())
 			.time(moim.getTime())
 			.place(moim.getPlace())
+			.currentPeople(moim.getCurrentPeople())
 			.maxPeople(moim.getMaxPeople())
 			.authorNickname(moim.getAuthorNickname())
 			.description(moim.getDescription())

backend/src/main/java/mouda/backend/moim/service/MoimService.java

@@ -8,6 +8,8 @@
 import lombok.RequiredArgsConstructor;
 import mouda.backend.moim.domain.Moim;
 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.MoimFindAllResponse;
 import mouda.backend.moim.dto.response.MoimFindAllResponses;
 import mouda.backend.moim.repository.MoimRepository;
@@ -33,10 +35,24 @@ public MoimFindAllResponses findAllMoim() {
 		);
 	}
 
-    public void deleteMoim(long id) {
+	@Transactional(readOnly = true)
+	public MoimDetailsFindResponse findMoimDetails(long id) {
+		Moim moim = moimRepository.findById(id)
+			.orElseThrow(IllegalArgumentException::new);
+
+		return MoimDetailsFindResponse.toResponse(moim);
+	}
+
+	public void joinMoim(MoimJoinRequest moimJoinRequest) {
+		Moim moim = moimRepository.findById(moimJoinRequest.moimId())
+			.orElseThrow(() -> new IllegalArgumentException("모임이 존재하지 않습니다."));
+		moim.join();
+	}
+
+	public void deleteMoim(long id) {
 		Moim moim = moimRepository.findById(id)
 			.orElseThrow(IllegalArgumentException::new);
 
 		moimRepository.delete(moim);
-    }
+	}
 }