diff --git a/reservation-service/.gitignore b/reservation-service/.gitignore new file mode 100644 index 0000000..0db581c --- /dev/null +++ b/reservation-service/.gitignore @@ -0,0 +1,38 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ +src/main/resources/application.yml diff --git a/reservation-service/build.gradle b/reservation-service/build.gradle new file mode 100644 index 0000000..5e4c4dc --- /dev/null +++ b/reservation-service/build.gradle @@ -0,0 +1,45 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.2' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'com.chuca' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-redis' + + // lombok + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + // Swagger + implementation 'io.springfox:springfox-boot-starter:3.0.0' + implementation "io.springfox:springfox-swagger-ui:3.0.0" + + // model-mapper + implementation group: 'org.modelmapper', name: 'modelmapper', version: '2.3.8' + + +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/reservation-service/gradle/wrapper/gradle-wrapper.jar b/reservation-service/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 Binary files /dev/null and b/reservation-service/gradle/wrapper/gradle-wrapper.jar differ diff --git a/reservation-service/gradle/wrapper/gradle-wrapper.properties b/reservation-service/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a441313 --- /dev/null +++ b/reservation-service/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/reservation-service/gradlew b/reservation-service/gradlew new file mode 100755 index 0000000..b740cf1 --- /dev/null +++ b/reservation-service/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/reservation-service/gradlew.bat b/reservation-service/gradlew.bat new file mode 100644 index 0000000..7101f8e --- /dev/null +++ b/reservation-service/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/reservation-service/settings.gradle b/reservation-service/settings.gradle new file mode 100644 index 0000000..cc9c71f --- /dev/null +++ b/reservation-service/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'reservation-service' diff --git a/reservation-service/src/main/java/com/chuca/reservationservice/ReservationServiceApplication.java b/reservation-service/src/main/java/com/chuca/reservationservice/ReservationServiceApplication.java new file mode 100644 index 0000000..67a82b4 --- /dev/null +++ b/reservation-service/src/main/java/com/chuca/reservationservice/ReservationServiceApplication.java @@ -0,0 +1,13 @@ +package com.chuca.reservationservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ReservationServiceApplication { + + public static void main(String[] args) { + SpringApplication.run(ReservationServiceApplication.class, args); + } + +} diff --git a/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/application/dto/ReservationRequestDTO.java b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/application/dto/ReservationRequestDTO.java new file mode 100644 index 0000000..fb254d7 --- /dev/null +++ b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/application/dto/ReservationRequestDTO.java @@ -0,0 +1,22 @@ +package com.chuca.reservationservice.domain.reservation.application.dto; + +import lombok.Data; +import java.time.LocalDate; + +@Data +public class ReservationRequestDTO { + + private LocalDate reservationDate; + private LocalDate periodDate; + private LocalDate prePeriodDate; + private LocalDate demolishDate; + private LocalDate businessHours; + private String birthDayName; + private String genre; + private String eventName; + private Integer headCount; + private String imgUrl; + private Long memberId; + private Long cafeId; +} + diff --git a/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/application/dto/ReservationResponseDTO.java b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/application/dto/ReservationResponseDTO.java new file mode 100644 index 0000000..f709e37 --- /dev/null +++ b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/application/dto/ReservationResponseDTO.java @@ -0,0 +1,24 @@ +package com.chuca.reservationservice.domain.reservation.application.dto; +import lombok.Data; +import java.time.LocalDate; +@Data + +public class ReservationResponseDTO { + + private Long reservationId; + private LocalDate reservationDate; + private LocalDate periodDate; + private LocalDate prePeriodDate; + private LocalDate demolishDate; + private LocalDate businessHours; + private int reservationStatus; + private String birthDayName; + private String genre; + private String eventName; + private Integer headCount; + private String imgUrl; + private LocalDate createdAt; + private LocalDate updatedAt; + private Long memberId; + private Long cafeId; +} diff --git a/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/entity/Reservation.java b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/entity/Reservation.java new file mode 100644 index 0000000..cce5774 --- /dev/null +++ b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/entity/Reservation.java @@ -0,0 +1,48 @@ +package com.chuca.reservationservice.domain.reservation.domain.entity; + +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@Entity +@Table(name = "Reservation") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class Reservation { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long reservationId; + + @Column(nullable = false) + private LocalDate reservationDate; + + @Column(nullable = false) + private LocalDate periodDate; + + private LocalDate prePeriodDate; + private LocalDate demolishDate; + private LocalDate businessHours; + + @Column(nullable = false) + private int reservationStatus = 0; // 0: 대기중, 1: 승인, 2: 거절 등 상태 값 설정 가능 + + private String birthDayName; + private String genre; + private String eventName; + private Integer headCount; + private String imgUrl; + + private LocalDateTime createdAt; + private LocalDateTime updatedAt; + + @Column(nullable = false) + private Long memberId; + + @Column(nullable = false) + private Long cafeId; +} diff --git a/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/entity/ReservationEvent.java b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/entity/ReservationEvent.java new file mode 100644 index 0000000..06d8271 --- /dev/null +++ b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/entity/ReservationEvent.java @@ -0,0 +1,17 @@ +package com.chuca.reservationservice.domain.reservation.domain.entity; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class ReservationEvent { + + private Long reservationId; + private Long cafeId; + private EventType eventType; // 예약 이벤트 타입 (예: 생성, 취소, 승인 등) + private String message; + + public enum EventType { + CREATE, CANCEL, APPROVE, REJECT + } +} \ No newline at end of file diff --git a/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/repository/ReservationRepository.java b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/repository/ReservationRepository.java new file mode 100644 index 0000000..f462e83 --- /dev/null +++ b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/repository/ReservationRepository.java @@ -0,0 +1,9 @@ +package com.chuca.reservationservice.domain.reservation.domain.repository; + +import com.chuca.reservationservice.domain.reservation.domain.entity.Reservation; +import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + +public interface ReservationRepository extends JpaRepository { + List findByReservationStatus(int status); +} diff --git a/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/service/ReservationService.java b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/service/ReservationService.java new file mode 100644 index 0000000..af3aea7 --- /dev/null +++ b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/domain/service/ReservationService.java @@ -0,0 +1,151 @@ +package com.chuca.reservationservice.domain.reservation.domain.service; + +import com.chuca.reservationservice.domain.reservation.application.dto.ReservationRequestDTO; +import com.chuca.reservationservice.domain.reservation.application.dto.ReservationResponseDTO; +import com.chuca.reservationservice.domain.reservation.domain.entity.Reservation; +import com.chuca.reservationservice.domain.reservation.domain.entity.ReservationEvent; +import com.chuca.reservationservice.domain.reservation.domain.repository.ReservationRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class ReservationService { + + @Autowired + private RedisTemplate redisTemplate; + + @Autowired + private ApplicationEventPublisher eventPublisher; + + @Autowired + private ReservationRepository reservationRepository; + + // 예약 슬롯 확인 및 설정 + public boolean checkAndReserveSlot(Long cafeId, LocalDate date) { + String key = "cafe:" + cafeId + ":date:" + date.toString(); + + if (redisTemplate.opsForValue().get(key) != null) { + return false; // 이미 예약된 슬롯 + } + + redisTemplate.opsForValue().set(key, "reserved"); // 예약 슬롯 등록 + return true; + } + + // 특정 카페의 예약 가능 여부 확인 + public boolean checkCafeAvailability(Long cafeId) { + // 예약 가능한 날짜를 확인하는 로직을 여기에 추가. + // 예시로 특정 날짜에 대한 예약 가능 여부를 확인하도록 작성. + String key = "cafe:" + cafeId + ":availability"; + + // Redis에서 키가 없으면 예약 가능, 있으면 예약 불가로 가정 + return redisTemplate.opsForValue().get(key) == null; + } + + + // 예약 생성 + public void createReservation(ReservationRequestDTO request) { + Reservation reservation = new Reservation(); + + // DTO 데이터를 Reservation 엔티티에 매핑 + reservation.setReservationDate(request.getReservationDate()); + reservation.setPeriodDate(request.getPeriodDate()); + reservation.setPrePeriodDate(request.getPrePeriodDate()); + reservation.setDemolishDate(request.getDemolishDate()); + reservation.setBusinessHours(request.getBusinessHours()); + reservation.setBirthDayName(request.getBirthDayName()); + reservation.setGenre(request.getGenre()); + reservation.setEventName(request.getEventName()); + reservation.setHeadCount(request.getHeadCount()); + reservation.setImgUrl(request.getImgUrl()); + reservation.setMemberId(request.getMemberId()); + reservation.setCafeId(request.getCafeId()); + + reservationRepository.save(reservation); + + // 예약 생성 이벤트 발행 + ReservationEvent event = new ReservationEvent(reservation.getReservationId(), reservation.getCafeId(), ReservationEvent.EventType.CREATE, "예약이 생성되었습니다."); + eventPublisher.publishEvent(event); + } + + // 예약 상태 조회 + public ReservationResponseDTO getReservation(Long reservationId) { + Reservation reservation = reservationRepository.findById(reservationId) + .orElseThrow(() -> new RuntimeException("예약을 찾을 수 없습니다.")); + return mapToDTO(reservation); + } + + // 예약 취소 + public void cancelReservation(Long reservationId) { + Reservation reservation = reservationRepository.findById(reservationId) + .orElseThrow(() -> new RuntimeException("예약을 찾을 수 없습니다.")); + + // Redis에서 슬롯 제거 + releaseSlot(reservation.getCafeId(), reservation.getReservationDate()); + reservationRepository.delete(reservation); + + // 예약 취소 이벤트 발행 + ReservationEvent event = new ReservationEvent(reservationId, reservation.getCafeId(), ReservationEvent.EventType.CANCEL, "예약이 취소되었습니다."); + eventPublisher.publishEvent(event); + } + + // 예약 승인 + public void approveReservation(Long reservationId) { + Reservation reservation = reservationRepository.findById(reservationId) + .orElseThrow(() -> new RuntimeException("예약을 찾을 수 없습니다.")); + reservation.setReservationStatus(1); // 승인 상태로 변경 + reservationRepository.save(reservation); + + // 예약 승인 이벤트 발행 + ReservationEvent event = new ReservationEvent(reservationId, reservation.getCafeId(), ReservationEvent.EventType.APPROVE, "예약이 승인되었습니다."); + eventPublisher.publishEvent(event); + } + + // 예약 거절 + public void rejectReservation(Long reservationId) { + Reservation reservation = reservationRepository.findById(reservationId) + .orElseThrow(() -> new RuntimeException("예약을 찾을 수 없습니다.")); + reservation.setReservationStatus(2); // 거절 상태로 변경 + reservationRepository.save(reservation); + + // 예약 거절 이벤트 발행 + ReservationEvent event = new ReservationEvent(reservationId, reservation.getCafeId(), ReservationEvent.EventType.REJECT, "예약이 거절되었습니다."); + eventPublisher.publishEvent(event); + } + + private ReservationResponseDTO mapToDTO(Reservation reservation) { + ReservationResponseDTO dto = new ReservationResponseDTO(); + dto.setReservationId(reservation.getReservationId()); + dto.setReservationDate(reservation.getReservationDate()); + dto.setPeriodDate(reservation.getPeriodDate()); + dto.setPrePeriodDate(reservation.getPrePeriodDate()); + dto.setDemolishDate(reservation.getDemolishDate()); + dto.setBusinessHours(reservation.getBusinessHours()); + dto.setReservationStatus(reservation.getReservationStatus()); + dto.setBirthDayName(reservation.getBirthDayName()); + dto.setGenre(reservation.getGenre()); + dto.setEventName(reservation.getEventName()); + dto.setHeadCount(reservation.getHeadCount()); + dto.setImgUrl(reservation.getImgUrl()); + dto.setMemberId(reservation.getMemberId()); + dto.setCafeId(reservation.getCafeId()); + return dto; + } + + public void releaseSlot(Long cafeId, LocalDate date) { + String key = "cafe:" + cafeId + ":date:" + date.toString(); + redisTemplate.delete(key); + } + + public List getPendingReservations(String status) { + int statusInt = "pending".equals(status) ? 0 : -1; + List reservations = reservationRepository.findByReservationStatus(statusInt); + return reservations.stream().map(this::mapToDTO).collect(Collectors.toList()); + } +} \ No newline at end of file diff --git a/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/presentation/ReservationController.java b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/presentation/ReservationController.java new file mode 100644 index 0000000..0f9cdac --- /dev/null +++ b/reservation-service/src/main/java/com/chuca/reservationservice/domain/reservation/presentation/ReservationController.java @@ -0,0 +1,71 @@ +package com.chuca.reservationservice.domain.reservation.presentation; + +import com.chuca.reservationservice.domain.reservation.application.dto.ReservationRequestDTO; +import com.chuca.reservationservice.domain.reservation.application.dto.ReservationResponseDTO; +import com.chuca.reservationservice.domain.reservation.domain.service.ReservationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import java.util.List; +@RestController +@RequestMapping("/api") +public class ReservationController { + + @Autowired + private ReservationService reservationService; + + // 예약 신청 + @PostMapping("/reservations") + public ResponseEntity createReservation(@RequestBody ReservationRequestDTO request) { + boolean isAvailable = reservationService.checkAndReserveSlot(request.getCafeId(), request.getReservationDate()); + + if (!isAvailable) { + return ResponseEntity.status(400).body("이미 예약된 시간대입니다."); + } + + reservationService.createReservation(request); + return ResponseEntity.status(201).body("예약이 신청되었습니다."); + } + + // 예약 상태 조회 + @GetMapping("/reservations/{reservationId}") + public ResponseEntity getReservationStatus(@PathVariable Long reservationId) { + ReservationResponseDTO reservation = reservationService.getReservation(reservationId); + return ResponseEntity.ok(reservation); + } + + // 예약 취소 + @DeleteMapping("/reservations/{reservationId}") + public ResponseEntity cancelReservation(@PathVariable Long reservationId) { + reservationService.cancelReservation(reservationId); + return ResponseEntity.ok("예약이 취소되었습니다."); + } + + // 사장님용 예약 목록 조회 (승인 대기 중) + @GetMapping("/admin/reservations") + public ResponseEntity> getPendingReservations(@RequestParam String status) { + List reservations = reservationService.getPendingReservations(status); + return ResponseEntity.ok(reservations); + } + + // 예약 승인 + @PutMapping("/admin/reservations/{reservationId}/approve") + public ResponseEntity approveReservation(@PathVariable Long reservationId) { + reservationService.approveReservation(reservationId); + return ResponseEntity.ok("예약이 승인되었습니다."); + } + + // 예약 거절 + @PutMapping("/admin/reservations/{reservationId}/reject") + public ResponseEntity rejectReservation(@PathVariable Long reservationId) { + reservationService.rejectReservation(reservationId); + return ResponseEntity.ok("예약이 거절되었습니다."); + } + + // 특정 시간대의 예약 가능 여부 확인 + @GetMapping("/cafes/{cafeId}/availability") + public ResponseEntity checkCafeAvailability(@PathVariable Long cafeId) { + boolean isAvailable = reservationService.checkCafeAvailability(cafeId); + return ResponseEntity.ok(isAvailable); + } +} \ No newline at end of file diff --git a/reservation-service/src/main/java/com/chuca/reservationservice/global/config/RedisConfig.java b/reservation-service/src/main/java/com/chuca/reservationservice/global/config/RedisConfig.java new file mode 100644 index 0000000..8cf4030 --- /dev/null +++ b/reservation-service/src/main/java/com/chuca/reservationservice/global/config/RedisConfig.java @@ -0,0 +1,28 @@ +package com.chuca.reservationservice.global.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@Configuration +public class RedisConfig { + + @Bean + public RedisConnectionFactory redisConnectionFactory() { + return new LettuceConnectionFactory("localhost", 6379); // Redis 서버 설정 + } + + @Bean + public RedisTemplate redisTemplate() { + RedisTemplate template = new RedisTemplate<>(); + template.setConnectionFactory(redisConnectionFactory()); + + template.setKeySerializer(new StringRedisSerializer()); + template.setValueSerializer(new StringRedisSerializer()); + + return template; + } +} \ No newline at end of file diff --git a/reservation-service/src/main/java/com/chuca/reservationservice/global/event/ReservationEventListener.java b/reservation-service/src/main/java/com/chuca/reservationservice/global/event/ReservationEventListener.java new file mode 100644 index 0000000..912797d --- /dev/null +++ b/reservation-service/src/main/java/com/chuca/reservationservice/global/event/ReservationEventListener.java @@ -0,0 +1,34 @@ +package com.chuca.reservationservice.global.event; + +import com.chuca.reservationservice.domain.reservation.domain.entity.ReservationEvent; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; + +@Component +public class ReservationEventListener { + + @EventListener + public void handleReservationEvent(ReservationEvent event) { + switch (event.getEventType()) { + case CREATE: + System.out.println("예약 생성 이벤트: " + event.getMessage()); + // 예약 생성에 따른 후속 작업 수행 + break; + + case CANCEL: + System.out.println("예약 취소 이벤트: " + event.getMessage()); + // 예약 취소에 따른 후속 작업 수행 + break; + + case APPROVE: + System.out.println("예약 승인 이벤트: " + event.getMessage()); + // 예약 승인에 따른 후속 작업 수행 + break; + + case REJECT: + System.out.println("예약 거절 이벤트: " + event.getMessage()); + // 예약 거절에 따른 후속 작업 수행 + break; + } + } +} diff --git a/reservation-service/src/test/java/com/chuca/reservationservice/ReservationServiceApplicationTests.java b/reservation-service/src/test/java/com/chuca/reservationservice/ReservationServiceApplicationTests.java new file mode 100644 index 0000000..21da710 --- /dev/null +++ b/reservation-service/src/test/java/com/chuca/reservationservice/ReservationServiceApplicationTests.java @@ -0,0 +1,13 @@ +package com.chuca.reservationservice; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ReservationServiceApplicationTests { + + @Test + void contextLoads() { + } + +}