Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f4cdb8a
docs(README): 요구사항 목록 README에 작성
supernovaMK Jun 10, 2025
7d45689
feat: 로그인/로그아웃 기능 구현
supernovaMK Jun 10, 2025
0d76fca
feat: 회원가입 기능 구현
supernovaMK Jun 10, 2025
65e0567
feat: 회의실 관련 기능 구현
supernovaMK Jun 10, 2025
25706b9
feat: 회의실 예약 가능 시간 기능
supernovaMK Jun 10, 2025
89315ba
feat: 외부 api 연동 개발
supernovaMK Jun 10, 2025
f3bc57f
feat: 회의실 선택 기능 구현
supernovaMK Jun 17, 2025
4d79e6b
feat: 모든 예약 현황 보기, 자신의 예약 현황 보기 기능 구현
supernovaMK Jun 17, 2025
39fe92f
feat: 자신의 예약 삭제 기능 구현
supernovaMK Jun 17, 2025
21d89b5
chore: 코드 정리
supernovaMK Jun 17, 2025
09b94f0
feat: 공휴일에는 예약을 생성할 수 없는 로직 구현
supernovaMK Jun 17, 2025
6d85716
feat: 전역 에러 핸들링 구현
supernovaMK Jun 17, 2025
b340f81
test: 자신의 예약 삭제 기능 테스트 구현
supernovaMK Jun 18, 2025
649464f
env: MySQL 데이터베이스 설정 및 Docker 환경 구성 추가
supernovaMK Sep 3, 2025
d50bde3
test: H2 데이터베이스 설정 및 테스트 프로파일 추가, 테스트 클래스 이름 수정
supernovaMK Sep 3, 2025
f421bf4
test: H2 데이터베이스 설정 및 테스트 프로파일 추가, 테스트 클래스 이름 수정
supernovaMK Sep 3, 2025
b1fdc31
chore: 코드 삭제
supernovaMK Sep 3, 2025
e81a701
docs: 인프라 구조 문서 작성
supernovaMK Sep 3, 2025
014fde3
docs: README.md 형식 수정 및 항목 기호 변경
supernovaMK Sep 3, 2025
005ba7f
docs: README.md 형식 수정
supernovaMK Sep 3, 2025
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ out/

### VS Code ###
.vscode/

### env ###
src/main/java/finalmission/.env
docker/.env
32 changes: 32 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# 빌드용 jdk AS 키워드를 사용하여 해당 스테이지 이름을 build로 설정
FROM eclipse-temurin:21 as build

WORKDIR /app

# Gradle 관련 파일 복사
COPY build.gradle .
COPY settings.gradle .
COPY gradlew .
COPY gradle ./gradle

# 의존성 다운로드
RUN ./gradlew clean --no-daemon || true

# 소스 코드 복사
COPY src ./src

# 빌드 (테스트 제외)
RUN ./gradlew bootJar -x test --no-daemon

# 실행용 jre
FROM eclipse-temurin:21-jre

WORKDIR /app

