diff --git a/db/data/aria_log.00000001 b/db/data/aria_log.00000001 index 4bc05b2..db931c9 100644 Binary files a/db/data/aria_log.00000001 and b/db/data/aria_log.00000001 differ diff --git a/db/data/aria_log_control b/db/data/aria_log_control index 2e35198..bb908ee 100644 Binary files a/db/data/aria_log_control and b/db/data/aria_log_control differ diff --git a/db/data/ddl_recovery-backup.log b/db/data/ddl_recovery-backup.log index 6e088ae..5e30b6d 100644 Binary files a/db/data/ddl_recovery-backup.log and b/db/data/ddl_recovery-backup.log differ diff --git a/db/data/ddl_recovery.log b/db/data/ddl_recovery.log deleted file mode 100644 index 5e30b6d..0000000 Binary files a/db/data/ddl_recovery.log and /dev/null differ diff --git a/db/data/eatUs/place.frm b/db/data/eatUs/place.frm new file mode 100644 index 0000000..b005c12 Binary files /dev/null and b/db/data/eatUs/place.frm differ diff --git a/db/data/eatUs/place.ibd b/db/data/eatUs/place.ibd new file mode 100644 index 0000000..820d21a Binary files /dev/null and b/db/data/eatUs/place.ibd differ diff --git a/db/data/eatUs/reservation.frm b/db/data/eatUs/reservation.frm new file mode 100644 index 0000000..04f599e Binary files /dev/null and b/db/data/eatUs/reservation.frm differ diff --git a/db/data/eatUs/reservation.ibd b/db/data/eatUs/reservation.ibd new file mode 100644 index 0000000..0746aba Binary files /dev/null and b/db/data/eatUs/reservation.ibd differ diff --git a/db/data/ib_buffer_pool b/db/data/ib_buffer_pool index 4bd3640..b78b7de 100644 --- a/db/data/ib_buffer_pool +++ b/db/data/ib_buffer_pool @@ -1,3 +1,11 @@ +7,3 +7,2 +7,1 +7,0 +6,3 +6,2 +6,1 +6,0 5,3 5,2 5,1 @@ -5,7 +13,9 @@ 4,3 2,3 1,3 +0,243 0,9 +0,0 0,1 0,300 0,299 @@ -127,7 +137,9 @@ 0,54 0,53 0,52 +0,313 0,51 +0,312 0,50 0,311 0,49 diff --git a/db/data/ib_logfile0 b/db/data/ib_logfile0 index 8bbea78..9a9f423 100644 Binary files a/db/data/ib_logfile0 and b/db/data/ib_logfile0 differ diff --git a/db/data/ibdata1 b/db/data/ibdata1 index 53a606c..36ea71d 100644 Binary files a/db/data/ibdata1 and b/db/data/ibdata1 differ diff --git a/db/data/ibtmp1 b/db/data/ibtmp1 deleted file mode 100644 index 202d95c..0000000 Binary files a/db/data/ibtmp1 and /dev/null differ diff --git a/db/data/mysql/innodb_index_stats.ibd b/db/data/mysql/innodb_index_stats.ibd index c062f13..432db5f 100644 Binary files a/db/data/mysql/innodb_index_stats.ibd and b/db/data/mysql/innodb_index_stats.ibd differ diff --git a/db/data/mysql/innodb_table_stats.ibd b/db/data/mysql/innodb_table_stats.ibd index 7cc7ab9..2799651 100644 Binary files a/db/data/mysql/innodb_table_stats.ibd and b/db/data/mysql/innodb_table_stats.ibd differ diff --git a/db/initdb.d/create_table.sql b/db/initdb.d/create_table.sql index 32c0faf..0996bb5 100644 --- a/db/initdb.d/create_table.sql +++ b/db/initdb.d/create_table.sql @@ -1,10 +1,5 @@ -create table user( - id INT NOT NULL AUTO_INCREMENT, - userId varchar(25), - userName varchar(25), - password varchar(25), - address varchar(25), - addressDetail varchar(25), - createdAt date, - primary key (id) +create table place( + id INT NOT NULL AUTO_INCREMENT, + placename varchar(25), + primary key (id) ); \ No newline at end of file diff --git a/src/main/java/com/example/eatusapi/reservation/controller/CancelController.java b/src/main/java/com/example/eatusapi/reservation/controller/CancelController.java new file mode 100644 index 0000000..a50af08 --- /dev/null +++ b/src/main/java/com/example/eatusapi/reservation/controller/CancelController.java @@ -0,0 +1,9 @@ +package com.example.eatusapi.reservation.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("") +public class CancelController { +} diff --git a/src/main/java/com/example/eatusapi/reservation/controller/RegistController.java b/src/main/java/com/example/eatusapi/reservation/controller/RegistController.java new file mode 100644 index 0000000..24b5d34 --- /dev/null +++ b/src/main/java/com/example/eatusapi/reservation/controller/RegistController.java @@ -0,0 +1,4 @@ +package com.example.eatusapi.reservation.controller; + +public class RegistController { +} diff --git a/src/main/java/com/example/eatusapi/reservation/dto/ResDto.java b/src/main/java/com/example/eatusapi/reservation/dto/ResDto.java new file mode 100644 index 0000000..6016d93 --- /dev/null +++ b/src/main/java/com/example/eatusapi/reservation/dto/ResDto.java @@ -0,0 +1,16 @@ +package com.example.eatusapi.reservation.dto; + +import java.sql.Date; + +public class ResDto { + String placename; + Date date; + String food; + int currentmember; + String memberone; + String membertwo; + String memberthree; + String memberfour; + String memberfive; + +} diff --git a/src/main/java/com/example/eatusapi/reservation/dto/cancelRequest.java b/src/main/java/com/example/eatusapi/reservation/dto/cancelRequest.java new file mode 100644 index 0000000..733052c --- /dev/null +++ b/src/main/java/com/example/eatusapi/reservation/dto/cancelRequest.java @@ -0,0 +1,14 @@ +package com.example.eatusapi.reservation.dto; + +import java.sql.Date; + +public class cancelRequest { + String palcename; + Date date; + String food; + String memberone; + String membertwo; + String memberthree; + String memberfour; + String memberfive; +} diff --git a/src/main/java/com/example/eatusapi/reservation/dto/registRequest.java b/src/main/java/com/example/eatusapi/reservation/dto/registRequest.java new file mode 100644 index 0000000..745c992 --- /dev/null +++ b/src/main/java/com/example/eatusapi/reservation/dto/registRequest.java @@ -0,0 +1,15 @@ +package com.example.eatusapi.reservation.dto; + +import java.sql.Date; + +public class registRequest { + String placename; + Date date; + String food; + int currentmember; + String memberone; + String membertwo; + String memberthree; + String memberfour; + String memberfive; +} diff --git a/src/main/java/com/example/eatusapi/reservation/entity/Reservation.java b/src/main/java/com/example/eatusapi/reservation/entity/Reservation.java new file mode 100644 index 0000000..6fe4c84 --- /dev/null +++ b/src/main/java/com/example/eatusapi/reservation/entity/Reservation.java @@ -0,0 +1,34 @@ +package com.example.eatusapi.reservation.entity; + +import lombok.*; + +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import java.sql.Date; + +@javax.persistence.Entity +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table +public class Reservation { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + long id; + String placename; + Date date; + String food; + int currentmember; + String memberone; + String membertwo; + String memberthree; + String memberfour; + String memberfive; + + public String getpalcename(){ + return this.placename; + } +} diff --git a/src/main/java/com/example/eatusapi/reservation/repository/ReservationRepository.java b/src/main/java/com/example/eatusapi/reservation/repository/ReservationRepository.java new file mode 100644 index 0000000..fc90a3e --- /dev/null +++ b/src/main/java/com/example/eatusapi/reservation/repository/ReservationRepository.java @@ -0,0 +1,8 @@ +package com.example.eatusapi.reservation.repository; + +import com.example.eatusapi.reservation.entity.Reservation; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ReservationRepository extends JpaRepository { + Reservation findBypalcename(Long Id, String placename); +} \ No newline at end of file diff --git a/src/main/java/com/example/eatusapi/reservation/service/CancelService.java b/src/main/java/com/example/eatusapi/reservation/service/CancelService.java new file mode 100644 index 0000000..503fd84 --- /dev/null +++ b/src/main/java/com/example/eatusapi/reservation/service/CancelService.java @@ -0,0 +1,5 @@ +package com.example.eatusapi.reservation.service; + +public class CancelService { + +} diff --git a/src/main/java/com/example/eatusapi/reservation/service/ReservationService.java b/src/main/java/com/example/eatusapi/reservation/service/ReservationService.java new file mode 100644 index 0000000..d5ac855 --- /dev/null +++ b/src/main/java/com/example/eatusapi/reservation/service/ReservationService.java @@ -0,0 +1,10 @@ +package com.example.eatusapi.reservation.service; + +import com.example.eatusapi.reservation.repository.ReservationRepository; +import org.springframework.stereotype.Service; + +@Service +public class ReservationService { + public ReservationRepository reservationRepository; + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8b13789..e69de29 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1 +0,0 @@ -