diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..9cc612cb7 --- /dev/null +++ b/.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/ +/build.sh diff --git a/README.md b/README.md index 8ec09bd21..f14cdf9a7 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,10 @@ # airbnb -그룹 프로젝트 #4 +Codesquad Masters 2021 - 그룹 프로젝트 #4 + +--- + +## Team 21 members + +💁‍♀️ Bibi yeon +💁‍♂️ ppamppam Rano + diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..4db21cd40 --- /dev/null +++ b/build.gradle @@ -0,0 +1,26 @@ +plugins { + id 'org.springframework.boot' version '2.4.5' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'com.codesquad' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '1.8' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-web' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + runtimeOnly 'mysql:mysql-connector-java' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +test { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..e708b1c02 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..442d9132e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 000000000..4f906e0c8 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# 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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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=. +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%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +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%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..aab815121 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'airbnb' diff --git a/src/main/java/com/codesquad/airbnb/AirbnbApplication.java b/src/main/java/com/codesquad/airbnb/AirbnbApplication.java new file mode 100644 index 000000000..af6895532 --- /dev/null +++ b/src/main/java/com/codesquad/airbnb/AirbnbApplication.java @@ -0,0 +1,13 @@ +package com.codesquad.airbnb; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AirbnbApplication { + + public static void main(String[] args) { + SpringApplication.run(AirbnbApplication.class, args); + } + +} diff --git a/src/main/java/com/codesquad/airbnb/AppConfig.java b/src/main/java/com/codesquad/airbnb/AppConfig.java new file mode 100644 index 000000000..bf818141a --- /dev/null +++ b/src/main/java/com/codesquad/airbnb/AppConfig.java @@ -0,0 +1,24 @@ +package com.codesquad.airbnb; + +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.client.BufferingClientHttpRequestFactory; +import org.springframework.http.client.SimpleClientHttpRequestFactory; +import org.springframework.http.converter.StringHttpMessageConverter; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.nio.charset.Charset; + +@Configuration +public class AppConfig implements WebMvcConfigurer { + + @Bean + public RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) { + return restTemplateBuilder + .requestFactory(() -> new BufferingClientHttpRequestFactory(new SimpleClientHttpRequestFactory())) + .additionalMessageConverters(new StringHttpMessageConverter(Charset.forName("UTF-8"))) + .build(); + } +} diff --git a/src/main/java/com/codesquad/airbnb/controller/BookingController.java b/src/main/java/com/codesquad/airbnb/controller/BookingController.java new file mode 100644 index 000000000..a185896bb --- /dev/null +++ b/src/main/java/com/codesquad/airbnb/controller/BookingController.java @@ -0,0 +1,27 @@ +package com.codesquad.airbnb.controller; + +import com.codesquad.airbnb.dto.BookingRequest; +import com.codesquad.airbnb.service.BookingService; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/booking") +@CrossOrigin(origins = "*", allowedHeaders = "*") +public class BookingController { + + private final BookingService bookingService; + + public BookingController(BookingService bookingService) { + this.bookingService = bookingService; + } + + @PostMapping + public void bookRoom(@RequestBody BookingRequest bookingRequest) { + bookingService.saveBooking(bookingRequest); + } + + @DeleteMapping("/{bookingId}") + public void cancelBooking(@PathVariable("bookingId") Long bookingId) { + bookingService.deleteBooking(bookingId); + } +} diff --git a/src/main/java/com/codesquad/airbnb/controller/RoomController.java b/src/main/java/com/codesquad/airbnb/controller/RoomController.java new file mode 100644 index 000000000..dc344f86f --- /dev/null +++ b/src/main/java/com/codesquad/airbnb/controller/RoomController.java @@ -0,0 +1,46 @@ +package com.codesquad.airbnb.controller; + +import com.codesquad.airbnb.dto.RoomResponse; +import com.codesquad.airbnb.dto.Rooms; +import com.codesquad.airbnb.service.RoomService; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDate; +import java.util.List; + +@RestController +@RequestMapping("/api/rooms") +@CrossOrigin(origins = "*", allowedHeaders = "*") +public class RoomController { + + private RoomService roomService; + + public RoomController(RoomService roomService) { + this.roomService = roomService; + } + + @GetMapping + public Rooms showRooms() { + return new Rooms(roomService.getRoomDTOS()); + } + + @GetMapping(params = {"checkIn", "checkOut", "minPrice", "maxPrice", "numberOfPeople"}) + public Rooms searchRooms(@RequestParam("checkIn") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate checkIn, + @RequestParam("checkOut") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate checkOut, + @RequestParam("minPrice") int minPrice, @RequestParam("maxPrice") int maxPrice, + @RequestParam("numberOfPeople") int numberOfPeople) { + List roomResponses = roomService.getFilteredRoomDTOS(checkIn, checkOut, minPrice, maxPrice, numberOfPeople); + return new Rooms(roomResponses); + } + + @PostMapping("/{userId}/wish/{roomId}") + public void addWish(@PathVariable("roomId") Long roomId, @PathVariable("userId") Long userId) { + roomService.saveWish(roomId, userId); + } + + @DeleteMapping("/{userId}/wish/{roomId}") + public void cancelWish(@PathVariable("roomId") Long roomId, @PathVariable("userId") Long userId) { + roomService.deleteWish(roomId, userId); + } +} diff --git a/src/main/java/com/codesquad/airbnb/controller/UserController.java b/src/main/java/com/codesquad/airbnb/controller/UserController.java new file mode 100644 index 000000000..d1092e882 --- /dev/null +++ b/src/main/java/com/codesquad/airbnb/controller/UserController.java @@ -0,0 +1,25 @@ +package com.codesquad.airbnb.controller; + +import com.codesquad.airbnb.service.UserService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@CrossOrigin(origins = "*", allowedHeaders = "*") +public class UserController { + + private UserService userService; + + public UserController(UserService userService) { + this.userService = userService; + } + + @GetMapping("/oauth/google/callback") + public ResponseEntity oauthLogin(String code) { + userService.oauthLogin(code); + return new ResponseEntity("로그인 성공", HttpStatus.OK); + } +} diff --git a/src/main/java/com/codesquad/airbnb/domain/Badge.java b/src/main/java/com/codesquad/airbnb/domain/Badge.java new file mode 100644 index 000000000..a93464230 --- /dev/null +++ b/src/main/java/com/codesquad/airbnb/domain/Badge.java @@ -0,0 +1,14 @@ +package com.codesquad.airbnb.domain; + +public class Badge { + + private String type; + + public Badge(String type) { + this.type = type; + } + + public String getType() { + return type; + } +} diff --git a/src/main/java/com/codesquad/airbnb/domain/Booking.java b/src/main/java/com/codesquad/airbnb/domain/Booking.java new file mode 100644 index 000000000..8a1438fb3 --- /dev/null +++ b/src/main/java/com/codesquad/airbnb/domain/Booking.java @@ -0,0 +1,82 @@ +package com.codesquad.airbnb.domain; + +import org.springframework.data.annotation.Id; + +import java.time.LocalDate; + +public class Booking { + + @Id + private Long id; + + private Long roomId; + private Long userId; + private LocalDate checkIn; + private LocalDate checkOut; + private int numberOfPeople; + private int totalPrice; + + public Booking(Long roomId, Long userId, LocalDate checkIn, LocalDate checkOut, int numberOfPeople, int totalPrice) { + this.roomId = roomId; + this.userId = userId; + this.checkIn = checkIn; + this.checkOut = checkOut; + this.numberOfPeople = numberOfPeople; + this.totalPrice = totalPrice; + } + + public Booking(Long id, Long roomId, Long userId, LocalDate checkIn, LocalDate checkOut, int numberOfPeople, int totalPrice) { + this.id = id; + this.roomId = roomId; + this.userId = userId; + this.checkIn = checkIn; + this.checkOut = checkOut; + this.numberOfPeople = numberOfPeople; + this.totalPrice = totalPrice; + } + + public Long getRoomId() { + return roomId; + } + + public Long getUserId() { + return userId; + } + + public Long getId() { + return id; + } + + public LocalDate getCheckIn() { + return checkIn; + } + + public LocalDate getCheckOut() { + return checkOut; + } + + public int getNumberOfPeople() { + return numberOfPeople; + } + + public int getTotalPrice() { + return totalPrice; + } + + public boolean hasRoom(Long roomId) { + return this.roomId == roomId; + } + + @Override + public String toString() { + return "Booking{" + + "id=" + id + + ", roomId=" + roomId + + ", userId=" + userId + + ", checkIn=" + checkIn + + ", checkOut=" + checkOut + + ", numberOfPeople=" + numberOfPeople + + ", totalPrice=" + totalPrice + + '}'; + } +} diff --git a/src/main/java/com/codesquad/airbnb/domain/Option.java b/src/main/java/com/codesquad/airbnb/domain/Option.java new file mode 100644 index 000000000..6d433e311 --- /dev/null +++ b/src/main/java/com/codesquad/airbnb/domain/Option.java @@ -0,0 +1,38 @@ +package com.codesquad.airbnb.domain; + +public class Option { + + private boolean kitchen; + private boolean airConditioner; + private boolean wifi; + private boolean freeParkingLot; + private boolean hairDryer; + + public Option(boolean kitchen, boolean airConditioner, boolean wifi, boolean freeParkingLot, boolean hairDryer) { + this.kitchen = kitchen; + this.airConditioner = airConditioner; + this.wifi = wifi; + this.freeParkingLot = freeParkingLot; + this.hairDryer = hairDryer; + } + + public boolean isKitchen() { + return kitchen; + } + + public boolean isAirConditioner() { + return airConditioner; + } + + public boolean isWifi() { + return wifi; + } + + public boolean isFreeParkingLot() { + return freeParkingLot; + } + + public boolean isHairDryer() { + return hairDryer; + } +} diff --git a/src/main/java/com/codesquad/airbnb/domain/Room.java b/src/main/java/com/codesquad/airbnb/domain/Room.java new file mode 100644 index 000000000..3d2790c89 --- /dev/null +++ b/src/main/java/com/codesquad/airbnb/domain/Room.java @@ -0,0 +1,169 @@ +package com.codesquad.airbnb.domain; + +import org.springframework.data.annotation.Id; + +import java.util.List; +import java.util.Optional; + +public class Room { + + @Id + private final Long id; + + private int max; + private String name; + private double rating; + private double latitude; + private double longitude; + private int bedroomCount; + private int bedCount; + private int bathroomCount; + private String address; + private String detailAddress; + private int commentCount; + private int originalPrice; + private int salePrice; + private boolean flexibleRefund; + private boolean immediateBooking; + private List thumbnails; + private Optional