# 빌드 결과물 복사
COPY --from=build /app/build/libs/*.jar app.jar

EXPOSE 8080

# 실행 (실시간 로그 확인 가능)
ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS:-} -Dspring.profiles.active=${SPRING_PROFILES_ACTIVE:-default} -jar /app/app.jar"]
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# 인프라 설정
이 프로젝트는 Spring Boot 애플리케이션과 MySQL 데이터베이스를 분리된 환경에서 실행하도록 구성되었습니다.

## 아키텍처 개요
* 애플리케이션: EC2 인스턴스에서 실행 (git clone 후 docker-compose로 배포)
* 데이터베이스: Docker 기반 MySQL 컨테이너로 실행 (별도 서버에서 배포)
* 연결 방식: Spring Boot → MySQL (JDBC URL 기반)
* 환경변수 관리: .env 파일과 application.properties 조합
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@ dependencies {
implementation 'io.jsonwebtoken:jjwt-impl:0.11.2'
implementation 'io.jsonwebtoken:jjwt-gson:0.11.2'

runtimeOnly 'com.h2database:h2'
// jpa
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
runtimeOnly 'com.mysql:mysql-connector-j'

testImplementation 'com.h2database:h2'
testRuntimeOnly 'com.h2database:h2'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'io.rest-assured:rest-assured:5.3.1'
}
Expand Down
13 changes: 13 additions & 0 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
services:
app:
build:
context: .. # 현재 디렉토리 (Dockerfile 위치)
dockerfile: Dockerfile # 사용할 Dockerfile
image: lv2-final-mission:latest
container_name: lv2-final-mission
env_file:
- .env
ports:
- "80:8080" # 외부 80포트 -> 컨테이너 8080
# DB 접속 정보 등 환경변수 주입
restart: always # 서버 재부팅 시 자동 실행
44 changes: 44 additions & 0 deletions src/main/java/finalmission/controller/LoginLogoutController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package finalmission.controller;

import finalmission.dto.LoginInfo;
import finalmission.exception.MemberException;
import finalmission.service.MemberService;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

@RestController
public class LoginLogoutController {

private final MemberService memberService;

public LoginLogoutController(MemberService memberService) {
this.memberService = memberService;
}

@PostMapping("/login")
void login(@RequestBody LoginInfo loginInfo, HttpServletResponse httpServletResponse) {
String token = memberService.loginMember(loginInfo);
Cookie cookie = new Cookie("token", token);
cookie.setPath("/");
httpServletResponse.addCookie(cookie);
httpServletResponse.setStatus(200);
}

@GetMapping("/logout")
void logout(HttpServletRequest request, HttpServletResponse response) {
Cookie[] cookies = request.getCookies();
Cookie cookie = Arrays.stream(cookies).filter(cookie1 -> cookie1.getName() == "tocken").findAny()
.orElseThrow(() -> {
throw new MemberException("잘못된 요청입니다.");
});
cookie.setMaxAge(0);
response.addCookie(cookie);
response.setStatus(200);
}
}
53 changes: 53 additions & 0 deletions src/main/java/finalmission/controller/ReservationController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package finalmission.controller;

import finalmission.domain.Member;
import finalmission.domain.Reservation;
import finalmission.dto.MakingReservationRequest;
import finalmission.service.ReservationService;
import java.net.URI;
import java.util.List;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/reservation")
public class ReservationController {

private final ReservationService reservationService;

public ReservationController(ReservationService reservationService) {
this.reservationService = reservationService;
}

@GetMapping
ResponseEntity<List<Reservation>> getAllReservations() {

return ResponseEntity.ok().body(reservationService.findAllReservations());
}

@PostMapping
ResponseEntity<Reservation> createReservation(@RequestBody MakingReservationRequest request, Member member) {

return ResponseEntity.created(URI.create("/reservation")).body(reservationService.createReservation(request,member));
}

@GetMapping("/mine")
ResponseEntity<List<Reservation>> myReservations(Member member) {

return ResponseEntity.ok().body(reservationService.findMyReservation(member));
}

@DeleteMapping
ResponseEntity<Void> deleteMyReservation(@RequestBody Long reservationId, Member member) {

reservationService.deleteMyReservation(reservationId, member);

return ResponseEntity.ok().build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package finalmission.controller;

import finalmission.domain.ReservationTime;
import finalmission.dto.MakingReservationTimeRequest;
import finalmission.service.ReservationTimeService;
import java.net.URI;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/reservation_time")
public class ReservationTimeController {

private final ReservationTimeService reservationTimeService;

public ReservationTimeController(ReservationTimeService reservationTimeService) {
this.reservationTimeService = reservationTimeService;
}

@GetMapping
ResponseEntity<List<ReservationTime>> getAllReservationTimes() {
return ResponseEntity.ok().body(reservationTimeService.findAllReservationTimes());
}

@PostMapping
ResponseEntity<ReservationTime> createReservation(@RequestBody MakingReservationTimeRequest request) {
return ResponseEntity.created(URI.create("/reservation_time")).body(reservationTimeService.create(request));
}
}
37 changes: 37 additions & 0 deletions src/main/java/finalmission/controller/RoomController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package finalmission.controller;

import finalmission.domain.Room;
import finalmission.dto.MakingRoomRequest;
import finalmission.service.RoomService;
import jakarta.persistence.GeneratedValue;
import java.net.URI;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/room")
public class RoomController {

private final RoomService roomService;

public RoomController(RoomService roomService) {
this.roomService = roomService;
}

@PostMapping
ResponseEntity<Room> createRoom(@RequestBody MakingRoomRequest makingRoomRequest) {
return ResponseEntity.created(URI.create("/room"))
.body(roomService.createRoom(makingRoomRequest));
}

@GetMapping
ResponseEntity<List<Room>> getAllRooms(){
return ResponseEntity.ok().body(roomService.getAllRooms());
}
}
29 changes: 29 additions & 0 deletions src/main/java/finalmission/controller/SignupController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package finalmission.controller;

import finalmission.domain.Member;
import finalmission.dto.SignUpInfo;
import finalmission.service.MemberService;
import java.net.URI;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/signup")
public class SignupController {

private final MemberService memberService;

public SignupController(MemberService memberService) {
this.memberService = memberService;
}

@PostMapping
ResponseEntity<Member> signUp(@RequestBody SignUpInfo signUpInfo) {
return ResponseEntity.created(URI.create("/signup"))
.body(memberService.createMember(signUpInfo));
}
}
69 changes: 69 additions & 0 deletions src/main/java/finalmission/domain/Member.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package finalmission.domain;

import finalmission.exception.MemberException;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;

@Entity
public class Member {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String name;
private String email;
private String password;

public Member() {
}

public Member(Long id, String name, String email, String password) {
validate(name, email, password);
this.id = id;
this.name = name;
this.email = email;
this.password = password;
}

private void validate(String name, String email, String password) {
validateName(name);
validateEmail(email);
validatePassword(password);
}

private void validatePassword(String password) {
if (password.isBlank()) {
throw new MemberException("빈 패스워드로 멤버를 생성할 수 없습니다.");
}
}

private void validateEmail(String email) {
if (email.isBlank()) {
throw new MemberException("빈 이메일로 멤버를 생성할 수 없습니다.");
}
}

private void validateName(String name) {
if (name == null || name.isBlank() ) {
throw new MemberException("이름 없이는 멤버를 생성할 수 없습니다.");
}
}

public Long getId() {
return id;
}

public String getName() {
return name;
}

public String getEmail() {
return email;
}

public String getPassword() {
return password;
}
}
Loading