[feat] idea, channel 추가

src/main/java/Dogpaw/api/ChannelApiController.java

@@ -0,0 +1,64 @@
+package Dogpaw.api;
+
+
+import Dogpaw.domain.*;
+import Dogpaw.dto.ChannelDTO;
+import Dogpaw.dto.ResponseDTO;
+import Dogpaw.service.ChannelService;
+import Dogpaw.service.ChattingService;
+import Dogpaw.service.IdeaBoardService;
+import Dogpaw.service.IdeaService;
+import Dogpaw.service.UserService;
+import javassist.NotFoundException;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api")
+public class ChannelApiController {
+    @NonNull
+    private final ChannelService channelService;
+    @NonNull
+    private final UserService userService;
+    @NonNull
+    private final ChattingService chattingService;
+
+    @NonNull
+    private final IdeaBoardService ideaBoardService;
+
+    @PostMapping("/channel")
+    public ResponseDTO.Create createUser(@RequestBody ChannelDTO.Create dto) throws ChannelService.InvalidArgumentException, ChannelService.ArgumentNullException, ChattingService.InvalidArgumentException, ChattingService.ArgumentNullException, IdeaBoardService.ArgumentNullException, IdeaBoardService.InvalidArgumentException{
+
+        Chatting chatting = new Chatting();
+        IdeaBoard ideaBoard = new IdeaBoard();
+        Long saveId2 = chattingService.saveChatting(chatting);
+        Long saveId3 = ideaBoardService.saveIdeaBoard(ideaBoard);
+
+        Channel channel = new Channel(dto.getName(), dto.getPurpose(),chatting, ideaBoard);
+
+        Long saveId = channelService.saveChannel(channel, dto.getUserId());
+
+        return new ResponseDTO.Create(saveId, true);
+    }
+
+    @DeleteMapping("/channel")
+    public ResponseDTO.Delete createChat(@RequestBody ChannelDTO.Delete dto) throws NotFoundException {
+        channelService.deleteByChannelId(dto.getId());
+        chattingService.deleteByChattingId(dto.getId());
+        ideaBoardService.deleteByIdeaBoardId(dto.getId());
+
+        return new ResponseDTO.Delete(true);
+    }
+
+    @GetMapping("/channel")
+    public ResponseDTO.ChannelResponse getChatting(@RequestBody ChannelDTO.Get dto) throws NotFoundException{
+        User user = userService.findOne(dto.getUserId());
+        List<UserChannelMapping> channelList = channelService.getChannelList(dto.getUserId());
+        return new ResponseDTO.ChannelResponse(true, channelList);
+
+    }
+}

src/main/java/Dogpaw/api/ChatApiController.java

@@ -40,7 +40,4 @@ public ResponseDTO.Delete createChat(@RequestBody ChatDTO.Delete dto) throws Not
         chatService.deleteByChatId(dto.getId());
         return new ResponseDTO.Delete(true);
     }
-
-
-
 }

src/main/java/Dogpaw/api/ChattingApiController.java

