Merge pull request #57 from GDSC-SC-BABY/Improve/정동훈

Improve/정동훈
GDSC-SC-BABY · Feb 21, 2024 · 91fbf5e · 91fbf5e
2 parents 5fd0e4d + 04f3e13
commit 91fbf5e
Show file tree

Hide file tree

Showing 23 changed files with 218 additions and 46 deletions.
diff --git a/src/main/java/com/example/scbaby/Bean/BabyBean/BabyRegistBean.java b/src/main/java/com/example/scbaby/Bean/BabyBean/BabyRegistBean.java
@@ -41,9 +41,4 @@ public static String generateUniqueCode(int length) {
         String uuid = UUID.randomUUID().toString();
         return uuid.replaceAll("-", "").substring(0, length);
     }
-
-    public static void main(String[] args) {
-        String uniqueCode = generateUniqueCode(8);
-        System.out.println(uniqueCode);
-    }
 }
diff --git a/src/main/java/com/example/scbaby/Bean/GuideBean/GuideGetBean.java b/src/main/java/com/example/scbaby/Bean/GuideBean/GuideGetBean.java
@@ -4,7 +4,6 @@
 import com.example.scbaby.Model.DTO.Guide.GuideGetDTO;
 import com.example.scbaby.Repository.GuideRepository;
 import lombok.RequiredArgsConstructor;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

diff --git a/src/main/java/com/example/scbaby/Bean/Snack/SnackListGetBean.java b/src/main/java/com/example/scbaby/Bean/Snack/SnackListGetBean.java
@@ -1,13 +1,9 @@
 package com.example.scbaby.Bean.Snack;
 
 import com.example.scbaby.Model.DAO.BabyDAO;
-import com.example.scbaby.Model.DAO.BabyFoodDAO;
 import com.example.scbaby.Model.DAO.SnackDAO;
-import com.example.scbaby.Model.DTO.BabyFood.Res.BabyFoodGetRes;
-import com.example.scbaby.Model.DTO.BabyFood.Res.BabyFoodListRes;
 import com.example.scbaby.Model.DTO.Snack.Res.SnackGetRes;
 import com.example.scbaby.Model.DTO.Snack.Res.SnackListRes;
-import com.example.scbaby.Repository.BabyFoodRepository;
 import com.example.scbaby.Repository.BabyRepository;
 import com.example.scbaby.Repository.SnackRepository;
 import lombok.RequiredArgsConstructor;

diff --git a/src/main/java/com/example/scbaby/Bean/UserBean/GetBabyIdByUserIdBean.java b/src/main/java/com/example/scbaby/Bean/UserBean/GetBabyIdByUserIdBean.java
@@ -1,10 +1,7 @@
 package com.example.scbaby.Bean.UserBean;
 
 import com.example.scbaby.Model.DAO.UserDAO;
-import com.example.scbaby.Model.DTO.User.Req.UserGetReq;
 import com.example.scbaby.Model.DTO.User.Res.BabyIdGetRes;
-import com.example.scbaby.Model.DTO.User.Res.UserGetRes;
-import com.example.scbaby.Repository.BabyRepository;
 import com.example.scbaby.Repository.UserRepository;
 import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;

diff --git a/src/main/java/com/example/scbaby/Bean/UserBean/UserGetBean.java b/src/main/java/com/example/scbaby/Bean/UserBean/UserGetBean.java
@@ -1,7 +1,6 @@
 package com.example.scbaby.Bean.UserBean;
 
 import com.example.scbaby.Model.DAO.UserDAO;
-import com.example.scbaby.Model.DTO.User.Req.UserGetReq;
 import com.example.scbaby.Model.DTO.User.Res.UserGetRes;
 import com.example.scbaby.Repository.UserRepository;
 import jakarta.persistence.EntityNotFoundException;

diff --git a/src/main/java/com/example/scbaby/Bean/UserBean/UserRegistBean.java b/src/main/java/com/example/scbaby/Bean/UserBean/UserRegistBean.java
@@ -1,11 +1,8 @@
 package com.example.scbaby.Bean.UserBean;
 
-import com.example.scbaby.Model.DAO.BabyDAO;
 import com.example.scbaby.Model.DTO.StateRes;
 import com.example.scbaby.Model.DTO.User.Req.UserRegistReq;
