7주차 미션 / 서버 1조 정연석

src/main/java/com/kuit/baemin/controller/AddressController.java

@@ -0,0 +1,52 @@
+package com.kuit.baemin.controller;
+
+import com.kuit.baemin.common.dto.ApiResponse;
+import com.kuit.baemin.dto.request.CreateAddressReq;
+import com.kuit.baemin.dto.request.UpdateAddressReq;
+import com.kuit.baemin.dto.response.AddressListRes;
+import com.kuit.baemin.dto.response.AddressRes;
+import com.kuit.baemin.dto.response.DefaultAddressRes;
+import com.kuit.baemin.dto.response.DeleteAddressRes;
+import com.kuit.baemin.service.AddressService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+public class AddressController {
+    private final AddressService addressService;
+
+    @PostMapping("/users/{userId}/addresses")
+    public ApiResponse<AddressRes> createAddress(
+            @PathVariable Long userId,
+            @Valid @RequestBody CreateAddressReq req
+            ){
+        return ApiResponse.of(addressService.createAddress(userId, req));
+    }
+    @GetMapping("/users/{userId}/addresses")
+    public ApiResponse<AddressListRes> getAddresses(
+            @PathVariable Long userId
+    ){
+        return ApiResponse.of(addressService.getAddresses(userId));
+    }
+    @PatchMapping("/addresses/{addressId}")
+    public ApiResponse<AddressRes>updateAddress(
+            @PathVariable Long addressId,
+            @Valid @RequestBody UpdateAddressReq req
+            ){
+        return ApiResponse.of(addressService.updateAddress(addressId, req));
+    }
+    @DeleteMapping("/addresses/{addressId}")
+    public ApiResponse<DeleteAddressRes> deleteAddress(
+            @PathVariable Long addressId
+    ){
+        return ApiResponse.of(addressService.deleteAddress(addressId));
+    }
+    @PatchMapping("/addresses/{addressId}/default")
+    public ApiResponse<DefaultAddressRes> changeDefaultAddress(
+            @PathVariable Long addressId
+    ){
+        return ApiResponse.of(addressService.changeDefaultAddress((addressId)));
+    }
+}

src/main/java/com/kuit/baemin/controller/MemberController.java

@@ -3,6 +3,8 @@
 import com.kuit.baemin.common.dto.ApiResponse;
 import com.kuit.baemin.dto.request.LoginReq;
 import com.kuit.baemin.dto.request.SignUpReq;
+import com.kuit.baemin.dto.request.UpdateMemberReq;
+import com.kuit.baemin.dto.response.DeleteMemberRes;
 import com.kuit.baemin.dto.response.MemberRes;
 import com.kuit.baemin.service.MemberService;
 import jakarta.validation.Valid;
@@ -30,7 +32,7 @@
  *  8주차 커리큘럼(인증, 인가, JWT)을 학습한 후 직접 추가해보세요!
  */
 @RestController
-@RequestMapping("/members")
+@RequestMapping("/users")
 @RequiredArgsConstructor
 public class MemberController {
 
@@ -59,4 +61,18 @@ public ApiResponse<Long> login(@Valid @RequestBody LoginReq req) {
     public ApiResponse<MemberRes> getMember(@PathVariable Long memberId) {
         return ApiResponse.of(memberService.getMember(memberId));
     }
+
+    @PatchMapping("/{userId}")
+    public ApiResponse<MemberRes> updateMember(
+            @PathVariable Long userId,
+            @Valid @RequestBody UpdateMemberReq req
+            ){
+        return ApiResponse.of(memberService.updateMember(userId, req));
+    }
+    @DeleteMapping("/{userId}")
+    public ApiResponse<DeleteMemberRes> deleteMember(
+            @PathVariable Long userId
+    ){
+        return ApiResponse.of(memberService.deleteMember(userId));
+    }
 }

src/main/java/com/kuit/baemin/controller/MenuController.java

@@ -0,0 +1,22 @@
+package com.kuit.baemin.controller;
+
+import com.kuit.baemin.common.dto.ApiResponse;
+import com.kuit.baemin.dto.response.MenuListRes;
+import com.kuit.baemin.service.MenuService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class MenuController {
+    private final MenuService menuService;
+
+    @GetMapping("/stores/{storeId}/menus")
+    public ApiResponse<MenuListRes> getMenus(
+            @PathVariable Long storeId
+    ){
+        return ApiResponse.of(menuService.getMenus(storeId));
+    }
+}

src/main/java/com/kuit/baemin/controller/OrderController.java

@@ -0,0 +1,24 @@
+package com.kuit.baemin.controller;
+
+import com.kuit.baemin.common.dto.ApiResponse;
+import com.kuit.baemin.dto.request.CreateOrderReq;
+import com.kuit.baemin.dto.response.CreateOrderRes;
+import com.kuit.baemin.service.OrderService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class OrderController {
+    private final OrderService orderService;
+
+    @PostMapping("/orders")
+    public ApiResponse<CreateOrderRes> createOrder(
+            @Valid @RequestBody CreateOrderReq req
+    ) {
+        return ApiResponse.of(orderService.createOrder(req));
+    }
+}

src/main/java/com/kuit/baemin/controller/RestaurantController.java

@@ -0,0 +1,24 @@
+package com.kuit.baemin.controller;
+
+import com.kuit.baemin.common.dto.ApiResponse;
+import com.kuit.baemin.dto.response.RestaurantListRes;
+import com.kuit.baemin.service.RestaurantService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequiredArgsConstructor
+public class RestaurantController {
+    private final RestaurantService RestaurantService;
+
+    @GetMapping("/stores")
+    public ApiResponse<RestaurantListRes> getStores(
+            @PageableDefault(size=10) Pageable pageable
+            ){
+        return ApiResponse.of(RestaurantService.getStores(pageable));
+    }
+}

src/main/java/com/kuit/baemin/domain/Restaurant/Restaurant.java

@@ -4,20 +4,22 @@
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
 // TODO: 본인이 설계한 ERD에 맞게 수정
 @Entity
 @Getter
 @Builder
-@Table(name = "restaurants")
+@Table(name = "stores")
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Restaurant extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "store_id")
     private Long id;
 
     @Column(nullable = false, length = 100)