@@ -21,26 +21,12 @@ public class ChattingApiController {
     private final ChattingService chattingService;
     private final ChatService chatService;
 
-    @PostMapping("/chatting")
-    public ResponseDTO.Create createChatting (@RequestBody ChattingDTO.Create dto) throws ChattingService.ArgumentNullException, ChattingService.InvalidArgumentException{
-        Chatting chatting = new Chatting(dto.getName(), dto.getPurpose());
-
-        Long saveId = chattingService.saveChatting(chatting);
-
-        return new ResponseDTO.Create(saveId, true);
-    }
-
-    @DeleteMapping("/chatting")
-    public ResponseDTO.Delete deleteChatting(@RequestBody ChattingDTO.Delete dto) throws NotFoundException{
-        chattingService.deleteByChattingId(dto.getId());
-        return new ResponseDTO.Delete(true);
-    }
 
     @GetMapping("/chatting")
     public ResponseDTO.ChattingResponse getChatting(@RequestBody ChattingDTO.Get dto) throws NotFoundException{
         Chatting chatting = chattingService.findOne(dto.getId());
         List<ChatMapping> chatList = chatService.getChatList(dto.getId());
-        return new ResponseDTO.ChattingResponse(true, chatList, chatting);
+        return new ResponseDTO.ChattingResponse(true, chatting, chatList);
 
     }
 

src/main/java/Dogpaw/api/CommentApiController.java

@@ -0,0 +1,49 @@
+package Dogpaw.api;
+
+import Dogpaw.domain.Chat;
+import Dogpaw.domain.Comment;
+import Dogpaw.domain.User;
+import Dogpaw.dto.ChatDTO;
+import Dogpaw.dto.CommentDTO;
+import Dogpaw.dto.ResponseDTO;
+import Dogpaw.service.ChatService;
+import Dogpaw.service.CommentService;
+import Dogpaw.service.UserService;
+import javassist.NotFoundException;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api")
+public class CommentApiController {
+    @NonNull
+    private final ChatService chatService;
+    @NonNull
+    private final CommentService commentService;
+    @NonNull
+    private final UserService userService;
+
+
+    @PostMapping("/comment")
+    public ResponseDTO.Create createComment(@RequestBody CommentDTO.Create dto) throws NotFoundException, CommentService.InvalidArgumentException, CommentService.ArgumentNullException {
+        Chat chat = chatService.findOne(dto.getChatId());
+        User user = userService.findOne(dto.getUserId());
+
+        Comment comment = new Comment(user, dto.getText(),dto.getDate(), dto.getTime(), chat);
+
+        Long saveId = commentService.saveComment(comment);
+        return new ResponseDTO.Create(saveId, true);
+    }
+
+
+    @DeleteMapping("/comment")
+    public ResponseDTO.Delete deleteComment(@RequestBody CommentDTO.Delete dto) throws NotFoundException {
+        commentService.deleteByCommentId(dto.getId());
+        return new ResponseDTO.Delete(true);
+    }
+
+
+
+}

src/main/java/Dogpaw/api/IdeaApiController.java

@@ -1,60 +1,42 @@
 package Dogpaw.api;
 
-
-import Dogpaw.domain.File;
 import Dogpaw.domain.Idea;
+import Dogpaw.domain.IdeaBoard;
+import Dogpaw.domain.User;
 import Dogpaw.dto.IdeaDTO;
 import Dogpaw.dto.ResponseDTO;
-import Dogpaw.service.FileService;
 import Dogpaw.service.IdeaService;
+import Dogpaw.service.IdeaBoardService;
+import Dogpaw.service.UserService;
 import javassist.NotFoundException;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api")
 public class IdeaApiController {
-
     @NonNull
     private final IdeaService IdeaService;
-    private final FileService FileService;
-
-    @PostMapping("/Idea")
-    public ResponseDTO.Create createIdea(@RequestBody IdeaDTO.Create dto, @RequestParam MultipartFile[] uploadFiles) throws IdeaService.ArgumentNullException, IdeaService.InvalidArgumentException {
-//        List<File> files = new ArrayList<>();
-//        for(MultipartFile file : uploadFiles){
-//            if(!file.isEmpty()){
-//                String fileName = file.getOriginalFilename();
-//                String contentType = file.getContentType();
-//                String savePath = System.getProperty("user.dir") + "\\files";
-//                if (!new File(savePath).exists()) {
-//                    try{
-//                        new File(savePath).mkdir();
-//                    }
-//                    catch(Exception e){
-//                        e.getStackTrace();
-//                    }
-//                }
-//
-//                String filePath = savePath + "\\" + fileName;
-//            }
-//        }
-
-        Idea Idea = new Idea(dto.getUser(), dto.getText(), dto.getDate());
+    private final IdeaBoardService IdeaBoardService;
+    private final UserService userService;
 
-        Long saveId = IdeaService.saveIdea(Idea);
 
+    @PostMapping("/idea")
+    public ResponseDTO.Create createIdea(@RequestBody IdeaDTO.Create dto) throws IdeaService.ArgumentNullException, IdeaService.InvalidArgumentException, NotFoundException {
+        IdeaBoard ideaBoard = IdeaBoardService.findOne(dto.getIdeaBoardId());
+        User user = userService.findOne(dto.getUserId());
+
+        Idea Idea = new Idea(user, dto.getText(),dto.getDate(), dto.getTime(), ideaBoard);
+
+        Long saveId = IdeaService.saveIdea(Idea);
         return new ResponseDTO.Create(saveId, true);
     }
 
-    @DeleteMapping("/Idea")
-    public ResponseDTO.Delete deleteIdea(@RequestBody IdeaDTO.Delete dto) throws NotFoundException {
+
+    @DeleteMapping("/idea")
+    public ResponseDTO.Delete createIdea(@RequestBody IdeaDTO.Delete dto) throws NotFoundException {
         IdeaService.deleteByIdeaId(dto.getId());
         return new ResponseDTO.Delete(true);
     }

src/main/java/Dogpaw/api/IdeaBoardApiController.java

@@ -0,0 +1,33 @@
+package Dogpaw.api;
+
+import Dogpaw.domain.IdeaMapping;
+import Dogpaw.domain.IdeaBoard;
+import Dogpaw.dto.IdeaBoardDTO;
+import Dogpaw.dto.ResponseDTO;
+import Dogpaw.service.IdeaService;
+import Dogpaw.service.IdeaBoardService;
+import javassist.NotFoundException;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api")
+public class IdeaBoardApiController {
+    @NonNull
+    private final IdeaBoardService IdeaBoardService;
+    private final IdeaService IdeaService;
+
+
+    @GetMapping("/ideaBoard")
+    public ResponseDTO.IdeaBoardResponse getIdeaBoard(@RequestBody IdeaBoardDTO.Get dto) throws NotFoundException{
+        IdeaBoard IdeaBoard = IdeaBoardService.findOne(dto.getId());
+        List<IdeaMapping> IdeaList = IdeaService.getIdeaList(dto.getId());
+        return new ResponseDTO.IdeaBoardResponse(true, IdeaBoard, IdeaList);
+
+    }
+
+}

src/main/java/Dogpaw/domain/Channel.java

@@ -0,0 +1,37 @@
+package Dogpaw.domain;
+
+import lombok.*;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@RequiredArgsConstructor
+public class Channel {
+    @Id @GeneratedValue (strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @NonNull
+    private String name;
+
+    @NonNull
+    private String purpose;
+
+    @Getter(AccessLevel.NONE)
+    @OneToMany(mappedBy = "channel")
+    private List<UserChannel> users = new ArrayList<>();
+
+    @NonNull
+    @OneToOne
+    @JoinColumn(name = "CHATTING_ID")
+    private Chatting chatting;
+
+    @NonNull
+    @OneToOne
+    @JoinColumn(name = "IdeaBoard_ID")
+    private IdeaBoard ideaBoard;
+
+}