-import com.example.scbaby.Repository.BabyRepository;
 import com.example.scbaby.Repository.UserRepository;
-import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 

diff --git a/src/main/java/com/example/scbaby/Controller/BabyController.java b/src/main/java/com/example/scbaby/Controller/BabyController.java
@@ -9,7 +9,6 @@
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/src/main/java/com/example/scbaby/Controller/GuideController.java b/src/main/java/com/example/scbaby/Controller/GuideController.java
@@ -1,6 +1,5 @@
 package com.example.scbaby.Controller;
 
-import com.example.scbaby.Model.DTO.GrowthRecord.Res.PageResponseDto;
 import com.example.scbaby.Model.DTO.Guide.GuideGetDTO;
 import com.example.scbaby.Service.GuideService;
 import io.swagger.v3.oas.annotations.Operation;

diff --git a/src/main/java/com/example/scbaby/Controller/ImageController.java b/src/main/java/com/example/scbaby/Controller/ImageController.java
@@ -2,7 +2,6 @@
 
 import com.example.scbaby.Model.DTO.Image.UrlListRes;
 import com.example.scbaby.Model.DTO.Image.UrlRes;
-import com.example.scbaby.Model.DTO.StateRes;
 import com.example.scbaby.Service.ImageService;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;

diff --git a/src/main/java/com/example/scbaby/Controller/SnackController.java b/src/main/java/com/example/scbaby/Controller/SnackController.java
@@ -1,13 +1,9 @@
 package com.example.scbaby.Controller;
 
-import com.example.scbaby.Model.DTO.BabyFood.Req.BabyFoodPostReq;
-import com.example.scbaby.Model.DTO.BabyFood.Res.BabyFoodDetailGetRes;
-import com.example.scbaby.Model.DTO.BabyFood.Res.BabyFoodListRes;
 import com.example.scbaby.Model.DTO.Snack.Req.SnackPostReq;
 import com.example.scbaby.Model.DTO.Snack.Res.SnackDetailGetRes;
 import com.example.scbaby.Model.DTO.Snack.Res.SnackListRes;
 import com.example.scbaby.Model.DTO.StateRes;
-import com.example.scbaby.Service.BabyFoodService;
 import com.example.scbaby.Service.SnackService;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;

diff --git a/src/main/java/com/example/scbaby/Controller/UserController.java b/src/main/java/com/example/scbaby/Controller/UserController.java
@@ -2,7 +2,6 @@
 
 import com.example.scbaby.Model.DTO.StateRes;
 import com.example.scbaby.Model.DTO.User.Req.AddBabyReq;
-import com.example.scbaby.Model.DTO.User.Req.UserGetReq;
 import com.example.scbaby.Model.DTO.User.Req.UserRegistReq;
 import com.example.scbaby.Model.DTO.User.Res.BabyIdGetRes;
 import com.example.scbaby.Model.DTO.User.Res.UserGetRes;

diff --git a/src/main/java/com/example/scbaby/Model/DAO/UserDAO.java b/src/main/java/com/example/scbaby/Model/DAO/UserDAO.java
@@ -3,8 +3,6 @@
 import jakarta.persistence.*;
 import lombok.*;
 
-import java.util.List;
-
 @Entity
 @Table(name = "users")
 @Getter

diff --git a/src/main/java/com/example/scbaby/Model/DTO/Guide/GuideGetDTO.java b/src/main/java/com/example/scbaby/Model/DTO/Guide/GuideGetDTO.java
@@ -2,7 +2,6 @@
 
 import lombok.*;
 
-import java.util.List;
 
 @Getter
 @Builder

diff --git a/src/main/java/com/example/scbaby/Model/DTO/StateRes.java b/src/main/java/com/example/scbaby/Model/DTO/StateRes.java
@@ -1,7 +1,6 @@
 package com.example.scbaby.Model.DTO;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -10,4 +9,4 @@
 @NoArgsConstructor
 public class StateRes {
     private boolean state;
-}
+}
diff --git a/src/main/java/com/example/scbaby/Model/DTO/User/Req/UserRegistReq.java b/src/main/java/com/example/scbaby/Model/DTO/User/Req/UserRegistReq.java
@@ -1,6 +1,5 @@
 package com.example.scbaby.Model.DTO.User.Req;
 
