From 268ea52dd93f2aa94c784240d64058e08b4747a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=88=EC=A0=95=ED=9B=84?= Date: Fri, 24 Mar 2023 15:34:33 +0900 Subject: [PATCH] refactor: code refactoring --- .../api/controller/OrderController.java | 101 ++++++++--------- .../api/controller/OriginalController.java | 44 ++++---- .../api/repository/OrderRepository.java | 103 +++++++++--------- .../api/repository/OriginalRepository.java | 14 +-- .../api/service/OrderServiceImpl.java | 7 +- .../api/service/OriginalServiceImpl.java | 1 - 6 files changed, 128 insertions(+), 142 deletions(-) diff --git a/src/main/java/com/dashboardbe/api/controller/OrderController.java b/src/main/java/com/dashboardbe/api/controller/OrderController.java index a4d6e53..fa6ad6b 100644 --- a/src/main/java/com/dashboardbe/api/controller/OrderController.java +++ b/src/main/java/com/dashboardbe/api/controller/OrderController.java @@ -1,13 +1,10 @@ package com.dashboardbe.api.controller; -import com.dashboardbe.aop.LoginCheck; -import com.dashboardbe.api.dto.*; +import com.dashboardbe.api.dto.ContentsOrderDTO; +import com.dashboardbe.api.dto.WeeklyVisitsDTO; import com.dashboardbe.api.repository.AdminRepository; import com.dashboardbe.api.service.OrderService; -import com.dashboardbe.common.SessionUtil; import com.dashboardbe.common.response.BaseResponseBody; -import com.dashboardbe.domain.Admin; -import com.dashboardbe.domain.Category; import com.dashboardbe.domain.MedicalDepartment; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -18,13 +15,11 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import org.yaml.snakeyaml.tokens.ScalarToken; import javax.servlet.http.HttpSession; import java.util.List; -import java.util.Optional; -@CrossOrigin(origins = "*", allowedHeaders = "*") +@CrossOrigin(origins = "*", allowedHeaders = "*") @RestController @RequiredArgsConstructor @RequestMapping(value = "/order") @@ -44,16 +39,16 @@ public ResponseEntity>> selectWeeklyHospital( HttpSession session ) { - List memberOrderHospitalDTOList = orderService.selectMemberHospital(); + List memberOrderHospitalDTOList = orderService.selectMemberHospital(); - return new ResponseEntity>>( - new BaseResponseBody>( - HttpStatus.OK.value(), - "성공", - memberOrderHospitalDTOList - ), - HttpStatus.OK - ); + return new ResponseEntity>>( + new BaseResponseBody>( + HttpStatus.OK.value(), + "성공", + memberOrderHospitalDTOList + ), + HttpStatus.OK + ); } @@ -67,16 +62,16 @@ public ResponseEntity>> selectWeeklyDep HttpSession session ) { - List memberOrderDepartmentDTOList = orderService.selectMemberDepartment(); + List memberOrderDepartmentDTOList = orderService.selectMemberDepartment(); - return new ResponseEntity>>( - new BaseResponseBody>( - HttpStatus.OK.value(), - "성공", - memberOrderDepartmentDTOList - ), - HttpStatus.OK - ); + return new ResponseEntity>>( + new BaseResponseBody>( + HttpStatus.OK.value(), + "성공", + memberOrderDepartmentDTOList + ), + HttpStatus.OK + ); } @@ -90,16 +85,16 @@ public ResponseEntity>> selectWeeklyCont HttpSession session ) { - List contentsOrderDTOList = orderService.selectContent(); + List contentsOrderDTOList = orderService.selectContent(); - return new ResponseEntity>>( - new BaseResponseBody>( - HttpStatus.OK.value(), - "성공", - contentsOrderDTOList - ), - HttpStatus.OK - ); + return new ResponseEntity>>( + new BaseResponseBody>( + HttpStatus.OK.value(), + "성공", + contentsOrderDTOList + ), + HttpStatus.OK + ); } @@ -113,16 +108,16 @@ public ResponseEntity>> selectWeeklyVisit HttpSession session ) { - List weeklyVisitsDTOList = orderService.selectWeeklyVisits(); + List weeklyVisitsDTOList = orderService.selectWeeklyVisits(); - return new ResponseEntity>>( - new BaseResponseBody>( - HttpStatus.OK.value(), - "성공", - weeklyVisitsDTOList - ), - HttpStatus.OK - ); + return new ResponseEntity>>( + new BaseResponseBody>( + HttpStatus.OK.value(), + "성공", + weeklyVisitsDTOList + ), + HttpStatus.OK + ); } @@ -140,16 +135,16 @@ public ResponseEntity>> selectContentsChanges( // // 올바른 관리자라면 // if (optionalAdmin.isPresent()) { - List changes = orderService.selectContentChanges(); + List changes = orderService.selectContentChanges(); - return new ResponseEntity>>( - new BaseResponseBody>( - HttpStatus.OK.value(), - "성공", - changes - ), - HttpStatus.OK - ); + return new ResponseEntity>>( + new BaseResponseBody>( + HttpStatus.OK.value(), + "성공", + changes + ), + HttpStatus.OK + ); // } else { // return new ResponseEntity>>( diff --git a/src/main/java/com/dashboardbe/api/controller/OriginalController.java b/src/main/java/com/dashboardbe/api/controller/OriginalController.java index 1434494..4cf9607 100644 --- a/src/main/java/com/dashboardbe/api/controller/OriginalController.java +++ b/src/main/java/com/dashboardbe/api/controller/OriginalController.java @@ -1,14 +1,10 @@ package com.dashboardbe.api.controller; -import com.dashboardbe.aop.LoginCheck; import com.dashboardbe.api.dto.original.OriginalContentsDTO; -import com.dashboardbe.api.dto.original.OriginalWeeklyInfoDTO; import com.dashboardbe.api.dto.original.WeeklyInfoResponseDTO; import com.dashboardbe.api.repository.AdminRepository; import com.dashboardbe.api.service.OriginalService; -import com.dashboardbe.common.SessionUtil; import com.dashboardbe.common.response.BaseResponseBody; -import com.dashboardbe.domain.Admin; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -16,12 +12,10 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import javax.lang.model.util.Elements; import javax.servlet.http.HttpSession; import java.util.List; -import java.util.Optional; -@CrossOrigin(origins = "*", allowedHeaders = "*") +@CrossOrigin(origins = "*", allowedHeaders = "*") @RestController @RequiredArgsConstructor @RequestMapping(value = "/original") @@ -41,17 +35,17 @@ public ResponseEntity> selectWeeklyInfo( HttpSession session ) { - WeeklyInfoResponseDTO weeklyInfo = originalService.selectWeeklyInfo(); + WeeklyInfoResponseDTO weeklyInfo = originalService.selectWeeklyInfo(); - return new ResponseEntity>( - new BaseResponseBody( - HttpStatus.OK.value(), - "성공", - weeklyInfo + return new ResponseEntity>( + new BaseResponseBody( + HttpStatus.OK.value(), + "성공", + weeklyInfo - ), - HttpStatus.OK - ); + ), + HttpStatus.OK + ); } @@ -74,16 +68,16 @@ public ResponseEntity>> selectCon OriginalContentsDTO.Req request = new OriginalContentsDTO.Req(countYn, searchWord); - List ContentsInfo = originalService.selectContentsInfo(request); + List ContentsInfo = originalService.selectContentsInfo(request); - return new ResponseEntity>>( - new BaseResponseBody>( - HttpStatus.OK.value(), - "성공", - ContentsInfo - ), - HttpStatus.OK - ); + return new ResponseEntity>>( + new BaseResponseBody>( + HttpStatus.OK.value(), + "성공", + ContentsInfo + ), + HttpStatus.OK + ); // } else { // return new ResponseEntity>>( diff --git a/src/main/java/com/dashboardbe/api/repository/OrderRepository.java b/src/main/java/com/dashboardbe/api/repository/OrderRepository.java index 32491f8..fcb7ae3 100644 --- a/src/main/java/com/dashboardbe/api/repository/OrderRepository.java +++ b/src/main/java/com/dashboardbe/api/repository/OrderRepository.java @@ -1,6 +1,9 @@ package com.dashboardbe.api.repository; -import com.dashboardbe.api.dto.*; +import com.dashboardbe.api.dto.ContentsChangesDTO; +import com.dashboardbe.api.dto.ContentsOrderDTO; +import com.dashboardbe.api.dto.WeeklyVisitsDTO; +import com.dashboardbe.api.dto.YestWeekReqDTO; import com.dashboardbe.domain.*; import com.querydsl.core.types.ExpressionUtils; import com.querydsl.core.types.Projections; @@ -50,7 +53,7 @@ public List selectDepartmentInMemberAnalysis(YestWeekReqDTO y QMemberAnalysis m = QMemberAnalysis.memberAnalysis; - return (List) jpaQueryFactory + return jpaQueryFactory .select( m.medicalDepartment.as("medicalDepartment") ) @@ -95,42 +98,42 @@ public List findWeeklyVisitsInMember(YestWeekReqDTO yestWeekReq WeeklyVisitsDTO.class, - ExpressionUtils.as( - JPAExpressions - .select(c.contents.count()) - .from(c) - .where(c.visitDate.between(yestWeekReqDTO.getYestWeek(), yestWeekReqDTO.getYestDay())), - "ContentsHits" - ), - - ExpressionUtils.as( - JPAExpressions - .select(m.name.count()) - .from(m) - .where(m.createTime.between(yestWeekReqDTO.getYestWeek(), yestWeekReqDTO.getYestDay())), - "all" - ), - - ExpressionUtils.as( - JPAExpressions - .select(m.name.count()) - .from(m) - .where( - m.createTime.between(yestWeekReqDTO.getYestWeek(), yestWeekReqDTO.getYestDay()), - m.isMember.eq("N") - ), - "quit" - ), - - ExpressionUtils.as( - JPAExpressions - .select(m.name.count()) - .from(m) - .where( - m.createTime.between(LocalDateTime.now().minusDays(2), LocalDateTime.now().minusDays(1)) - ), - "newbie" - ) + ExpressionUtils.as( + JPAExpressions + .select(c.contents.count()) + .from(c) + .where(c.visitDate.between(yestWeekReqDTO.getYestWeek(), yestWeekReqDTO.getYestDay())), + "ContentsHits" + ), + + ExpressionUtils.as( + JPAExpressions + .select(m.name.count()) + .from(m) + .where(m.createTime.between(yestWeekReqDTO.getYestWeek(), yestWeekReqDTO.getYestDay())), + "all" + ), + + ExpressionUtils.as( + JPAExpressions + .select(m.name.count()) + .from(m) + .where( + m.createTime.between(yestWeekReqDTO.getYestWeek(), yestWeekReqDTO.getYestDay()), + m.isMember.eq("N") + ), + "quit" + ), + + ExpressionUtils.as( + JPAExpressions + .select(m.name.count()) + .from(m) + .where( + m.createTime.between(LocalDateTime.now().minusDays(2), LocalDateTime.now().minusDays(1)) + ), + "newbie" + ) ) @@ -152,20 +155,20 @@ public List findYestContentChanges(YestWeekReqDTO yestWe ContentsChangesDTO.Req.class, // Math.toIntExact( - ExpressionUtils.as( - JPAExpressions - .select(m.category.count()) - .from(m) - .where(m.visitDate.between(yestWeekReqDTO.getYestWeek(), yestWeekReqDTO.getYestDay())), - "thisWeek"), + ExpressionUtils.as( + JPAExpressions + .select(m.category.count()) + .from(m) + .where(m.visitDate.between(yestWeekReqDTO.getYestWeek(), yestWeekReqDTO.getYestDay())), + "thisWeek"), // ), // Math.toIntExact( - ExpressionUtils.as( - JPAExpressions - .select(m.category.count()) - .from(m) - .where(m.visitDate.between(yestWeekReqDTO.getPastWeek(), yestWeekReqDTO.getYestWeek())), - "pastWeek") + ExpressionUtils.as( + JPAExpressions + .select(m.category.count()) + .from(m) + .where(m.visitDate.between(yestWeekReqDTO.getPastWeek(), yestWeekReqDTO.getYestWeek())), + "pastWeek") // ) ) diff --git a/src/main/java/com/dashboardbe/api/repository/OriginalRepository.java b/src/main/java/com/dashboardbe/api/repository/OriginalRepository.java index 9feb1d8..e7f5cfb 100644 --- a/src/main/java/com/dashboardbe/api/repository/OriginalRepository.java +++ b/src/main/java/com/dashboardbe/api/repository/OriginalRepository.java @@ -1,15 +1,9 @@ package com.dashboardbe.api.repository; -import com.dashboardbe.api.dto.ContentsChangesDTO; -import com.dashboardbe.api.dto.MemberOrderHospitalDTO; -import com.dashboardbe.api.dto.YestWeekReqDTO; import com.dashboardbe.api.dto.original.OriginalContentsDTO; -import com.dashboardbe.api.dto.original.OriginalWeeklyInfoDTO; import com.dashboardbe.api.dto.original.WeeklyInfoResponseDTO; import com.dashboardbe.domain.*; -import com.querydsl.core.types.ExpressionUtils; import com.querydsl.core.types.Projections; -import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQueryFactory; import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport; import org.springframework.stereotype.Repository; @@ -32,7 +26,7 @@ public OriginalRepository(EntityManager entityManager, JPAQueryFactory jpaQueryF this.jpaQueryFactory = jpaQueryFactory; } - public WeeklyInfoResponseDTO selectWeeklyInfo () { + public WeeklyInfoResponseDTO selectWeeklyInfo() { QContentsAnalysis ca = QContentsAnalysis.contentsAnalysis; QMemberAnalysis ma = QMemberAnalysis.memberAnalysis; @@ -50,7 +44,7 @@ public WeeklyInfoResponseDTO selectWeeklyInfo () { .select(ca.contents.id.count()) .from(ca) .where(ca.visitDate.between(yestWeek, yestDay) - ,(ca.category.eq(Category.ORIGINAL))) + , (ca.category.eq(Category.ORIGINAL))) .groupBy(ca.contents.id) .orderBy(ca.contents.id.count().desc()) .fetchFirst(); @@ -112,9 +106,9 @@ public WeeklyInfoResponseDTO selectWeeklyInfo () { } - public List selectContentsInfo (OriginalContentsDTO.Req request) { + public List selectContentsInfo(OriginalContentsDTO.Req request) { - QContents c = QContents.contents; + QContents c = QContents.contents; return jpaQueryFactory .select( diff --git a/src/main/java/com/dashboardbe/api/service/OrderServiceImpl.java b/src/main/java/com/dashboardbe/api/service/OrderServiceImpl.java index b1a3fc1..1160f25 100644 --- a/src/main/java/com/dashboardbe/api/service/OrderServiceImpl.java +++ b/src/main/java/com/dashboardbe/api/service/OrderServiceImpl.java @@ -1,10 +1,11 @@ package com.dashboardbe.api.service; -import com.dashboardbe.api.dto.*; +import com.dashboardbe.api.dto.ContentsChangesDTO; +import com.dashboardbe.api.dto.ContentsOrderDTO; +import com.dashboardbe.api.dto.WeeklyVisitsDTO; +import com.dashboardbe.api.dto.YestWeekReqDTO; import com.dashboardbe.api.repository.OrderRepository; -import com.dashboardbe.domain.Category; import com.dashboardbe.domain.MedicalDepartment; -import com.dashboardbe.domain.Member; import lombok.RequiredArgsConstructor; import org.modelmapper.ModelMapper; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/dashboardbe/api/service/OriginalServiceImpl.java b/src/main/java/com/dashboardbe/api/service/OriginalServiceImpl.java index 1f62a0c..f1f6830 100644 --- a/src/main/java/com/dashboardbe/api/service/OriginalServiceImpl.java +++ b/src/main/java/com/dashboardbe/api/service/OriginalServiceImpl.java @@ -1,7 +1,6 @@ package com.dashboardbe.api.service; import com.dashboardbe.api.dto.original.OriginalContentsDTO; -import com.dashboardbe.api.dto.original.OriginalWeeklyInfoDTO; import com.dashboardbe.api.dto.original.WeeklyInfoResponseDTO; import com.dashboardbe.api.repository.OriginalRepository; import lombok.RequiredArgsConstructor;