원띵 CRUD + 화면

boot/office/src/main/java/com/clip/office/content/ContentController.java

@@ -1,14 +1,44 @@
 package com.clip.office.content;
 
+import java.util.List;
+
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import com.clip.matching.entity.OneThingMatching;
+import com.clip.matching.entity.RandomMatching;
+import com.clip.office.matching.controller.dto.CreateOneThingMatchingDto;
+import com.clip.office.matching.controller.dto.CreateRandomMatchingDto;
+import com.clip.office.matching.service.OneThingMatchingService;
+import com.clip.office.matching.service.RandomMatchingService;
+
+import lombok.RequiredArgsConstructor;
+
 @Controller
-@RequestMapping("/")
+@RequestMapping("/office/admin/home")
+@RequiredArgsConstructor
 public class ContentController {
 
-    public String home() {
-        return "index";
+    private final OneThingMatchingService onethingMatchingService;
+    private final RandomMatchingService randomMatchingService;
+
+    @GetMapping("/oneThingMatching")
+    public String oneThingMatchingList(Model model) {
+        List<OneThingMatching> oneThingMatchingList = onethingMatchingService.findAllOneThingMatchings();
+        model.addAttribute("oneThingMatchings", oneThingMatchingList);
+        model.addAttribute("createOneThingMatchingDto", new CreateOneThingMatchingDto());
+        model.addAttribute("isOnething", true);
+        return "fragments/content :: #dynamicContent";
+    }
+
+    @GetMapping("/randomMatching")
+    public String randomMatchingList(Model model) {
+        List<RandomMatching> randomMatchingList = randomMatchingService.findAllRandomMatchings();
+        model.addAttribute("randomMatchings", randomMatchingList);
+        model.addAttribute("createRandomMatchingDto", new CreateRandomMatchingDto());
+        model.addAttribute("isOnething", false);
+        return "fragments/content :: #dynamicContent";
     }
 }

boot/office/src/main/java/com/clip/office/matching/controller/OneThingMatchingController.java

@@ -0,0 +1,72 @@
+package com.clip.office.matching.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.clip.office.matching.controller.dto.CreateOneThingMatchingDto;
+import com.clip.office.matching.controller.dto.UpdateOneThingMatchingDto;
+import com.clip.office.matching.service.OneThingMatchingService;
+
+import lombok.RequiredArgsConstructor;
+
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/office/admin/home/oneThingMatching")
+public class OneThingMatchingController {
+
+    private final OneThingMatchingService oneThingMatchingService;
+
+    @GetMapping("/create")
+    public String createOneThingMatching(Model model) {
+        model.addAttribute("createOneThingMatchingDto", new CreateOneThingMatchingDto());
+        return "/office/admin/home";
+    }
+
+    @PostMapping("/create")
+    public String createOneThingMatching(
+        @ModelAttribute CreateOneThingMatchingDto createOneThingMatchingDto,
+        RedirectAttributes redirectAttributes
+    ) {
+        oneThingMatchingService.createOneThingMatching(createOneThingMatchingDto);
+        redirectAttributes.addFlashAttribute("successMessage", "원띵매칭이 성공적으로 생성되었습니다.");
+        return "redirect:/office/admin/home";
+    }
+
+    @GetMapping("/update/{oneThingMatchingId}")
+    public String updateOneThingMatchingForm(
+            @PathVariable(value = "oneThingMatchingId") Long oneThingMatchingId,
+            Model model
+    ){
+        UpdateOneThingMatchingDto updateDto = oneThingMatchingService.getUpdateOneThingMatchingDto(oneThingMatchingId);
+        model.addAttribute("updateoneThingMatchingDto", updateDto);
+        model.addAttribute("oneThingMatchingId", oneThingMatchingId);
+        return "/office/admin/home/oneThingMatching/edit";
+    }
+
+    @PostMapping("/update/{oneThingMatchingId}")
+    public String updateoneThingMatching(
+            @PathVariable(value = "oneThingMatchingId") Long oneThingMatchingId,
+            @ModelAttribute UpdateOneThingMatchingDto updateOneThingMatchingDto,
+            RedirectAttributes redirectAttributes
+    ){
+        oneThingMatchingService.updateOneThingMatching(oneThingMatchingId, updateOneThingMatchingDto);
+        redirectAttributes.addFlashAttribute("successMessage", "원띵매칭이 성공적으로 수정되었습니다.");
+        return "redirect:/office/admin/home";
+    }
+
+    @PostMapping("/delete/{oneThingMatchingId}")
+    public String deleteoneThingMatching(
+            @PathVariable(value = "oneThingMatchingId") Long oneThingMatchingId,
+            RedirectAttributes redirectAttributes
+    ){
+        oneThingMatchingService.deleteOneThingMatching(oneThingMatchingId);
+        redirectAttributes.addFlashAttribute("successMessage", "원띵 매칭이 성공적으로 삭제되었습니다.");
+        return "redirect:/office/admin/home";
+    }
+}

boot/office/src/main/java/com/clip/office/matching/controller/RandomMatchingController.java

@@ -4,36 +4,64 @@
 import com.clip.office.matching.controller.dto.UpdateRandomMatchingDto;
 import com.clip.office.matching.service.RandomMatchingService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-@RestController
+@Controller
 @RequiredArgsConstructor
-@RequestMapping("/office/matching")
+@RequestMapping("/office/admin/home/randomMatching")
 public class RandomMatchingController {
 
     private final RandomMatchingService randomMatchingService;
 
+
+    @GetMapping("/create")
+    public String createRandomMatchingForm(Model model) {
+        model.addAttribute("createRandomMatchingDto", new CreateRandomMatchingDto());
+        return "redirect:/office/admin/home";
+    }
+
     @PostMapping("/create")
-    public ResponseEntity<CreateRandomMatchingDto> createRandomMatching(
-            @RequestBody CreateRandomMatchingDto createRandomMatchingDto
-    ) {
-        return ResponseEntity.ok(randomMatchingService.createRandomMatching(createRandomMatchingDto));
+    public String createRandomMatching(
+        @ModelAttribute CreateRandomMatchingDto createRandomMatchingDto,
+        RedirectAttributes redirectAttributes
+    ){
+        randomMatchingService.createRandomMatching(createRandomMatchingDto);
+        redirectAttributes.addFlashAttribute("successMessage", "랜덤 매칭이 성공적으로 생성되었습니다.");
+        return "redirect:/office/admin/home";
+    }
+
+    @GetMapping("/update/{randomMatchingId}")
+    public String updateRandomMatchingForm(
+            @PathVariable(value = "randomMatchingId") Long randomMatchingId,
+            Model model
+    ){
+        UpdateRandomMatchingDto updateDto = randomMatchingService.getUpdateRandomMatchingDto(randomMatchingId);
+        model.addAttribute("updateRandomMatchingDto", updateDto);
+        model.addAttribute("randomMatchingId", randomMatchingId);
+        return "/office/admin/home/randomMatching/edit";
     }
 
-    @PutMapping("/{randomMatchingId}")
-    public ResponseEntity<UpdateRandomMatchingDto> updateRandomMatching(
-            @PathVariable Long randomMatchingId,
-            @RequestBody UpdateRandomMatchingDto updateRandomMatchingDto
-    ) {
-        return ResponseEntity.ok(randomMatchingService.updateRandomMatching(randomMatchingId ,updateRandomMatchingDto));
+    @PostMapping("/update/{randomMatchingId}")
+    public String updateRandomMatching(
+            @PathVariable(value = "randomMatchingId") Long randomMatchingId,
+            @ModelAttribute UpdateRandomMatchingDto updateRandomMatchingDto,
+            RedirectAttributes redirectAttributes
+    ){
+        randomMatchingService.updateRandomMatching(randomMatchingId, updateRandomMatchingDto);
+        redirectAttributes.addFlashAttribute("successMessage", "랜덤 매칭이 성공적으로 수정되었습니다.");
+        return "redirect:/office/admin/home";
     }
 
-    @DeleteMapping("/{randomMatchingId}")
-    public ResponseEntity<Void> deleteRandomMatching(
-            @PathVariable Long randomMatchingId
-    ) {
+    @PostMapping("/delete/{randomMatchingId}")
+    public String deleteRandomMatching(
+            @PathVariable(value = "randomMatchingId") Long randomMatchingId,
+            RedirectAttributes redirectAttributes
+    ){
         randomMatchingService.deleteRandomMatching(randomMatchingId);
-        return ResponseEntity.noContent().build();
+        redirectAttributes.addFlashAttribute("successMessage", "랜덤 매칭이 성공적으로 삭제되었습니다.");
+        return "redirect:/office/admin/home";
     }
 }

boot/office/src/main/java/com/clip/office/matching/controller/dto/CreateOneThingMatchingDto.java

@@ -0,0 +1,36 @@
+package com.clip.office.matching.controller.dto;
+
+import com.clip.matching.entity.OneThingDistrict;
+import com.clip.matching.entity.OneThingKeyword;
+import com.clip.matching.entity.OneThingPrice;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CreateOneThingMatchingDto {
+
+    private OneThingDistrict oneThingDistrict;
+    private OneThingKeyword oneThingKeyword;
+    private String location;
+    private String restaurantName;
+    private LocalDateTime meetingTime;
+    private OneThingPrice oneThingPrice;
+
+    @Builder
+    public CreateOneThingMatchingDto(OneThingDistrict oneThingDistrict, OneThingKeyword oneThingKeyword,
+        String location,
+        String restaurantName, LocalDateTime meetingTime, OneThingPrice oneThingPrice) {
+        this.oneThingDistrict = oneThingDistrict;
+        this.oneThingKeyword = oneThingKeyword;
+        this.location = location;
+        this.restaurantName = restaurantName;
+        this.meetingTime = meetingTime;
+        this.oneThingPrice = oneThingPrice;
+    }
+}

boot/office/src/main/java/com/clip/office/matching/controller/dto/CreateRandomMatchingDto.java

@@ -4,10 +4,12 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.time.LocalDateTime;
 
 @Getter
+@Setter
 @NoArgsConstructor
 public class CreateRandomMatchingDto {
 
@@ -23,4 +25,4 @@ public CreateRandomMatchingDto(RandomDistrict randomDistrict,String location, St
         this.restaurantName = restaurantName;
         this.meetingTime = meetingTime;
     }
-}
+}

boot/office/src/main/java/com/clip/office/matching/controller/dto/OneThingMatchingDto.java

@@ -0,0 +1,33 @@
+package com.clip.office.matching.controller.dto;
+
+import com.clip.matching.entity.OneThingDistrict;
+import com.clip.matching.entity.OneThingKeyword;
+import com.clip.matching.entity.OneThingPrice;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Getter
+@NoArgsConstructor
+public class OneThingMatchingDto {
+
+    private OneThingDistrict oneThingDistrict;
+    private OneThingKeyword oneThingKeyword;
+    private String location;
+    private String restaurantName;
+    private LocalDateTime meetingTime;
+    private OneThingPrice oneThingPrice;
+
+    @Builder
+    public OneThingMatchingDto(OneThingDistrict oneThingDistrict, OneThingKeyword oneThingKeyword, String location,
+        String restaurantName, LocalDateTime meetingTime, OneThingPrice oneThingPrice) {
+        this.oneThingDistrict = oneThingDistrict;
+        this.oneThingKeyword = oneThingKeyword;
+        this.location = location;
+        this.restaurantName = restaurantName;
+        this.meetingTime = meetingTime;
+        this.oneThingPrice = oneThingPrice;
+    }
+}

boot/office/src/main/java/com/clip/office/matching/controller/dto/RandomMatchingDto.java

@@ -0,0 +1,26 @@
+package com.clip.office.matching.controller.dto;
+
+import com.clip.matching.entity.RandomDistrict;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Getter
+@NoArgsConstructor
+public class RandomMatchingDto {
+
+    private RandomDistrict randomDistrict;
+    private String location;
+    private String restaurantName;
+    private LocalDateTime meetingTime;
+
+    @Builder
+    public RandomMatchingDto(RandomDistrict randomDistrict, String location, String restaurantName, LocalDateTime meetingTime) {
+        this.randomDistrict = randomDistrict;
+        this.location = location;
+        this.restaurantName = restaurantName;
+        this.meetingTime = meetingTime;
+    }
+}

boot/office/src/main/java/com/clip/office/matching/controller/dto/UpdateOneThingMatchingDto.java

@@ -0,0 +1,30 @@
+package com.clip.office.matching.controller.dto;
+
+import com.clip.matching.entity.OneThingDistrict;
+import com.clip.matching.entity.OneThingPrice;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class UpdateOneThingMatchingDto {
+    private OneThingDistrict oneThingDistrict;
+    private String location;
+    private String restaurantName;
+    private LocalDateTime meetingTime;
+    private OneThingPrice oneThingPrice;
+
+    @Builder
+    public UpdateOneThingMatchingDto(OneThingDistrict oneThingDistrict, String location, String restaurantName, LocalDateTime meetingTime, OneThingPrice oneThingPrice) {
+        this.oneThingDistrict = oneThingDistrict;
+        this.location = location;
+        this.restaurantName = restaurantName;
+        this.meetingTime = meetingTime;
+        this.oneThingPrice = oneThingPrice;
+    }
+}

boot/office/src/main/java/com/clip/office/matching/controller/dto/UpdateRandomMatchingDto.java

@@ -4,10 +4,12 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.time.LocalDateTime;
 
 @Getter
+@Setter
 @NoArgsConstructor
 public class UpdateRandomMatchingDto {
 
@@ -23,4 +25,4 @@ public UpdateRandomMatchingDto(RandomDistrict randomDistrict,String location, St
         this.restaurantName = restaurantName;
         this.meetingTime = meetingTime;
     }
-}
+}