-import com.example.scbaby.Model.DAO.BabyDAO;
 import com.example.scbaby.Model.DAO.UserDAO;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;

diff --git a/src/main/java/com/example/scbaby/Repository/BabyFoodRepository.java b/src/main/java/com/example/scbaby/Repository/BabyFoodRepository.java
@@ -2,8 +2,6 @@
 
 import com.example.scbaby.Model.DAO.BabyDAO;
 import com.example.scbaby.Model.DAO.BabyFoodDAO;
-import com.example.scbaby.Model.DAO.BasePorridgeDAO;
-import com.example.scbaby.Model.DAO.DefecationDAO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

diff --git a/src/main/java/com/example/scbaby/Repository/BasePorridgeRepository.java b/src/main/java/com/example/scbaby/Repository/BasePorridgeRepository.java
@@ -2,10 +2,7 @@
 
 import com.example.scbaby.Model.DAO.BabyFoodDAO;
 import com.example.scbaby.Model.DAO.BasePorridgeDAO;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

diff --git a/src/main/java/com/example/scbaby/Repository/SnackRepository.java b/src/main/java/com/example/scbaby/Repository/SnackRepository.java
@@ -1,7 +1,6 @@
 package com.example.scbaby.Repository;
 
 import com.example.scbaby.Model.DAO.BabyDAO;
-import com.example.scbaby.Model.DAO.BabyFoodDAO;
 import com.example.scbaby.Model.DAO.SnackDAO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

diff --git a/src/main/java/com/example/scbaby/Service/BabyService.java b/src/main/java/com/example/scbaby/Service/BabyService.java
@@ -12,7 +12,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/src/main/java/com/example/scbaby/Service/SnackService.java b/src/main/java/com/example/scbaby/Service/SnackService.java
@@ -1,14 +1,8 @@
 package com.example.scbaby.Service;
 
-import com.example.scbaby.Bean.BabyFood.BabyFoodGetBean;
-import com.example.scbaby.Bean.BabyFood.BabyFoodListGetBean;
-import com.example.scbaby.Bean.BabyFood.BabyFoodPostBean;
 import com.example.scbaby.Bean.Snack.SnackGetBean;
 import com.example.scbaby.Bean.Snack.SnackListGetBean;
 import com.example.scbaby.Bean.Snack.SnackPostBean;
-import com.example.scbaby.Model.DTO.BabyFood.Req.BabyFoodPostReq;
-import com.example.scbaby.Model.DTO.BabyFood.Res.BabyFoodDetailGetRes;
-import com.example.scbaby.Model.DTO.BabyFood.Res.BabyFoodListRes;
 import com.example.scbaby.Model.DTO.Snack.Req.SnackPostReq;
 import com.example.scbaby.Model.DTO.Snack.Res.SnackDetailGetRes;
 import com.example.scbaby.Model.DTO.Snack.Res.SnackListRes;

diff --git a/src/main/java/com/example/scbaby/Service/UserService.java b/src/main/java/com/example/scbaby/Service/UserService.java
@@ -3,7 +3,6 @@
 import com.example.scbaby.Bean.UserBean.*;
 import com.example.scbaby.Model.DTO.StateRes;
 import com.example.scbaby.Model.DTO.User.Req.AddBabyReq;
-import com.example.scbaby.Model.DTO.User.Req.UserGetReq;
 import com.example.scbaby.Model.DTO.User.Req.UserRegistReq;
 import com.example.scbaby.Model.DTO.User.Res.BabyIdGetRes;
 import com.example.scbaby.Model.DTO.User.Res.UserGetRes;

diff --git a/src/test/java/com/example/scbaby/ScBabyApplicationTests.java b/src/test/java/com/example/scbaby/ScBabyApplicationTests.java
@@ -1,6 +1,5 @@
 package com.example.scbaby;
 
-import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest

diff --git a/src/test/java/com/example/scbaby/TestData.java b/src/test/java/com/example/scbaby/TestData.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     import lombok.*;
-    import java.util.List;
     @Getter
     @Builder
@@ Expand Down @@