@@ -26,8 +28,35 @@ public class Restaurant extends BaseEntity {
     @Column(nullable = false, length = 200)
     private String address;
 
+    @Column(name = "category", length = 50, nullable = false)
+    private String category;
+
+    @Column(name = "phone", length = 20, nullable = false)
+    private String phone;
+
+    @Column(name = "min_order_price", nullable = false)
+    private Integer minOrderPrice = 0;
+
+    @Column(name = "delivery_fee", nullable = false)
+    private Integer deliveryFee = 0;
+
+    @Column(name = "rating", precision = 2, scale = 1, nullable = false)
+    private BigDecimal rating;
+
+    @Column(name = "is_open", nullable = false)
+    private Boolean isOpen;
+
+    @Column(name = "latitude", precision = 10, scale = 7, nullable = false)
+    private BigDecimal latitude;
+
+    @Column(name="description", length = 255)
+    private String description;
+
+    @Column(name = "longitude", precision = 10, scale = 7, nullable = false)
+    private BigDecimal longitude;
+
     @Enumerated(EnumType.STRING)
     @Column(nullable = false, length = 10)
-    private RestaurantStatus status;
+    private RestaurantStatus status = RestaurantStatus.ACTIVE;
 
 }

src/main/java/com/kuit/baemin/domain/address/Address.java

@@ -0,0 +1,100 @@
+package com.kuit.baemin.domain.address;
+
+import com.kuit.baemin.domain.BaseEntity;
+import com.kuit.baemin.domain.member.Member;
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Entity
+@Table(name="addresses")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Address extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "address_id")
+    private Long id;
+
+    @Column(name="address_name", length =50)
+    private String addressName;
+
+    @Column(name = "address", length = 255, nullable = false)
+    private String address;
+
+    @Column(name = "is_default", nullable = false)
+    private Boolean isDefault;
+
+    @Column(name = "latitude", nullable = false)
+    private Double latitude;
+
+    @Column(name = "longitude", nullable = false)
+    private Double longitude;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "status", length = 20, nullable = false)
+    private AddressStatus status;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private Member member;
+
+    @Builder
+    public Address(
+            String addressName,
+            String address,
+            Boolean isDefault,
+            Double latitude,
+            Double longitude,
+            Member member
+    ){
+        this.addressName = addressName;
+        this.address = address;
+        this.isDefault = isDefault !=null ? isDefault:false;
+        this. latitude = latitude;
+        this. longitude = longitude;
+        this.member = member;
+        this.status = AddressStatus.ACTIVE;
+    }
+    public void updateInfo(
+            String address,
+            String addressName,
+            Boolean isDefault,
+            Double latitude,
+            Double longitude
+    ){
+        if(addressName!=null){
+            this.addressName = addressName;
+        }
+        if(address!=null){
+            this.address = address;
+        }
+        if(isDefault!=null){
+            this.isDefault = isDefault;
+        }
+        if(latitude !=null){
+            this.latitude = latitude;
+        }
+        if(longitude!=null) {
+            this.longitude = longitude;
+        }
+    }
+    public boolean isDeleted(){
+        return this.status == AddressStatus.DELETED;
+    }
+    public void delete(){
+        this.status = AddressStatus.DELETED;
+    }
+    public void setDefault(){
+        this.isDefault = true;
+    }
+    public void unsetDefault(){
+        this.isDefault = false;
+    }
+    public boolean isAlreadyDefault(){
+        return Boolean.TRUE.equals(this.isDefault);
+    }
+}

src/main/java/com/kuit/baemin/domain/address/AddressStatus.java

@@ -0,0 +1,6 @@
+package com.kuit.baemin.domain.address;
+
+public enum AddressStatus {
+    ACTIVE,
+    DELETED
+}

src/main/java/com/kuit/baemin/domain/member/Member.java

@@ -8,7 +8,7 @@
 @Entity
 @Getter
 @Builder
-@Table(name = "members")
+@Table(name = "users")
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Member extends BaseEntity {
@@ -17,23 +17,41 @@ public class Member extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(nullable = false, length = 50)
+    @Column(nullable = false, length = 100)
     private String email;
 
-    @Column(nullable = false, length = 200)
+    @Column(nullable = false, length = 255)
     private String password;
 
     @Column(nullable = false, length = 20)
-    private String phoneNumber;
+    private String phone;
 
-    @Column(length = 25)
+    @Column(length = 50)
     private String nickname;
 
-    @Column(length = 300)
-    private String profileImage;
+    @Column(length = 50)
+    private String name;
 
     @Enumerated(EnumType.STRING)
-    @Column(nullable = false, length = 10)
+    @Column(nullable = false, length = 20)
     private MemberStatus status;
 
+    public void updateInfo(String name, String nickname, String phone){
+        if(name != null){
+            this.name = name;
+        }
+        if(name != null){
+            this.nickname = nickname;
+        }
+        if(phone!=null){
+            this.phone = phone;
+        }
+    }
+
+    public void delete(){
+        this.status = MemberStatus.DELETED;
+    }
+    public boolean isDeleted(){
+        return this.status == MemberStatus.DELETED;
+    }
 }