diff --git a/src/main/java/com/example/let_server/LetServerApplication.java b/src/main/java/com/example/let/server/LetServerApplication.java similarity index 93% rename from src/main/java/com/example/let_server/LetServerApplication.java rename to src/main/java/com/example/let/server/LetServerApplication.java index 0280b1f..a5bc62e 100644 --- a/src/main/java/com/example/let_server/LetServerApplication.java +++ b/src/main/java/com/example/let/server/LetServerApplication.java @@ -1,4 +1,4 @@ -package com.example.let_server; +package com.example.let.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/example/let_server/domain/allergy/domain/Allergy.java b/src/main/java/com/example/let/server/domain/allergy/domain/Allergy.java similarity index 82% rename from src/main/java/com/example/let_server/domain/allergy/domain/Allergy.java rename to src/main/java/com/example/let/server/domain/allergy/domain/Allergy.java index 217adaa..bead263 100644 --- a/src/main/java/com/example/let_server/domain/allergy/domain/Allergy.java +++ b/src/main/java/com/example/let/server/domain/allergy/domain/Allergy.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.allergy.domain; +package com.example.let.server.domain.allergy.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/let_server/domain/allergy/dto/response/AllergyResponse.java b/src/main/java/com/example/let/server/domain/allergy/dto/response/AllergyResponse.java similarity index 80% rename from src/main/java/com/example/let_server/domain/allergy/dto/response/AllergyResponse.java rename to src/main/java/com/example/let/server/domain/allergy/dto/response/AllergyResponse.java index 31fd44c..14de83b 100644 --- a/src/main/java/com/example/let_server/domain/allergy/dto/response/AllergyResponse.java +++ b/src/main/java/com/example/let/server/domain/allergy/dto/response/AllergyResponse.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.allergy.dto.response; +package com.example.let.server.domain.allergy.dto.response; -import com.example.let_server.domain.allergy.domain.Allergy; +import com.example.let.server.domain.allergy.domain.Allergy; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/allergy/error/AllergyError.java b/src/main/java/com/example/let/server/domain/allergy/error/AllergyError.java similarity index 75% rename from src/main/java/com/example/let_server/domain/allergy/error/AllergyError.java rename to src/main/java/com/example/let/server/domain/allergy/error/AllergyError.java index ff69ee9..7413735 100644 --- a/src/main/java/com/example/let_server/domain/allergy/error/AllergyError.java +++ b/src/main/java/com/example/let/server/domain/allergy/error/AllergyError.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.allergy.error; +package com.example.let.server.domain.allergy.error; -import com.example.let_server.global.error.CustomError; +import com.example.let.server.global.error.CustomError; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/let_server/domain/allergy/mapper/AllergyMapper.java b/src/main/java/com/example/let/server/domain/allergy/mapper/AllergyMapper.java similarity index 60% rename from src/main/java/com/example/let_server/domain/allergy/mapper/AllergyMapper.java rename to src/main/java/com/example/let/server/domain/allergy/mapper/AllergyMapper.java index f028809..0aa4e94 100644 --- a/src/main/java/com/example/let_server/domain/allergy/mapper/AllergyMapper.java +++ b/src/main/java/com/example/let/server/domain/allergy/mapper/AllergyMapper.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.allergy.mapper; +package com.example.let.server.domain.allergy.mapper; -import com.example.let_server.domain.allergy.domain.Allergy; +import com.example.let.server.domain.allergy.domain.Allergy; import org.apache.ibatis.annotations.Mapper; import java.util.Optional; diff --git a/src/main/java/com/example/let_server/domain/allergy/repository/AllergyRepository.java b/src/main/java/com/example/let/server/domain/allergy/repository/AllergyRepository.java similarity index 51% rename from src/main/java/com/example/let_server/domain/allergy/repository/AllergyRepository.java rename to src/main/java/com/example/let/server/domain/allergy/repository/AllergyRepository.java index 78a1079..e6cf375 100644 --- a/src/main/java/com/example/let_server/domain/allergy/repository/AllergyRepository.java +++ b/src/main/java/com/example/let/server/domain/allergy/repository/AllergyRepository.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.allergy.repository; +package com.example.let.server.domain.allergy.repository; -import com.example.let_server.domain.allergy.domain.Allergy; +import com.example.let.server.domain.allergy.domain.Allergy; import java.util.Optional; diff --git a/src/main/java/com/example/let_server/domain/allergy/repository/MybatisAllergyRepository.java b/src/main/java/com/example/let/server/domain/allergy/repository/MybatisAllergyRepository.java similarity index 66% rename from src/main/java/com/example/let_server/domain/allergy/repository/MybatisAllergyRepository.java rename to src/main/java/com/example/let/server/domain/allergy/repository/MybatisAllergyRepository.java index 1ff0f02..e131336 100644 --- a/src/main/java/com/example/let_server/domain/allergy/repository/MybatisAllergyRepository.java +++ b/src/main/java/com/example/let/server/domain/allergy/repository/MybatisAllergyRepository.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.allergy.repository; +package com.example.let.server.domain.allergy.repository; -import com.example.let_server.domain.allergy.domain.Allergy; -import com.example.let_server.domain.allergy.mapper.AllergyMapper; +import com.example.let.server.domain.allergy.domain.Allergy; +import com.example.let.server.domain.allergy.mapper.AllergyMapper; import lombok.RequiredArgsConstructor; import java.util.Optional; diff --git a/src/main/java/com/example/let/server/domain/allergy/service/AllergyService.java b/src/main/java/com/example/let/server/domain/allergy/service/AllergyService.java new file mode 100644 index 0000000..aaa6aac --- /dev/null +++ b/src/main/java/com/example/let/server/domain/allergy/service/AllergyService.java @@ -0,0 +1,7 @@ +package com.example.let.server.domain.allergy.service; + +import com.example.let.server.domain.allergy.domain.Allergy; + +public interface AllergyService { + Allergy findByAllergyId(Long allergyId); +} diff --git a/src/main/java/com/example/let_server/domain/allergy/service/impl/AllergyServiceImpl.java b/src/main/java/com/example/let/server/domain/allergy/service/impl/AllergyServiceImpl.java similarity index 54% rename from src/main/java/com/example/let_server/domain/allergy/service/impl/AllergyServiceImpl.java rename to src/main/java/com/example/let/server/domain/allergy/service/impl/AllergyServiceImpl.java index 34444ab..e3c9438 100644 --- a/src/main/java/com/example/let_server/domain/allergy/service/impl/AllergyServiceImpl.java +++ b/src/main/java/com/example/let/server/domain/allergy/service/impl/AllergyServiceImpl.java @@ -1,15 +1,13 @@ -package com.example.let_server.domain.allergy.service.impl; +package com.example.let.server.domain.allergy.service.impl; -import com.example.let_server.domain.allergy.domain.Allergy; -import com.example.let_server.domain.allergy.error.AllergyError; -import com.example.let_server.domain.allergy.repository.AllergyRepository; -import com.example.let_server.domain.allergy.service.AllergyService; -import com.example.let_server.global.error.CustomException; +import com.example.let.server.domain.allergy.domain.Allergy; +import com.example.let.server.domain.allergy.error.AllergyError; +import com.example.let.server.domain.allergy.repository.AllergyRepository; +import com.example.let.server.domain.allergy.service.AllergyService; +import com.example.let.server.global.error.CustomException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.Optional; - @Service @RequiredArgsConstructor public class AllergyServiceImpl implements AllergyService { diff --git a/src/main/java/com/example/let_server/domain/auth/controller/AuthController.java b/src/main/java/com/example/let/server/domain/auth/controller/AuthController.java similarity index 75% rename from src/main/java/com/example/let_server/domain/auth/controller/AuthController.java rename to src/main/java/com/example/let/server/domain/auth/controller/AuthController.java index 0171879..624c371 100644 --- a/src/main/java/com/example/let_server/domain/auth/controller/AuthController.java +++ b/src/main/java/com/example/let/server/domain/auth/controller/AuthController.java @@ -1,11 +1,11 @@ -package com.example.let_server.domain.auth.controller; - -import com.example.let_server.domain.auth.dto.request.LoginRequest; -import com.example.let_server.domain.auth.dto.request.ReissueRequest; -import com.example.let_server.domain.auth.dto.request.SignUpRequest; -import com.example.let_server.domain.auth.service.AuthService; -import com.example.let_server.global.common.BaseResponse; -import com.example.let_server.global.security.jwt.dto.Jwt; +package com.example.let.server.domain.auth.controller; + +import com.example.let.server.domain.auth.dto.request.LoginRequest; +import com.example.let.server.domain.auth.dto.request.ReissueRequest; +import com.example.let.server.domain.auth.dto.request.SignUpRequest; +import com.example.let.server.domain.auth.service.AuthService; +import com.example.let.server.global.common.BaseResponse; +import com.example.let.server.global.security.jwt.dto.Jwt; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/example/let_server/domain/auth/docs/AuthDocs.java b/src/main/java/com/example/let/server/domain/auth/docs/AuthDocs.java similarity index 77% rename from src/main/java/com/example/let_server/domain/auth/docs/AuthDocs.java rename to src/main/java/com/example/let/server/domain/auth/docs/AuthDocs.java index 1eb1acf..97ff3ec 100644 --- a/src/main/java/com/example/let_server/domain/auth/docs/AuthDocs.java +++ b/src/main/java/com/example/let/server/domain/auth/docs/AuthDocs.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.auth.docs; +package com.example.let.server.domain.auth.docs; -import com.example.let_server.global.common.BaseResponse; -import com.example.let_server.global.security.jwt.dto.Jwt; +import com.example.let.server.global.common.BaseResponse; +import com.example.let.server.global.security.jwt.dto.Jwt; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/example/let_server/domain/auth/dto/request/LoginRequest.java b/src/main/java/com/example/let/server/domain/auth/dto/request/LoginRequest.java similarity index 60% rename from src/main/java/com/example/let_server/domain/auth/dto/request/LoginRequest.java rename to src/main/java/com/example/let/server/domain/auth/dto/request/LoginRequest.java index bb811a1..65ab9c7 100644 --- a/src/main/java/com/example/let_server/domain/auth/dto/request/LoginRequest.java +++ b/src/main/java/com/example/let/server/domain/auth/dto/request/LoginRequest.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.auth.dto.request; +package com.example.let.server.domain.auth.dto.request; public record LoginRequest( String username, diff --git a/src/main/java/com/example/let_server/domain/auth/dto/request/ReissueRequest.java b/src/main/java/com/example/let/server/domain/auth/dto/request/ReissueRequest.java similarity index 53% rename from src/main/java/com/example/let_server/domain/auth/dto/request/ReissueRequest.java rename to src/main/java/com/example/let/server/domain/auth/dto/request/ReissueRequest.java index 9eed4a5..9614d4e 100644 --- a/src/main/java/com/example/let_server/domain/auth/dto/request/ReissueRequest.java +++ b/src/main/java/com/example/let/server/domain/auth/dto/request/ReissueRequest.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.auth.dto.request; +package com.example.let.server.domain.auth.dto.request; public record ReissueRequest( String refreshToken diff --git a/src/main/java/com/example/let_server/domain/auth/dto/request/SignUpRequest.java b/src/main/java/com/example/let/server/domain/auth/dto/request/SignUpRequest.java similarity index 86% rename from src/main/java/com/example/let_server/domain/auth/dto/request/SignUpRequest.java rename to src/main/java/com/example/let/server/domain/auth/dto/request/SignUpRequest.java index a4a50bc..a8eedff 100644 --- a/src/main/java/com/example/let_server/domain/auth/dto/request/SignUpRequest.java +++ b/src/main/java/com/example/let/server/domain/auth/dto/request/SignUpRequest.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.auth.dto.request; +package com.example.let.server.domain.auth.dto.request; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/example/let_server/domain/auth/error/AuthError.java b/src/main/java/com/example/let/server/domain/auth/error/AuthError.java similarity index 75% rename from src/main/java/com/example/let_server/domain/auth/error/AuthError.java rename to src/main/java/com/example/let/server/domain/auth/error/AuthError.java index 26e2c47..4eee631 100644 --- a/src/main/java/com/example/let_server/domain/auth/error/AuthError.java +++ b/src/main/java/com/example/let/server/domain/auth/error/AuthError.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.auth.error; +package com.example.let.server.domain.auth.error; -import com.example.let_server.global.error.CustomError; +import com.example.let.server.global.error.CustomError; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/let_server/domain/auth/repository/RefreshTokenRepository.java b/src/main/java/com/example/let/server/domain/auth/repository/RefreshTokenRepository.java similarity index 81% rename from src/main/java/com/example/let_server/domain/auth/repository/RefreshTokenRepository.java rename to src/main/java/com/example/let/server/domain/auth/repository/RefreshTokenRepository.java index 29cb906..c7d78a3 100644 --- a/src/main/java/com/example/let_server/domain/auth/repository/RefreshTokenRepository.java +++ b/src/main/java/com/example/let/server/domain/auth/repository/RefreshTokenRepository.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.auth.repository; +package com.example.let.server.domain.auth.repository; public interface RefreshTokenRepository { void save(String username, String refreshToken); diff --git a/src/main/java/com/example/let_server/domain/auth/repository/impl/RefreshTokenRepositoryImpl.java b/src/main/java/com/example/let/server/domain/auth/repository/impl/RefreshTokenRepositoryImpl.java similarity index 63% rename from src/main/java/com/example/let_server/domain/auth/repository/impl/RefreshTokenRepositoryImpl.java rename to src/main/java/com/example/let/server/domain/auth/repository/impl/RefreshTokenRepositoryImpl.java index ebe83f9..69f1f55 100644 --- a/src/main/java/com/example/let_server/domain/auth/repository/impl/RefreshTokenRepositoryImpl.java +++ b/src/main/java/com/example/let/server/domain/auth/repository/impl/RefreshTokenRepositoryImpl.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.auth.repository.impl; +package com.example.let.server.domain.auth.repository.impl; -import com.example.let_server.domain.auth.repository.RefreshTokenRepository; +import com.example.let.server.domain.auth.repository.RefreshTokenRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Repository; @@ -8,17 +8,18 @@ @Repository @RequiredArgsConstructor public class RefreshTokenRepositoryImpl implements RefreshTokenRepository { - private final RedisTemplate redisTemplate; + private static final String KEY_PREFIX = "refresh_token:"; + private final RedisTemplate redisTemplate; @Override public void save(String username, String refreshToken) { - redisTemplate.opsForValue().set("refresh_token:" + username, refreshToken); + redisTemplate.opsForValue().set(KEY_PREFIX + username, refreshToken); } @Override public String findByUsername(String username) { - return redisTemplate.opsForValue().get("refresh_token:" + username); + return redisTemplate.opsForValue().get(KEY_PREFIX + username); } @Override @@ -28,6 +29,6 @@ public void deleteByUsername(String username) { @Override public Boolean existsByUsername(String username) { - return redisTemplate.hasKey("refresh_token:" + username); + return redisTemplate.hasKey(KEY_PREFIX + username); } } diff --git a/src/main/java/com/example/let/server/domain/auth/service/AuthService.java b/src/main/java/com/example/let/server/domain/auth/service/AuthService.java new file mode 100644 index 0000000..d3e23cb --- /dev/null +++ b/src/main/java/com/example/let/server/domain/auth/service/AuthService.java @@ -0,0 +1,14 @@ +package com.example.let.server.domain.auth.service; + +import com.example.let.server.domain.auth.dto.request.LoginRequest; +import com.example.let.server.domain.auth.dto.request.ReissueRequest; +import com.example.let.server.domain.auth.dto.request.SignUpRequest; +import com.example.let.server.global.security.jwt.dto.Jwt; + +public interface AuthService { + void signup(SignUpRequest request); + + Jwt login(LoginRequest request); + + Jwt reissue(ReissueRequest request); +} diff --git a/src/main/java/com/example/let_server/domain/auth/service/impl/AuthServiceImpl.java b/src/main/java/com/example/let/server/domain/auth/service/impl/AuthServiceImpl.java similarity index 72% rename from src/main/java/com/example/let_server/domain/auth/service/impl/AuthServiceImpl.java rename to src/main/java/com/example/let/server/domain/auth/service/impl/AuthServiceImpl.java index 2e7de0d..b6c07e3 100644 --- a/src/main/java/com/example/let_server/domain/auth/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/example/let/server/domain/auth/service/impl/AuthServiceImpl.java @@ -1,20 +1,20 @@ -package com.example.let_server.domain.auth.service.impl; - -import com.example.let_server.domain.auth.dto.request.LoginRequest; -import com.example.let_server.domain.auth.dto.request.ReissueRequest; -import com.example.let_server.domain.auth.dto.request.SignUpRequest; -import com.example.let_server.domain.auth.error.AuthError; -import com.example.let_server.domain.auth.repository.RefreshTokenRepository; -import com.example.let_server.domain.auth.service.AuthService; -import com.example.let_server.domain.user.domain.User; -import com.example.let_server.domain.user.domain.UserRole; -import com.example.let_server.domain.user.error.UserError; -import com.example.let_server.domain.user.repository.UserRepository; -import com.example.let_server.global.error.CustomException; -import com.example.let_server.global.security.jwt.dto.Jwt; -import com.example.let_server.global.security.jwt.enums.JwtType; -import com.example.let_server.global.security.jwt.error.JwtError; -import com.example.let_server.global.security.jwt.provider.JwtProvider; +package com.example.let.server.domain.auth.service.impl; + +import com.example.let.server.domain.auth.dto.request.LoginRequest; +import com.example.let.server.domain.auth.dto.request.ReissueRequest; +import com.example.let.server.domain.auth.dto.request.SignUpRequest; +import com.example.let.server.domain.auth.error.AuthError; +import com.example.let.server.domain.auth.repository.RefreshTokenRepository; +import com.example.let.server.domain.auth.service.AuthService; +import com.example.let.server.domain.user.domain.User; +import com.example.let.server.domain.user.domain.UserRole; +import com.example.let.server.domain.user.error.UserError; +import com.example.let.server.domain.user.repository.UserRepository; +import com.example.let.server.global.error.CustomException; +import com.example.let.server.global.security.jwt.dto.Jwt; +import com.example.let.server.global.security.jwt.enums.JwtType; +import com.example.let.server.global.security.jwt.error.JwtError; +import com.example.let.server.global.security.jwt.provider.JwtProvider; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/let_server/domain/eater/controller/EaterController.java b/src/main/java/com/example/let/server/domain/eater/controller/EaterController.java similarity index 81% rename from src/main/java/com/example/let_server/domain/eater/controller/EaterController.java rename to src/main/java/com/example/let/server/domain/eater/controller/EaterController.java index d2262ec..6e3cbdf 100644 --- a/src/main/java/com/example/let_server/domain/eater/controller/EaterController.java +++ b/src/main/java/com/example/let/server/domain/eater/controller/EaterController.java @@ -1,11 +1,11 @@ -package com.example.let_server.domain.eater.controller; - -import com.example.let_server.domain.eater.docs.EaterDocs; -import com.example.let_server.domain.eater.dto.response.EaterRatioResponse; -import com.example.let_server.domain.eater.dto.response.EaterResponse; -import com.example.let_server.domain.eater.dto.response.UserCalorieResponse; -import com.example.let_server.domain.eater.service.EaterService; -import com.example.let_server.global.common.BaseResponse; +package com.example.let.server.domain.eater.controller; + +import com.example.let.server.domain.eater.docs.EaterDocs; +import com.example.let.server.domain.eater.dto.response.EaterRatioResponse; +import com.example.let.server.domain.eater.dto.response.EaterResponse; +import com.example.let.server.domain.eater.dto.response.UserCalorieResponse; +import com.example.let.server.domain.eater.service.EaterService; +import com.example.let.server.global.common.BaseResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.format.annotation.DateTimeFormat; diff --git a/src/main/java/com/example/let_server/domain/eater/docs/EaterDocs.java b/src/main/java/com/example/let/server/domain/eater/docs/EaterDocs.java similarity index 92% rename from src/main/java/com/example/let_server/domain/eater/docs/EaterDocs.java rename to src/main/java/com/example/let/server/domain/eater/docs/EaterDocs.java index e1f9cfb..2a308ca 100644 --- a/src/main/java/com/example/let_server/domain/eater/docs/EaterDocs.java +++ b/src/main/java/com/example/let/server/domain/eater/docs/EaterDocs.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.eater.docs; +package com.example.let.server.domain.eater.docs; -import com.example.let_server.domain.eater.dto.response.EaterRatioResponse; -import com.example.let_server.domain.eater.dto.response.EaterResponse; -import com.example.let_server.domain.eater.dto.response.UserCalorieResponse; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.eater.dto.response.EaterRatioResponse; +import com.example.let.server.domain.eater.dto.response.EaterResponse; +import com.example.let.server.domain.eater.dto.response.UserCalorieResponse; +import com.example.let.server.global.common.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -19,7 +19,7 @@ @Tag(name = "eater", description = "식사자 관련 API") public interface EaterDocs { - + @Operation(summary = "학년별 식사자 조회", description = "특정 학년의 식사자 목록을 조회합니다.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "식사자 조회 성공"), @@ -71,8 +71,8 @@ ResponseEntity>> getMealRateByGrade( ResponseEntity> getUserEatenMeals( @Parameter(description = "사용자 ID", example = "1") @PathVariable Long userId, - + @Parameter(description = "조회할 날짜 (yyyy-MM-dd 형식)", example = "2024-08-17") @PathVariable @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate date ); -} \ No newline at end of file +} diff --git a/src/main/java/com/example/let_server/domain/eater/domain/Eater.java b/src/main/java/com/example/let/server/domain/eater/domain/Eater.java similarity index 64% rename from src/main/java/com/example/let_server/domain/eater/domain/Eater.java rename to src/main/java/com/example/let/server/domain/eater/domain/Eater.java index 15d36bb..8007800 100644 --- a/src/main/java/com/example/let_server/domain/eater/domain/Eater.java +++ b/src/main/java/com/example/let/server/domain/eater/domain/Eater.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.eater.domain; +package com.example.let.server.domain.eater.domain; -import com.example.let_server.domain.meal.domain.Meal; -import com.example.let_server.domain.user.domain.User; +import com.example.let.server.domain.meal.domain.Meal; +import com.example.let.server.domain.user.domain.User; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/let_server/domain/eater/dto/response/EaterRatioResponse.java b/src/main/java/com/example/let/server/domain/eater/dto/response/EaterRatioResponse.java similarity index 60% rename from src/main/java/com/example/let_server/domain/eater/dto/response/EaterRatioResponse.java rename to src/main/java/com/example/let/server/domain/eater/dto/response/EaterRatioResponse.java index 8260ee4..d248ae0 100644 --- a/src/main/java/com/example/let_server/domain/eater/dto/response/EaterRatioResponse.java +++ b/src/main/java/com/example/let/server/domain/eater/dto/response/EaterRatioResponse.java @@ -1,12 +1,12 @@ -package com.example.let_server.domain.eater.dto.response; +package com.example.let.server.domain.eater.dto.response; import lombok.Builder; @Builder -public record EaterRatioResponse ( +public record EaterRatioResponse( String mealType, Integer grade1Ration, Integer grade2Ration, Integer grade3Ration -){ +) { } diff --git a/src/main/java/com/example/let_server/domain/eater/dto/response/EaterResponse.java b/src/main/java/com/example/let/server/domain/eater/dto/response/EaterResponse.java similarity index 70% rename from src/main/java/com/example/let_server/domain/eater/dto/response/EaterResponse.java rename to src/main/java/com/example/let/server/domain/eater/dto/response/EaterResponse.java index 49a0374..8ee27d0 100644 --- a/src/main/java/com/example/let_server/domain/eater/dto/response/EaterResponse.java +++ b/src/main/java/com/example/let/server/domain/eater/dto/response/EaterResponse.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.eater.dto.response; +package com.example.let.server.domain.eater.dto.response; -import com.example.let_server.domain.eater.domain.Eater; -import com.example.let_server.domain.user.dto.response.UserEaterResponse; +import com.example.let.server.domain.eater.domain.Eater; +import com.example.let.server.domain.user.dto.response.UserEaterResponse; import lombok.Builder; diff --git a/src/main/java/com/example/let_server/domain/eater/dto/response/UserCalorieResponse.java b/src/main/java/com/example/let/server/domain/eater/dto/response/UserCalorieResponse.java similarity index 88% rename from src/main/java/com/example/let_server/domain/eater/dto/response/UserCalorieResponse.java rename to src/main/java/com/example/let/server/domain/eater/dto/response/UserCalorieResponse.java index ff5e61b..b1c5706 100644 --- a/src/main/java/com/example/let_server/domain/eater/dto/response/UserCalorieResponse.java +++ b/src/main/java/com/example/let/server/domain/eater/dto/response/UserCalorieResponse.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.eater.dto.response; +package com.example.let.server.domain.eater.dto.response; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/eater/error/EaterError.java b/src/main/java/com/example/let/server/domain/eater/error/EaterError.java similarity index 76% rename from src/main/java/com/example/let_server/domain/eater/error/EaterError.java rename to src/main/java/com/example/let/server/domain/eater/error/EaterError.java index a7b7d47..56781b6 100644 --- a/src/main/java/com/example/let_server/domain/eater/error/EaterError.java +++ b/src/main/java/com/example/let/server/domain/eater/error/EaterError.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.eater.error; +package com.example.let.server.domain.eater.error; -import com.example.let_server.global.error.CustomError; +import com.example.let.server.global.error.CustomError; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/let_server/domain/eater/mapper/EaterMapper.java b/src/main/java/com/example/let/server/domain/eater/mapper/EaterMapper.java similarity index 81% rename from src/main/java/com/example/let_server/domain/eater/mapper/EaterMapper.java rename to src/main/java/com/example/let/server/domain/eater/mapper/EaterMapper.java index 1f0d103..ae79127 100644 --- a/src/main/java/com/example/let_server/domain/eater/mapper/EaterMapper.java +++ b/src/main/java/com/example/let/server/domain/eater/mapper/EaterMapper.java @@ -1,8 +1,8 @@ -package com.example.let_server.domain.eater.mapper; +package com.example.let.server.domain.eater.mapper; -import com.example.let_server.domain.eater.domain.Eater; -import com.example.let_server.domain.eater.dto.response.EaterRatioResponse; -import com.example.let_server.domain.meal.domain.MealType; +import com.example.let.server.domain.eater.domain.Eater; +import com.example.let.server.domain.eater.dto.response.EaterRatioResponse; +import com.example.let.server.domain.meal.domain.MealType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/let_server/domain/eater/repository/EaterRepository.java b/src/main/java/com/example/let/server/domain/eater/repository/EaterRepository.java similarity index 76% rename from src/main/java/com/example/let_server/domain/eater/repository/EaterRepository.java rename to src/main/java/com/example/let/server/domain/eater/repository/EaterRepository.java index ab841b4..fd762a1 100644 --- a/src/main/java/com/example/let_server/domain/eater/repository/EaterRepository.java +++ b/src/main/java/com/example/let/server/domain/eater/repository/EaterRepository.java @@ -1,8 +1,8 @@ -package com.example.let_server.domain.eater.repository; +package com.example.let.server.domain.eater.repository; -import com.example.let_server.domain.eater.domain.Eater; -import com.example.let_server.domain.eater.dto.response.EaterRatioResponse; -import com.example.let_server.domain.meal.domain.MealType; +import com.example.let.server.domain.eater.domain.Eater; +import com.example.let.server.domain.eater.dto.response.EaterRatioResponse; +import com.example.let.server.domain.meal.domain.MealType; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/src/main/java/com/example/let_server/domain/eater/repository/MybatisEaterRepository.java b/src/main/java/com/example/let/server/domain/eater/repository/MybatisEaterRepository.java similarity index 85% rename from src/main/java/com/example/let_server/domain/eater/repository/MybatisEaterRepository.java rename to src/main/java/com/example/let/server/domain/eater/repository/MybatisEaterRepository.java index b5faa33..d961f0e 100644 --- a/src/main/java/com/example/let_server/domain/eater/repository/MybatisEaterRepository.java +++ b/src/main/java/com/example/let/server/domain/eater/repository/MybatisEaterRepository.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.eater.repository; +package com.example.let.server.domain.eater.repository; -import com.example.let_server.domain.eater.domain.Eater; -import com.example.let_server.domain.eater.dto.response.EaterRatioResponse; -import com.example.let_server.domain.eater.mapper.EaterMapper; -import com.example.let_server.domain.meal.domain.MealType; +import com.example.let.server.domain.eater.domain.Eater; +import com.example.let.server.domain.eater.dto.response.EaterRatioResponse; +import com.example.let.server.domain.eater.mapper.EaterMapper; +import com.example.let.server.domain.meal.domain.MealType; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/let_server/domain/eater/service/EaterService.java b/src/main/java/com/example/let/server/domain/eater/service/EaterService.java similarity index 70% rename from src/main/java/com/example/let_server/domain/eater/service/EaterService.java rename to src/main/java/com/example/let/server/domain/eater/service/EaterService.java index 3a2f0b5..1778d91 100644 --- a/src/main/java/com/example/let_server/domain/eater/service/EaterService.java +++ b/src/main/java/com/example/let/server/domain/eater/service/EaterService.java @@ -1,8 +1,8 @@ -package com.example.let_server.domain.eater.service; +package com.example.let.server.domain.eater.service; -import com.example.let_server.domain.eater.dto.response.EaterRatioResponse; -import com.example.let_server.domain.eater.dto.response.EaterResponse; -import com.example.let_server.domain.eater.dto.response.UserCalorieResponse; +import com.example.let.server.domain.eater.dto.response.EaterRatioResponse; +import com.example.let.server.domain.eater.dto.response.EaterResponse; +import com.example.let.server.domain.eater.dto.response.UserCalorieResponse; import java.time.LocalDate; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/eater/service/impl/EaterServiceImpl.java b/src/main/java/com/example/let/server/domain/eater/service/impl/EaterServiceImpl.java similarity index 84% rename from src/main/java/com/example/let_server/domain/eater/service/impl/EaterServiceImpl.java rename to src/main/java/com/example/let/server/domain/eater/service/impl/EaterServiceImpl.java index e61393d..2467978 100644 --- a/src/main/java/com/example/let_server/domain/eater/service/impl/EaterServiceImpl.java +++ b/src/main/java/com/example/let/server/domain/eater/service/impl/EaterServiceImpl.java @@ -1,18 +1,18 @@ -package com.example.let_server.domain.eater.service.impl; - -import com.example.let_server.domain.eater.domain.Eater; -import com.example.let_server.domain.eater.dto.response.EaterRatioResponse; -import com.example.let_server.domain.eater.dto.response.EaterResponse; -import com.example.let_server.domain.eater.dto.response.UserCalorieResponse; -import com.example.let_server.domain.eater.error.EaterError; -import com.example.let_server.domain.eater.repository.EaterRepository; -import com.example.let_server.domain.eater.service.EaterService; -import com.example.let_server.domain.meal.domain.Meal; -import com.example.let_server.domain.meal.domain.MealType; -import com.example.let_server.domain.meal.service.MealService; -import com.example.let_server.domain.user.domain.User; -import com.example.let_server.domain.user.service.UserService; -import com.example.let_server.global.error.CustomException; +package com.example.let.server.domain.eater.service.impl; + +import com.example.let.server.domain.eater.domain.Eater; +import com.example.let.server.domain.eater.dto.response.EaterRatioResponse; +import com.example.let.server.domain.eater.dto.response.EaterResponse; +import com.example.let.server.domain.eater.dto.response.UserCalorieResponse; +import com.example.let.server.domain.eater.error.EaterError; +import com.example.let.server.domain.eater.repository.EaterRepository; +import com.example.let.server.domain.eater.service.EaterService; +import com.example.let.server.domain.meal.domain.Meal; +import com.example.let.server.domain.meal.domain.MealType; +import com.example.let.server.domain.meal.service.MealService; +import com.example.let.server.domain.user.domain.User; +import com.example.let.server.domain.user.service.UserService; +import com.example.let.server.global.error.CustomException; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/let_server/domain/exercises/controller/ExerciseController.java b/src/main/java/com/example/let/server/domain/exercises/controller/ExerciseController.java similarity index 64% rename from src/main/java/com/example/let_server/domain/exercises/controller/ExerciseController.java rename to src/main/java/com/example/let/server/domain/exercises/controller/ExerciseController.java index 68c75fd..0b17571 100644 --- a/src/main/java/com/example/let_server/domain/exercises/controller/ExerciseController.java +++ b/src/main/java/com/example/let/server/domain/exercises/controller/ExerciseController.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.exercises.controller; +package com.example.let.server.domain.exercises.controller; -import com.example.let_server.domain.exercises.docs.ExerciseDocs; -import com.example.let_server.domain.exercises.dto.response.ExerciseResponse; -import com.example.let_server.domain.exercises.service.ExerciseService; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.exercises.docs.ExerciseDocs; +import com.example.let.server.domain.exercises.dto.response.ExerciseResponse; +import com.example.let.server.domain.exercises.service.ExerciseService; +import com.example.let.server.global.common.BaseResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/let_server/domain/exercises/docs/ExerciseDocs.java b/src/main/java/com/example/let/server/domain/exercises/docs/ExerciseDocs.java similarity index 69% rename from src/main/java/com/example/let_server/domain/exercises/docs/ExerciseDocs.java rename to src/main/java/com/example/let/server/domain/exercises/docs/ExerciseDocs.java index 87c5256..e6a4229 100644 --- a/src/main/java/com/example/let_server/domain/exercises/docs/ExerciseDocs.java +++ b/src/main/java/com/example/let/server/domain/exercises/docs/ExerciseDocs.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.exercises.docs; +package com.example.let.server.domain.exercises.docs; -import com.example.let_server.domain.exercises.dto.response.ExerciseResponse; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.exercises.dto.response.ExerciseResponse; +import com.example.let.server.global.common.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/example/let_server/domain/exercises/domain/ExerciseCategory.java b/src/main/java/com/example/let/server/domain/exercises/domain/ExerciseCategory.java similarity index 54% rename from src/main/java/com/example/let_server/domain/exercises/domain/ExerciseCategory.java rename to src/main/java/com/example/let/server/domain/exercises/domain/ExerciseCategory.java index abd92fb..118ec88 100644 --- a/src/main/java/com/example/let_server/domain/exercises/domain/ExerciseCategory.java +++ b/src/main/java/com/example/let/server/domain/exercises/domain/ExerciseCategory.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.exercises.domain; +package com.example.let.server.domain.exercises.domain; public enum ExerciseCategory { MOVING, diff --git a/src/main/java/com/example/let_server/domain/exercises/domain/Exercises.java b/src/main/java/com/example/let/server/domain/exercises/domain/Exercises.java similarity index 86% rename from src/main/java/com/example/let_server/domain/exercises/domain/Exercises.java rename to src/main/java/com/example/let/server/domain/exercises/domain/Exercises.java index 87e0052..df1be52 100644 --- a/src/main/java/com/example/let_server/domain/exercises/domain/Exercises.java +++ b/src/main/java/com/example/let/server/domain/exercises/domain/Exercises.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.exercises.domain; +package com.example.let.server.domain.exercises.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/let_server/domain/exercises/dto/response/ExerciseResponse.java b/src/main/java/com/example/let/server/domain/exercises/dto/response/ExerciseResponse.java similarity index 80% rename from src/main/java/com/example/let_server/domain/exercises/dto/response/ExerciseResponse.java rename to src/main/java/com/example/let/server/domain/exercises/dto/response/ExerciseResponse.java index eb868fd..2ab8317 100644 --- a/src/main/java/com/example/let_server/domain/exercises/dto/response/ExerciseResponse.java +++ b/src/main/java/com/example/let/server/domain/exercises/dto/response/ExerciseResponse.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.exercises.dto.response; +package com.example.let.server.domain.exercises.dto.response; -import com.example.let_server.domain.exercises.domain.ExerciseCategory; -import com.example.let_server.domain.exercises.domain.Exercises; +import com.example.let.server.domain.exercises.domain.ExerciseCategory; +import com.example.let.server.domain.exercises.domain.Exercises; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -29,4 +29,4 @@ public static ExerciseResponse of(Exercises exercise) { .method(exercise.getMethod()) .build(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/example/let_server/domain/exercises/mapper/ExerciseMapper.java b/src/main/java/com/example/let/server/domain/exercises/mapper/ExerciseMapper.java similarity index 54% rename from src/main/java/com/example/let_server/domain/exercises/mapper/ExerciseMapper.java rename to src/main/java/com/example/let/server/domain/exercises/mapper/ExerciseMapper.java index 47c0b85..e98ab4d 100644 --- a/src/main/java/com/example/let_server/domain/exercises/mapper/ExerciseMapper.java +++ b/src/main/java/com/example/let/server/domain/exercises/mapper/ExerciseMapper.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.exercises.mapper; +package com.example.let.server.domain.exercises.mapper; -import com.example.let_server.domain.exercises.domain.Exercises; +import com.example.let.server.domain.exercises.domain.Exercises; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/example/let/server/domain/exercises/repository/ExerciseRepository.java b/src/main/java/com/example/let/server/domain/exercises/repository/ExerciseRepository.java new file mode 100644 index 0000000..2f71242 --- /dev/null +++ b/src/main/java/com/example/let/server/domain/exercises/repository/ExerciseRepository.java @@ -0,0 +1,9 @@ +package com.example.let.server.domain.exercises.repository; + +import com.example.let.server.domain.exercises.domain.Exercises; + +import java.util.List; + +public interface ExerciseRepository { + List findAll(); +} \ No newline at end of file diff --git a/src/main/java/com/example/let_server/domain/exercises/repository/MybatisExerciseRepository.java b/src/main/java/com/example/let/server/domain/exercises/repository/MybatisExerciseRepository.java similarity index 67% rename from src/main/java/com/example/let_server/domain/exercises/repository/MybatisExerciseRepository.java rename to src/main/java/com/example/let/server/domain/exercises/repository/MybatisExerciseRepository.java index 5d6540f..a3a659b 100644 --- a/src/main/java/com/example/let_server/domain/exercises/repository/MybatisExerciseRepository.java +++ b/src/main/java/com/example/let/server/domain/exercises/repository/MybatisExerciseRepository.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.exercises.repository; +package com.example.let.server.domain.exercises.repository; -import com.example.let_server.domain.exercises.domain.Exercises; -import com.example.let_server.domain.exercises.mapper.ExerciseMapper; +import com.example.let.server.domain.exercises.domain.Exercises; +import com.example.let.server.domain.exercises.mapper.ExerciseMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/let_server/domain/exercises/service/ExerciseService.java b/src/main/java/com/example/let/server/domain/exercises/service/ExerciseService.java similarity index 50% rename from src/main/java/com/example/let_server/domain/exercises/service/ExerciseService.java rename to src/main/java/com/example/let/server/domain/exercises/service/ExerciseService.java index 8d52699..0280941 100644 --- a/src/main/java/com/example/let_server/domain/exercises/service/ExerciseService.java +++ b/src/main/java/com/example/let/server/domain/exercises/service/ExerciseService.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.exercises.service; +package com.example.let.server.domain.exercises.service; -import com.example.let_server.domain.exercises.dto.response.ExerciseResponse; +import com.example.let.server.domain.exercises.dto.response.ExerciseResponse; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/exercises/service/impl/ExerciseServiceImpl.java b/src/main/java/com/example/let/server/domain/exercises/service/impl/ExerciseServiceImpl.java similarity index 68% rename from src/main/java/com/example/let_server/domain/exercises/service/impl/ExerciseServiceImpl.java rename to src/main/java/com/example/let/server/domain/exercises/service/impl/ExerciseServiceImpl.java index a289e5e..28a27ec 100644 --- a/src/main/java/com/example/let_server/domain/exercises/service/impl/ExerciseServiceImpl.java +++ b/src/main/java/com/example/let/server/domain/exercises/service/impl/ExerciseServiceImpl.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.exercises.service.impl; +package com.example.let.server.domain.exercises.service.impl; -import com.example.let_server.domain.exercises.domain.Exercises; -import com.example.let_server.domain.exercises.dto.response.ExerciseResponse; -import com.example.let_server.domain.exercises.repository.ExerciseRepository; -import com.example.let_server.domain.exercises.service.ExerciseService; +import com.example.let.server.domain.exercises.domain.Exercises; +import com.example.let.server.domain.exercises.dto.response.ExerciseResponse; +import com.example.let.server.domain.exercises.repository.ExerciseRepository; +import com.example.let.server.domain.exercises.service.ExerciseService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/let_server/domain/meal/domain/Meal.java b/src/main/java/com/example/let/server/domain/meal/domain/Meal.java similarity index 87% rename from src/main/java/com/example/let_server/domain/meal/domain/Meal.java rename to src/main/java/com/example/let/server/domain/meal/domain/Meal.java index 927fd76..9618f83 100644 --- a/src/main/java/com/example/let_server/domain/meal/domain/Meal.java +++ b/src/main/java/com/example/let/server/domain/meal/domain/Meal.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.meal.domain; +package com.example.let.server.domain.meal.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/let_server/domain/meal/domain/MealType.java b/src/main/java/com/example/let/server/domain/meal/domain/MealType.java similarity index 54% rename from src/main/java/com/example/let_server/domain/meal/domain/MealType.java rename to src/main/java/com/example/let/server/domain/meal/domain/MealType.java index 73c708b..17667b9 100644 --- a/src/main/java/com/example/let_server/domain/meal/domain/MealType.java +++ b/src/main/java/com/example/let/server/domain/meal/domain/MealType.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.meal.domain; +package com.example.let.server.domain.meal.domain; public enum MealType { 조식, diff --git a/src/main/java/com/example/let_server/domain/meal/dto/response/MaxEatersMealWithCountResponse.java b/src/main/java/com/example/let/server/domain/meal/dto/response/MaxEatersMealWithCountResponse.java similarity index 70% rename from src/main/java/com/example/let_server/domain/meal/dto/response/MaxEatersMealWithCountResponse.java rename to src/main/java/com/example/let/server/domain/meal/dto/response/MaxEatersMealWithCountResponse.java index f87d1de..3d856c2 100644 --- a/src/main/java/com/example/let_server/domain/meal/dto/response/MaxEatersMealWithCountResponse.java +++ b/src/main/java/com/example/let/server/domain/meal/dto/response/MaxEatersMealWithCountResponse.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.meal.dto.response; +package com.example.let.server.domain.meal.dto.response; -import com.example.let_server.domain.meal.domain.MealType; -import com.example.let_server.domain.menu.dto.MenuResponse; +import com.example.let.server.domain.meal.domain.MealType; +import com.example.let.server.domain.menu.dto.response.MenuResponse; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/meal/dto/response/MealDailyResponse.java b/src/main/java/com/example/let/server/domain/meal/dto/response/MealDailyResponse.java similarity index 68% rename from src/main/java/com/example/let_server/domain/meal/dto/response/MealDailyResponse.java rename to src/main/java/com/example/let/server/domain/meal/dto/response/MealDailyResponse.java index 1f43c6e..17c04d3 100644 --- a/src/main/java/com/example/let_server/domain/meal/dto/response/MealDailyResponse.java +++ b/src/main/java/com/example/let/server/domain/meal/dto/response/MealDailyResponse.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.meal.dto.response; +package com.example.let.server.domain.meal.dto.response; -import com.example.let_server.domain.meal.domain.MealType; -import com.example.let_server.domain.menu.dto.MenuResponse; +import com.example.let.server.domain.meal.domain.MealType; +import com.example.let.server.domain.menu.dto.response.MenuResponse; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/meal/dto/response/MealResponse.java b/src/main/java/com/example/let/server/domain/meal/dto/response/MealResponse.java similarity index 75% rename from src/main/java/com/example/let_server/domain/meal/dto/response/MealResponse.java rename to src/main/java/com/example/let/server/domain/meal/dto/response/MealResponse.java index 2bb35e5..e2cead8 100644 --- a/src/main/java/com/example/let_server/domain/meal/dto/response/MealResponse.java +++ b/src/main/java/com/example/let/server/domain/meal/dto/response/MealResponse.java @@ -1,8 +1,8 @@ -package com.example.let_server.domain.meal.dto.response; +package com.example.let.server.domain.meal.dto.response; -import com.example.let_server.domain.meal.domain.Meal; -import com.example.let_server.domain.meal.domain.MealType; -import com.example.let_server.domain.menu.dto.MenuResponse; +import com.example.let.server.domain.meal.domain.Meal; +import com.example.let.server.domain.meal.domain.MealType; +import com.example.let.server.domain.menu.dto.response.MenuResponse; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/meal/dto/response/MealWithOutMenusResponse.java b/src/main/java/com/example/let/server/domain/meal/dto/response/MealWithOutMenusResponse.java similarity index 79% rename from src/main/java/com/example/let_server/domain/meal/dto/response/MealWithOutMenusResponse.java rename to src/main/java/com/example/let/server/domain/meal/dto/response/MealWithOutMenusResponse.java index 88aa3c0..65acd92 100644 --- a/src/main/java/com/example/let_server/domain/meal/dto/response/MealWithOutMenusResponse.java +++ b/src/main/java/com/example/let/server/domain/meal/dto/response/MealWithOutMenusResponse.java @@ -1,8 +1,8 @@ -package com.example.let_server.domain.meal.dto.response; +package com.example.let.server.domain.meal.dto.response; -import com.example.let_server.domain.meal.domain.Meal; -import com.example.let_server.domain.meal.domain.MealType; +import com.example.let.server.domain.meal.domain.Meal; +import com.example.let.server.domain.meal.domain.MealType; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/meal/error/MealError.java b/src/main/java/com/example/let/server/domain/meal/error/MealError.java similarity index 58% rename from src/main/java/com/example/let_server/domain/meal/error/MealError.java rename to src/main/java/com/example/let/server/domain/meal/error/MealError.java index c08e895..f4914b5 100644 --- a/src/main/java/com/example/let_server/domain/meal/error/MealError.java +++ b/src/main/java/com/example/let/server/domain/meal/error/MealError.java @@ -1,14 +1,14 @@ -package com.example.let_server.domain.meal.error; +package com.example.let.server.domain.meal.error; -import com.example.let_server.global.error.CustomError; +import com.example.let.server.global.error.CustomError; import lombok.Getter; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor @Getter public enum MealError implements CustomError { - MEAL_NOT_FOUND(404,"Meal Not Found"), - MELA_TYPE_NOT_FOUND(404, "Meal Type not found"); + MEAL_NOT_FOUND(404, "Meal Not Found"), + MEAL_TYPE_NOT_FOUND(404, "Meal Type not found"); private final int status; private final String message; diff --git a/src/main/java/com/example/let_server/domain/meal/mapper/MealMapper.java b/src/main/java/com/example/let/server/domain/meal/mapper/MealMapper.java similarity index 74% rename from src/main/java/com/example/let_server/domain/meal/mapper/MealMapper.java rename to src/main/java/com/example/let/server/domain/meal/mapper/MealMapper.java index 6a25ae6..792cd00 100644 --- a/src/main/java/com/example/let_server/domain/meal/mapper/MealMapper.java +++ b/src/main/java/com/example/let/server/domain/meal/mapper/MealMapper.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.meal.mapper; +package com.example.let.server.domain.meal.mapper; -import com.example.let_server.domain.meal.domain.Meal; -import com.example.let_server.domain.meal.domain.MealType; -import com.example.let_server.domain.statistics.dto.response.LowParticipationMeal; -import com.example.let_server.domain.statistics.dto.response.MealStatistics; +import com.example.let.server.domain.meal.domain.Meal; +import com.example.let.server.domain.meal.domain.MealType; +import com.example.let.server.domain.statistics.dto.response.LowParticipationMeal; +import com.example.let.server.domain.statistics.dto.response.MealStatistics; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/let_server/domain/meal/repository/MealRepository.java b/src/main/java/com/example/let/server/domain/meal/repository/MealRepository.java similarity index 68% rename from src/main/java/com/example/let_server/domain/meal/repository/MealRepository.java rename to src/main/java/com/example/let/server/domain/meal/repository/MealRepository.java index 89a098a..101a689 100644 --- a/src/main/java/com/example/let_server/domain/meal/repository/MealRepository.java +++ b/src/main/java/com/example/let/server/domain/meal/repository/MealRepository.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.meal.repository; +package com.example.let.server.domain.meal.repository; -import com.example.let_server.domain.meal.domain.Meal; -import com.example.let_server.domain.meal.domain.MealType; -import com.example.let_server.domain.statistics.dto.response.LowParticipationMeal; -import com.example.let_server.domain.statistics.dto.response.MealStatistics; +import com.example.let.server.domain.meal.domain.Meal; +import com.example.let.server.domain.meal.domain.MealType; +import com.example.let.server.domain.statistics.dto.response.LowParticipationMeal; +import com.example.let.server.domain.statistics.dto.response.MealStatistics; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/meal/repository/MybatisMealRepository.java b/src/main/java/com/example/let/server/domain/meal/repository/MybatisMealRepository.java similarity index 80% rename from src/main/java/com/example/let_server/domain/meal/repository/MybatisMealRepository.java rename to src/main/java/com/example/let/server/domain/meal/repository/MybatisMealRepository.java index 7439f76..b41b8b8 100644 --- a/src/main/java/com/example/let_server/domain/meal/repository/MybatisMealRepository.java +++ b/src/main/java/com/example/let/server/domain/meal/repository/MybatisMealRepository.java @@ -1,10 +1,10 @@ -package com.example.let_server.domain.meal.repository; +package com.example.let.server.domain.meal.repository; -import com.example.let_server.domain.meal.domain.Meal; -import com.example.let_server.domain.meal.domain.MealType; -import com.example.let_server.domain.meal.mapper.MealMapper; -import com.example.let_server.domain.statistics.dto.response.LowParticipationMeal; -import com.example.let_server.domain.statistics.dto.response.MealStatistics; +import com.example.let.server.domain.meal.domain.Meal; +import com.example.let.server.domain.meal.domain.MealType; +import com.example.let.server.domain.meal.mapper.MealMapper; +import com.example.let.server.domain.statistics.dto.response.LowParticipationMeal; +import com.example.let.server.domain.statistics.dto.response.MealStatistics; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/let_server/domain/meal/service/MealService.java b/src/main/java/com/example/let/server/domain/meal/service/MealService.java similarity index 81% rename from src/main/java/com/example/let_server/domain/meal/service/MealService.java rename to src/main/java/com/example/let/server/domain/meal/service/MealService.java index 9ef78fd..188ef22 100644 --- a/src/main/java/com/example/let_server/domain/meal/service/MealService.java +++ b/src/main/java/com/example/let/server/domain/meal/service/MealService.java @@ -1,13 +1,13 @@ -package com.example.let_server.domain.meal.service; +package com.example.let.server.domain.meal.service; -import com.example.let_server.domain.meal.domain.Meal; -import com.example.let_server.domain.meal.domain.MealType; -import com.example.let_server.domain.meal.error.MealError; -import com.example.let_server.domain.meal.repository.MealRepository; -import com.example.let_server.domain.statistics.dto.response.LowParticipationMeal; -import com.example.let_server.domain.statistics.dto.response.MealStatistics; -import com.example.let_server.domain.statistics.dto.response.MealDetails; -import com.example.let_server.global.error.CustomException; +import com.example.let.server.domain.meal.domain.Meal; +import com.example.let.server.domain.meal.domain.MealType; +import com.example.let.server.domain.meal.error.MealError; +import com.example.let.server.domain.meal.repository.MealRepository; +import com.example.let.server.domain.statistics.dto.response.LowParticipationMeal; +import com.example.let.server.domain.statistics.dto.response.MealStatistics; +import com.example.let.server.domain.statistics.dto.response.MealDetails; +import com.example.let.server.global.error.CustomException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/let_server/domain/mealMenu/controller/MealMenuController.java b/src/main/java/com/example/let/server/domain/mealmenu/controller/MealMenuController.java similarity index 79% rename from src/main/java/com/example/let_server/domain/mealMenu/controller/MealMenuController.java rename to src/main/java/com/example/let/server/domain/mealmenu/controller/MealMenuController.java index df6162d..39cf313 100644 --- a/src/main/java/com/example/let_server/domain/mealMenu/controller/MealMenuController.java +++ b/src/main/java/com/example/let/server/domain/mealmenu/controller/MealMenuController.java @@ -1,11 +1,11 @@ -package com.example.let_server.domain.mealMenu.controller; +package com.example.let.server.domain.mealmenu.controller; -import com.example.let_server.domain.meal.dto.response.MaxEatersMealWithCountResponse; -import com.example.let_server.domain.meal.dto.response.MealDailyResponse; -import com.example.let_server.domain.meal.dto.response.MealResponse; -import com.example.let_server.domain.mealMenu.docs.MealMenuDocs; -import com.example.let_server.domain.mealMenu.service.MealMenuService; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.meal.dto.response.MaxEatersMealWithCountResponse; +import com.example.let.server.domain.meal.dto.response.MealDailyResponse; +import com.example.let.server.domain.meal.dto.response.MealResponse; +import com.example.let.server.domain.mealmenu.docs.MealMenuDocs; +import com.example.let.server.domain.mealmenu.service.MealMenuService; +import com.example.let.server.global.common.BaseResponse; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/let_server/domain/mealMenu/docs/MealMenuDocs.java b/src/main/java/com/example/let/server/domain/mealmenu/docs/MealMenuDocs.java similarity index 82% rename from src/main/java/com/example/let_server/domain/mealMenu/docs/MealMenuDocs.java rename to src/main/java/com/example/let/server/domain/mealmenu/docs/MealMenuDocs.java index d63c7d2..0b60a05 100644 --- a/src/main/java/com/example/let_server/domain/mealMenu/docs/MealMenuDocs.java +++ b/src/main/java/com/example/let/server/domain/mealmenu/docs/MealMenuDocs.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.mealMenu.docs; +package com.example.let.server.domain.mealmenu.docs; -import com.example.let_server.domain.meal.dto.response.MaxEatersMealWithCountResponse; -import com.example.let_server.domain.meal.dto.response.MealDailyResponse; -import com.example.let_server.domain.meal.dto.response.MealResponse; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.meal.dto.response.MaxEatersMealWithCountResponse; +import com.example.let.server.domain.meal.dto.response.MealDailyResponse; +import com.example.let.server.domain.meal.dto.response.MealResponse; +import com.example.let.server.global.common.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.enums.ParameterIn; diff --git a/src/main/java/com/example/let_server/domain/mealMenu/domain/MealMenu.java b/src/main/java/com/example/let/server/domain/mealmenu/domain/MealMenu.java similarity index 62% rename from src/main/java/com/example/let_server/domain/mealMenu/domain/MealMenu.java rename to src/main/java/com/example/let/server/domain/mealmenu/domain/MealMenu.java index c0bf82c..e4d9379 100644 --- a/src/main/java/com/example/let_server/domain/mealMenu/domain/MealMenu.java +++ b/src/main/java/com/example/let/server/domain/mealmenu/domain/MealMenu.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.mealMenu.domain; +package com.example.let.server.domain.mealmenu.domain; -import com.example.let_server.domain.meal.domain.Meal; -import com.example.let_server.domain.menu.domain.Menu; +import com.example.let.server.domain.meal.domain.Meal; +import com.example.let.server.domain.menu.domain.Menu; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/let/server/domain/mealmenu/error/MealMenuError.java b/src/main/java/com/example/let/server/domain/mealmenu/error/MealMenuError.java new file mode 100644 index 0000000..2fb4696 --- /dev/null +++ b/src/main/java/com/example/let/server/domain/mealmenu/error/MealMenuError.java @@ -0,0 +1,19 @@ +package com.example.let.server.domain.mealmenu.error; + +import com.example.let.server.global.error.CustomError; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +@Getter +public enum MealMenuError implements CustomError { + MEAL_DATA_PARSING_FAILED(500, "급식 데이터 파싱에 실패했습니다"); + + private final int status; + private final String message; + + @Override + public String getCode() { + return name(); + } +} diff --git a/src/main/java/com/example/let_server/domain/mealMenu/mapper/MealMenuMapper.java b/src/main/java/com/example/let/server/domain/mealmenu/mapper/MealMenuMapper.java similarity index 67% rename from src/main/java/com/example/let_server/domain/mealMenu/mapper/MealMenuMapper.java rename to src/main/java/com/example/let/server/domain/mealmenu/mapper/MealMenuMapper.java index 56c1ef9..35ad446 100644 --- a/src/main/java/com/example/let_server/domain/mealMenu/mapper/MealMenuMapper.java +++ b/src/main/java/com/example/let/server/domain/mealmenu/mapper/MealMenuMapper.java @@ -1,8 +1,8 @@ -package com.example.let_server.domain.mealMenu.mapper; +package com.example.let.server.domain.mealmenu.mapper; -import com.example.let_server.domain.meal.dto.response.MaxEatersMealWithCountResponse; -import com.example.let_server.domain.meal.dto.response.MealDailyResponse; -import com.example.let_server.domain.mealMenu.domain.MealMenu; +import com.example.let.server.domain.meal.dto.response.MaxEatersMealWithCountResponse; +import com.example.let.server.domain.meal.dto.response.MealDailyResponse; +import com.example.let.server.domain.mealmenu.domain.MealMenu; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/let_server/domain/mealMenu/repository/MealMenuRepository.java b/src/main/java/com/example/let/server/domain/mealmenu/repository/MealMenuRepository.java similarity index 61% rename from src/main/java/com/example/let_server/domain/mealMenu/repository/MealMenuRepository.java rename to src/main/java/com/example/let/server/domain/mealmenu/repository/MealMenuRepository.java index fc9882a..38daecb 100644 --- a/src/main/java/com/example/let_server/domain/mealMenu/repository/MealMenuRepository.java +++ b/src/main/java/com/example/let/server/domain/mealmenu/repository/MealMenuRepository.java @@ -1,8 +1,8 @@ -package com.example.let_server.domain.mealMenu.repository; +package com.example.let.server.domain.mealmenu.repository; -import com.example.let_server.domain.meal.dto.response.MaxEatersMealWithCountResponse; -import com.example.let_server.domain.meal.dto.response.MealDailyResponse; -import com.example.let_server.domain.mealMenu.domain.MealMenu; +import com.example.let.server.domain.meal.dto.response.MaxEatersMealWithCountResponse; +import com.example.let.server.domain.meal.dto.response.MealDailyResponse; +import com.example.let.server.domain.mealmenu.domain.MealMenu; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/mealMenu/repository/MybatisMealMenuRepository.java b/src/main/java/com/example/let/server/domain/mealmenu/repository/MybatisMealMenuRepository.java similarity index 74% rename from src/main/java/com/example/let_server/domain/mealMenu/repository/MybatisMealMenuRepository.java rename to src/main/java/com/example/let/server/domain/mealmenu/repository/MybatisMealMenuRepository.java index 1e50436..432b809 100644 --- a/src/main/java/com/example/let_server/domain/mealMenu/repository/MybatisMealMenuRepository.java +++ b/src/main/java/com/example/let/server/domain/mealmenu/repository/MybatisMealMenuRepository.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.mealMenu.repository; +package com.example.let.server.domain.mealmenu.repository; -import com.example.let_server.domain.meal.dto.response.MaxEatersMealWithCountResponse; -import com.example.let_server.domain.meal.dto.response.MealDailyResponse; -import com.example.let_server.domain.mealMenu.domain.MealMenu; -import com.example.let_server.domain.mealMenu.mapper.MealMenuMapper; +import com.example.let.server.domain.meal.dto.response.MaxEatersMealWithCountResponse; +import com.example.let.server.domain.meal.dto.response.MealDailyResponse; +import com.example.let.server.domain.mealmenu.domain.MealMenu; +import com.example.let.server.domain.mealmenu.mapper.MealMenuMapper; import lombok.RequiredArgsConstructor; import java.util.Date; diff --git a/src/main/java/com/example/let_server/domain/mealMenu/service/MealMenuService.java b/src/main/java/com/example/let/server/domain/mealmenu/service/MealMenuService.java similarity index 56% rename from src/main/java/com/example/let_server/domain/mealMenu/service/MealMenuService.java rename to src/main/java/com/example/let/server/domain/mealmenu/service/MealMenuService.java index 3d538a4..f188db4 100644 --- a/src/main/java/com/example/let_server/domain/mealMenu/service/MealMenuService.java +++ b/src/main/java/com/example/let/server/domain/mealmenu/service/MealMenuService.java @@ -1,8 +1,8 @@ -package com.example.let_server.domain.mealMenu.service; +package com.example.let.server.domain.mealmenu.service; -import com.example.let_server.domain.meal.dto.response.MaxEatersMealWithCountResponse; -import com.example.let_server.domain.meal.dto.response.MealDailyResponse; -import com.example.let_server.domain.meal.dto.response.MealResponse; +import com.example.let.server.domain.meal.dto.response.MaxEatersMealWithCountResponse; +import com.example.let.server.domain.meal.dto.response.MealDailyResponse; +import com.example.let.server.domain.meal.dto.response.MealResponse; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/mealMenu/service/impl/MealMenuServiceImpl.java b/src/main/java/com/example/let/server/domain/mealmenu/service/impl/MealMenuServiceImpl.java similarity index 89% rename from src/main/java/com/example/let_server/domain/mealMenu/service/impl/MealMenuServiceImpl.java rename to src/main/java/com/example/let/server/domain/mealmenu/service/impl/MealMenuServiceImpl.java index b6b830e..5eabc78 100644 --- a/src/main/java/com/example/let_server/domain/mealMenu/service/impl/MealMenuServiceImpl.java +++ b/src/main/java/com/example/let/server/domain/mealmenu/service/impl/MealMenuServiceImpl.java @@ -1,25 +1,24 @@ -package com.example.let_server.domain.mealMenu.service.impl; - -import com.example.let_server.domain.allergy.service.AllergyService; -import com.example.let_server.domain.meal.domain.Meal; -import com.example.let_server.domain.meal.domain.MealType; -import com.example.let_server.domain.meal.dto.response.MaxEatersMealWithCountResponse; -import com.example.let_server.domain.meal.dto.response.MealDailyResponse; -import com.example.let_server.domain.meal.dto.response.MealResponse; -import com.example.let_server.domain.meal.error.MealError; -import com.example.let_server.domain.meal.service.MealService; -import com.example.let_server.domain.mealMenu.domain.MealMenu; -import com.example.let_server.domain.mealMenu.repository.MealMenuRepository; -import com.example.let_server.domain.mealMenu.service.MealMenuService; -import com.example.let_server.domain.menu.domain.Menu; -import com.example.let_server.domain.menu.dto.MenuResponse; -import com.example.let_server.domain.menu.service.MenuService; -import com.example.let_server.domain.menuAllergy.service.MenuAllergyService; -import com.example.let_server.global.error.CustomException; +package com.example.let.server.domain.mealmenu.service.impl; + +import com.example.let.server.domain.allergy.service.AllergyService; +import com.example.let.server.domain.meal.domain.Meal; +import com.example.let.server.domain.meal.domain.MealType; +import com.example.let.server.domain.meal.dto.response.MaxEatersMealWithCountResponse; +import com.example.let.server.domain.meal.dto.response.MealDailyResponse; +import com.example.let.server.domain.meal.dto.response.MealResponse; +import com.example.let.server.domain.meal.error.MealError; +import com.example.let.server.domain.meal.service.MealService; +import com.example.let.server.domain.mealmenu.domain.MealMenu; +import com.example.let.server.domain.mealmenu.repository.MealMenuRepository; +import com.example.let.server.domain.mealmenu.service.MealMenuService; +import com.example.let.server.domain.menu.domain.Menu; +import com.example.let.server.domain.menu.dto.response.MenuResponse; +import com.example.let.server.domain.menu.service.MenuService; +import com.example.let.server.domain.menuallergy.service.MenuAllergyService; +import com.example.let.server.global.error.CustomException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -94,6 +93,7 @@ public void fetchAndSaveMonthlyMeals() { log.info("월간 급식 데이터 수집 완료"); } + @Override public List getMonthlyMenu(String period, List allergyIds) { String yearMonth = LocalDate.now().format(YEAR_MONTH_FORMATTER); MealType mealType = parseMealTypeOrThrow(period); @@ -132,7 +132,7 @@ private MealType parseMealTypeOrThrow(String period) { try { return MealType.valueOf(period); } catch (IllegalArgumentException e) { - throw new CustomException(MealError.MELA_TYPE_NOT_FOUND); + throw new CustomException(MealError.MEAL_TYPE_NOT_FOUND); } } diff --git a/src/main/java/com/example/let_server/domain/mealRating/controller/MealRatingController.java b/src/main/java/com/example/let/server/domain/mealrating/controller/MealRatingController.java similarity index 79% rename from src/main/java/com/example/let_server/domain/mealRating/controller/MealRatingController.java rename to src/main/java/com/example/let/server/domain/mealrating/controller/MealRatingController.java index 93d8940..f0334b7 100644 --- a/src/main/java/com/example/let_server/domain/mealRating/controller/MealRatingController.java +++ b/src/main/java/com/example/let/server/domain/mealrating/controller/MealRatingController.java @@ -1,12 +1,11 @@ -package com.example.let_server.domain.mealRating.controller; +package com.example.let.server.domain.mealrating.controller; -import com.example.let_server.domain.mealRating.docs.MealRatingDocs; -import com.example.let_server.domain.mealRating.dto.request.MealRatingRequest; -import com.example.let_server.domain.mealRating.dto.response.MealRatingResponse; -import com.example.let_server.domain.mealRating.service.MealRatingService; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.mealrating.docs.MealRatingDocs; +import com.example.let.server.domain.mealrating.dto.request.MealRatingRequest; +import com.example.let.server.domain.mealrating.dto.response.MealRatingResponse; +import com.example.let.server.domain.mealrating.service.MealRatingService; +import com.example.let.server.global.common.BaseResponse; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/let_server/domain/mealRating/docs/MealRatingDocs.java b/src/main/java/com/example/let/server/domain/mealrating/docs/MealRatingDocs.java similarity index 93% rename from src/main/java/com/example/let_server/domain/mealRating/docs/MealRatingDocs.java rename to src/main/java/com/example/let/server/domain/mealrating/docs/MealRatingDocs.java index dbc11fb..b3cd606 100644 --- a/src/main/java/com/example/let_server/domain/mealRating/docs/MealRatingDocs.java +++ b/src/main/java/com/example/let/server/domain/mealrating/docs/MealRatingDocs.java @@ -1,8 +1,8 @@ -package com.example.let_server.domain.mealRating.docs; +package com.example.let.server.domain.mealrating.docs; -import com.example.let_server.domain.mealRating.dto.request.MealRatingRequest; -import com.example.let_server.domain.mealRating.dto.response.MealRatingResponse; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.mealrating.dto.request.MealRatingRequest; +import com.example.let.server.domain.mealrating.dto.response.MealRatingResponse; +import com.example.let.server.global.common.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/src/main/java/com/example/let_server/domain/mealRating/domain/MealRating.java b/src/main/java/com/example/let/server/domain/mealrating/domain/MealRating.java similarity index 70% rename from src/main/java/com/example/let_server/domain/mealRating/domain/MealRating.java rename to src/main/java/com/example/let/server/domain/mealrating/domain/MealRating.java index 4fb639d..e3181e0 100644 --- a/src/main/java/com/example/let_server/domain/mealRating/domain/MealRating.java +++ b/src/main/java/com/example/let/server/domain/mealrating/domain/MealRating.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.mealRating.domain; +package com.example.let.server.domain.mealrating.domain; -import com.example.let_server.domain.meal.domain.Meal; +import com.example.let.server.domain.meal.domain.Meal; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/mealRating/dto/request/MealRatingRequest.java b/src/main/java/com/example/let/server/domain/mealrating/dto/request/MealRatingRequest.java similarity index 80% rename from src/main/java/com/example/let_server/domain/mealRating/dto/request/MealRatingRequest.java rename to src/main/java/com/example/let/server/domain/mealrating/dto/request/MealRatingRequest.java index 130940f..6176d55 100644 --- a/src/main/java/com/example/let_server/domain/mealRating/dto/request/MealRatingRequest.java +++ b/src/main/java/com/example/let/server/domain/mealrating/dto/request/MealRatingRequest.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.mealRating.dto.request; +package com.example.let.server.domain.mealrating.dto.request; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/let_server/domain/mealRating/dto/response/MealRatingResponse.java b/src/main/java/com/example/let/server/domain/mealrating/dto/response/MealRatingResponse.java similarity index 74% rename from src/main/java/com/example/let_server/domain/mealRating/dto/response/MealRatingResponse.java rename to src/main/java/com/example/let/server/domain/mealrating/dto/response/MealRatingResponse.java index fca67f8..6e77d57 100644 --- a/src/main/java/com/example/let_server/domain/mealRating/dto/response/MealRatingResponse.java +++ b/src/main/java/com/example/let/server/domain/mealrating/dto/response/MealRatingResponse.java @@ -1,8 +1,8 @@ -package com.example.let_server.domain.mealRating.dto.response; +package com.example.let.server.domain.mealrating.dto.response; -import com.example.let_server.domain.meal.dto.response.MealWithOutMenusResponse; -import com.example.let_server.domain.mealRating.domain.MealRating; +import com.example.let.server.domain.meal.dto.response.MealWithOutMenusResponse; +import com.example.let.server.domain.mealrating.domain.MealRating; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/mealRating/mapper/MealRatingMapper.java b/src/main/java/com/example/let/server/domain/mealrating/mapper/MealRatingMapper.java similarity index 74% rename from src/main/java/com/example/let_server/domain/mealRating/mapper/MealRatingMapper.java rename to src/main/java/com/example/let/server/domain/mealrating/mapper/MealRatingMapper.java index 68b6680..470513d 100644 --- a/src/main/java/com/example/let_server/domain/mealRating/mapper/MealRatingMapper.java +++ b/src/main/java/com/example/let/server/domain/mealrating/mapper/MealRatingMapper.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.mealRating.mapper; +package com.example.let.server.domain.mealrating.mapper; -import com.example.let_server.domain.mealRating.domain.MealRating; +import com.example.let.server.domain.mealrating.domain.MealRating; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/let_server/domain/mealRating/repository/MealRatingRepository.java b/src/main/java/com/example/let/server/domain/mealrating/repository/MealRatingRepository.java similarity index 65% rename from src/main/java/com/example/let_server/domain/mealRating/repository/MealRatingRepository.java rename to src/main/java/com/example/let/server/domain/mealrating/repository/MealRatingRepository.java index d9d7563..b72e49e 100644 --- a/src/main/java/com/example/let_server/domain/mealRating/repository/MealRatingRepository.java +++ b/src/main/java/com/example/let/server/domain/mealrating/repository/MealRatingRepository.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.mealRating.repository; +package com.example.let.server.domain.mealrating.repository; -import com.example.let_server.domain.mealRating.domain.MealRating; +import com.example.let.server.domain.mealrating.domain.MealRating; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/mealRating/repository/MybatisMealRatingRepository.java b/src/main/java/com/example/let/server/domain/mealrating/repository/MybatisMealRatingRepository.java similarity index 77% rename from src/main/java/com/example/let_server/domain/mealRating/repository/MybatisMealRatingRepository.java rename to src/main/java/com/example/let/server/domain/mealrating/repository/MybatisMealRatingRepository.java index 39304c6..a43a2d9 100644 --- a/src/main/java/com/example/let_server/domain/mealRating/repository/MybatisMealRatingRepository.java +++ b/src/main/java/com/example/let/server/domain/mealrating/repository/MybatisMealRatingRepository.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.mealRating.repository; +package com.example.let.server.domain.mealrating.repository; -import com.example.let_server.domain.mealRating.domain.MealRating; -import com.example.let_server.domain.mealRating.mapper.MealRatingMapper; +import com.example.let.server.domain.mealrating.domain.MealRating; +import com.example.let.server.domain.mealrating.mapper.MealRatingMapper; import lombok.RequiredArgsConstructor; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/mealRating/service/MealRatingService.java b/src/main/java/com/example/let/server/domain/mealrating/service/MealRatingService.java similarity index 64% rename from src/main/java/com/example/let_server/domain/mealRating/service/MealRatingService.java rename to src/main/java/com/example/let/server/domain/mealrating/service/MealRatingService.java index 8638a89..4b15824 100644 --- a/src/main/java/com/example/let_server/domain/mealRating/service/MealRatingService.java +++ b/src/main/java/com/example/let/server/domain/mealrating/service/MealRatingService.java @@ -1,8 +1,8 @@ -package com.example.let_server.domain.mealRating.service; +package com.example.let.server.domain.mealrating.service; -import com.example.let_server.domain.mealRating.dto.request.MealRatingRequest; -import com.example.let_server.domain.mealRating.dto.response.MealRatingResponse; +import com.example.let.server.domain.mealrating.dto.request.MealRatingRequest; +import com.example.let.server.domain.mealrating.dto.response.MealRatingResponse; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/mealRating/service/MealRatingServiceImpl.java b/src/main/java/com/example/let/server/domain/mealrating/service/MealRatingServiceImpl.java similarity index 79% rename from src/main/java/com/example/let_server/domain/mealRating/service/MealRatingServiceImpl.java rename to src/main/java/com/example/let/server/domain/mealrating/service/MealRatingServiceImpl.java index 340e856..d11be73 100644 --- a/src/main/java/com/example/let_server/domain/mealRating/service/MealRatingServiceImpl.java +++ b/src/main/java/com/example/let/server/domain/mealrating/service/MealRatingServiceImpl.java @@ -1,11 +1,11 @@ -package com.example.let_server.domain.mealRating.service; +package com.example.let.server.domain.mealrating.service; -import com.example.let_server.domain.meal.domain.Meal; -import com.example.let_server.domain.meal.service.MealService; -import com.example.let_server.domain.mealRating.domain.MealRating; -import com.example.let_server.domain.mealRating.dto.request.MealRatingRequest; -import com.example.let_server.domain.mealRating.dto.response.MealRatingResponse; -import com.example.let_server.domain.mealRating.repository.MealRatingRepository; +import com.example.let.server.domain.meal.domain.Meal; +import com.example.let.server.domain.meal.service.MealService; +import com.example.let.server.domain.mealrating.domain.MealRating; +import com.example.let.server.domain.mealrating.dto.request.MealRatingRequest; +import com.example.let.server.domain.mealrating.dto.response.MealRatingResponse; +import com.example.let.server.domain.mealrating.repository.MealRatingRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/let_server/domain/menu/controller/MenuController.java b/src/main/java/com/example/let/server/domain/menu/controller/MenuController.java similarity index 81% rename from src/main/java/com/example/let_server/domain/menu/controller/MenuController.java rename to src/main/java/com/example/let/server/domain/menu/controller/MenuController.java index 4d3ecc1..6aea037 100644 --- a/src/main/java/com/example/let_server/domain/menu/controller/MenuController.java +++ b/src/main/java/com/example/let/server/domain/menu/controller/MenuController.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.menu.controller; +package com.example.let.server.domain.menu.controller; -import com.example.let_server.domain.menu.docs.MenuDocs; -import com.example.let_server.domain.menu.domain.Menu; -import com.example.let_server.domain.menu.service.MenuService; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.menu.docs.MenuDocs; +import com.example.let.server.domain.menu.domain.Menu; +import com.example.let.server.domain.menu.service.MenuService; +import com.example.let.server.global.common.BaseResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/example/let_server/domain/menu/docs/MenuDocs.java b/src/main/java/com/example/let/server/domain/menu/docs/MenuDocs.java similarity index 94% rename from src/main/java/com/example/let_server/domain/menu/docs/MenuDocs.java rename to src/main/java/com/example/let/server/domain/menu/docs/MenuDocs.java index c42b159..abb89b9 100644 --- a/src/main/java/com/example/let_server/domain/menu/docs/MenuDocs.java +++ b/src/main/java/com/example/let/server/domain/menu/docs/MenuDocs.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.menu.docs; +package com.example.let.server.domain.menu.docs; -import com.example.let_server.domain.menu.domain.Menu; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.menu.domain.Menu; +import com.example.let.server.global.common.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/src/main/java/com/example/let_server/domain/menu/domain/Menu.java b/src/main/java/com/example/let/server/domain/menu/domain/Menu.java similarity index 83% rename from src/main/java/com/example/let_server/domain/menu/domain/Menu.java rename to src/main/java/com/example/let/server/domain/menu/domain/Menu.java index f76440a..2c15031 100644 --- a/src/main/java/com/example/let_server/domain/menu/domain/Menu.java +++ b/src/main/java/com/example/let/server/domain/menu/domain/Menu.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.menu.domain; +package com.example.let.server.domain.menu.domain; import lombok.*; diff --git a/src/main/java/com/example/let_server/domain/menu/dto/MenuResponse.java b/src/main/java/com/example/let/server/domain/menu/dto/response/MenuResponse.java similarity index 80% rename from src/main/java/com/example/let_server/domain/menu/dto/MenuResponse.java rename to src/main/java/com/example/let/server/domain/menu/dto/response/MenuResponse.java index 5c84edc..36b7213 100644 --- a/src/main/java/com/example/let_server/domain/menu/dto/MenuResponse.java +++ b/src/main/java/com/example/let/server/domain/menu/dto/response/MenuResponse.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.menu.dto; +package com.example.let.server.domain.menu.dto.response; -import com.example.let_server.domain.menu.domain.Menu; +import com.example.let.server.domain.menu.domain.Menu; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/menu/error/MenuError.java b/src/main/java/com/example/let/server/domain/menu/error/MenuError.java similarity index 75% rename from src/main/java/com/example/let_server/domain/menu/error/MenuError.java rename to src/main/java/com/example/let/server/domain/menu/error/MenuError.java index 50a886f..ff445da 100644 --- a/src/main/java/com/example/let_server/domain/menu/error/MenuError.java +++ b/src/main/java/com/example/let/server/domain/menu/error/MenuError.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.menu.error; +package com.example.let.server.domain.menu.error; -import com.example.let_server.global.error.CustomError; +import com.example.let.server.global.error.CustomError; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/let_server/domain/menu/mapper/MenuMapper.java b/src/main/java/com/example/let/server/domain/menu/mapper/MenuMapper.java similarity index 83% rename from src/main/java/com/example/let_server/domain/menu/mapper/MenuMapper.java rename to src/main/java/com/example/let/server/domain/menu/mapper/MenuMapper.java index 3a15fe8..8ca339c 100644 --- a/src/main/java/com/example/let_server/domain/menu/mapper/MenuMapper.java +++ b/src/main/java/com/example/let/server/domain/menu/mapper/MenuMapper.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.menu.mapper; +package com.example.let.server.domain.menu.mapper; -import com.example.let_server.domain.menu.domain.Menu; +import com.example.let.server.domain.menu.domain.Menu; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/let_server/domain/menu/repository/MenuRepository.java b/src/main/java/com/example/let/server/domain/menu/repository/MenuRepository.java similarity index 77% rename from src/main/java/com/example/let_server/domain/menu/repository/MenuRepository.java rename to src/main/java/com/example/let/server/domain/menu/repository/MenuRepository.java index 12cc4e8..f801def 100644 --- a/src/main/java/com/example/let_server/domain/menu/repository/MenuRepository.java +++ b/src/main/java/com/example/let/server/domain/menu/repository/MenuRepository.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.menu.repository; +package com.example.let.server.domain.menu.repository; -import com.example.let_server.domain.menu.domain.Menu; +import com.example.let.server.domain.menu.domain.Menu; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/example/let_server/domain/menu/repository/MybatisMenuRepository.java b/src/main/java/com/example/let/server/domain/menu/repository/MybatisMenuRepository.java similarity index 85% rename from src/main/java/com/example/let_server/domain/menu/repository/MybatisMenuRepository.java rename to src/main/java/com/example/let/server/domain/menu/repository/MybatisMenuRepository.java index ed17a7a..afa686c 100644 --- a/src/main/java/com/example/let_server/domain/menu/repository/MybatisMenuRepository.java +++ b/src/main/java/com/example/let/server/domain/menu/repository/MybatisMenuRepository.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.menu.repository; +package com.example.let.server.domain.menu.repository; -import com.example.let_server.domain.menu.domain.Menu; -import com.example.let_server.domain.menu.mapper.MenuMapper; +import com.example.let.server.domain.menu.domain.Menu; +import com.example.let.server.domain.menu.mapper.MenuMapper; import lombok.RequiredArgsConstructor; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/menu/service/MenuService.java b/src/main/java/com/example/let/server/domain/menu/service/MenuService.java similarity index 72% rename from src/main/java/com/example/let_server/domain/menu/service/MenuService.java rename to src/main/java/com/example/let/server/domain/menu/service/MenuService.java index b20e45b..13edbc6 100644 --- a/src/main/java/com/example/let_server/domain/menu/service/MenuService.java +++ b/src/main/java/com/example/let/server/domain/menu/service/MenuService.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.menu.service; +package com.example.let.server.domain.menu.service; -import com.example.let_server.domain.menu.domain.Menu; +import com.example.let.server.domain.menu.domain.Menu; import java.util.List; public interface MenuService { diff --git a/src/main/java/com/example/let_server/domain/menu/service/MenuServiceImpl.java b/src/main/java/com/example/let/server/domain/menu/service/MenuServiceImpl.java similarity index 79% rename from src/main/java/com/example/let_server/domain/menu/service/MenuServiceImpl.java rename to src/main/java/com/example/let/server/domain/menu/service/MenuServiceImpl.java index c167654..3c19d60 100644 --- a/src/main/java/com/example/let_server/domain/menu/service/MenuServiceImpl.java +++ b/src/main/java/com/example/let/server/domain/menu/service/MenuServiceImpl.java @@ -1,15 +1,14 @@ -package com.example.let_server.domain.menu.service; +package com.example.let.server.domain.menu.service; -import com.example.let_server.domain.menu.domain.Menu; -import com.example.let_server.domain.menu.error.MenuError; -import com.example.let_server.domain.menu.repository.MenuRepository; -import com.example.let_server.global.error.CustomException; +import com.example.let.server.domain.menu.domain.Menu; +import com.example.let.server.domain.menu.error.MenuError; +import com.example.let.server.domain.menu.repository.MenuRepository; +import com.example.let.server.global.error.CustomException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Optional; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/let_server/domain/menuAllergy/controller/MenuAllergyController.java b/src/main/java/com/example/let/server/domain/menuallergy/controller/MenuAllergyController.java similarity index 72% rename from src/main/java/com/example/let_server/domain/menuAllergy/controller/MenuAllergyController.java rename to src/main/java/com/example/let/server/domain/menuallergy/controller/MenuAllergyController.java index d8487c6..0a57607 100644 --- a/src/main/java/com/example/let_server/domain/menuAllergy/controller/MenuAllergyController.java +++ b/src/main/java/com/example/let/server/domain/menuallergy/controller/MenuAllergyController.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.menuAllergy.controller; +package com.example.let.server.domain.menuallergy.controller; -import com.example.let_server.domain.allergy.dto.response.AllergyResponse; -import com.example.let_server.domain.menuAllergy.docs.MenuAllergyDocs; -import com.example.let_server.domain.menuAllergy.service.MenuAllergyService; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.allergy.dto.response.AllergyResponse; +import com.example.let.server.domain.menuallergy.docs.MenuAllergyDocs; +import com.example.let.server.domain.menuallergy.service.MenuAllergyService; +import com.example.let.server.global.common.BaseResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/example/let_server/domain/menuAllergy/docs/MenuAllergyDocs.java b/src/main/java/com/example/let/server/domain/menuallergy/docs/MenuAllergyDocs.java similarity index 74% rename from src/main/java/com/example/let_server/domain/menuAllergy/docs/MenuAllergyDocs.java rename to src/main/java/com/example/let/server/domain/menuallergy/docs/MenuAllergyDocs.java index fcbafe2..dc34796 100644 --- a/src/main/java/com/example/let_server/domain/menuAllergy/docs/MenuAllergyDocs.java +++ b/src/main/java/com/example/let/server/domain/menuallergy/docs/MenuAllergyDocs.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.menuAllergy.docs; +package com.example.let.server.domain.menuallergy.docs; -import com.example.let_server.domain.allergy.dto.response.AllergyResponse; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.allergy.dto.response.AllergyResponse; +import com.example.let.server.global.common.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/example/let_server/domain/menuAllergy/domain/MenuAllergy.java b/src/main/java/com/example/let/server/domain/menuallergy/domain/MenuAllergy.java similarity index 61% rename from src/main/java/com/example/let_server/domain/menuAllergy/domain/MenuAllergy.java rename to src/main/java/com/example/let/server/domain/menuallergy/domain/MenuAllergy.java index 3e826c9..d8248ca 100644 --- a/src/main/java/com/example/let_server/domain/menuAllergy/domain/MenuAllergy.java +++ b/src/main/java/com/example/let/server/domain/menuallergy/domain/MenuAllergy.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.menuAllergy.domain; +package com.example.let.server.domain.menuallergy.domain; -import com.example.let_server.domain.allergy.domain.Allergy; -import com.example.let_server.domain.menu.domain.Menu; +import com.example.let.server.domain.allergy.domain.Allergy; +import com.example.let.server.domain.menu.domain.Menu; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/let_server/domain/menuAllergy/mapper/MenuAllergyMapper.java b/src/main/java/com/example/let/server/domain/menuallergy/mapper/MenuAllergyMapper.java similarity index 63% rename from src/main/java/com/example/let_server/domain/menuAllergy/mapper/MenuAllergyMapper.java rename to src/main/java/com/example/let/server/domain/menuallergy/mapper/MenuAllergyMapper.java index ac9f4a6..2c12c83 100644 --- a/src/main/java/com/example/let_server/domain/menuAllergy/mapper/MenuAllergyMapper.java +++ b/src/main/java/com/example/let/server/domain/menuallergy/mapper/MenuAllergyMapper.java @@ -1,12 +1,11 @@ -package com.example.let_server.domain.menuAllergy.mapper; +package com.example.let.server.domain.menuallergy.mapper; -import com.example.let_server.domain.allergy.domain.Allergy; -import com.example.let_server.domain.menuAllergy.domain.MenuAllergy; +import com.example.let.server.domain.allergy.domain.Allergy; +import com.example.let.server.domain.menuallergy.domain.MenuAllergy; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Optional; @Mapper public interface MenuAllergyMapper { diff --git a/src/main/java/com/example/let_server/domain/menuAllergy/repository/MenuAllergyRepository.java b/src/main/java/com/example/let/server/domain/menuallergy/repository/MenuAllergyRepository.java similarity index 52% rename from src/main/java/com/example/let_server/domain/menuAllergy/repository/MenuAllergyRepository.java rename to src/main/java/com/example/let/server/domain/menuallergy/repository/MenuAllergyRepository.java index da50a46..d144325 100644 --- a/src/main/java/com/example/let_server/domain/menuAllergy/repository/MenuAllergyRepository.java +++ b/src/main/java/com/example/let/server/domain/menuallergy/repository/MenuAllergyRepository.java @@ -1,10 +1,9 @@ -package com.example.let_server.domain.menuAllergy.repository; +package com.example.let.server.domain.menuallergy.repository; -import com.example.let_server.domain.allergy.domain.Allergy; -import com.example.let_server.domain.menuAllergy.domain.MenuAllergy; +import com.example.let.server.domain.allergy.domain.Allergy; +import com.example.let.server.domain.menuallergy.domain.MenuAllergy; import java.util.List; -import java.util.Optional; public interface MenuAllergyRepository { MenuAllergy save(MenuAllergy menuAllergy); diff --git a/src/main/java/com/example/let_server/domain/menuAllergy/repository/MybatisMenuAllergyRepository.java b/src/main/java/com/example/let/server/domain/menuallergy/repository/MybatisMenuAllergyRepository.java similarity index 71% rename from src/main/java/com/example/let_server/domain/menuAllergy/repository/MybatisMenuAllergyRepository.java rename to src/main/java/com/example/let/server/domain/menuallergy/repository/MybatisMenuAllergyRepository.java index 2122c26..cf609e4 100644 --- a/src/main/java/com/example/let_server/domain/menuAllergy/repository/MybatisMenuAllergyRepository.java +++ b/src/main/java/com/example/let/server/domain/menuallergy/repository/MybatisMenuAllergyRepository.java @@ -1,12 +1,11 @@ -package com.example.let_server.domain.menuAllergy.repository; +package com.example.let.server.domain.menuallergy.repository; -import com.example.let_server.domain.allergy.domain.Allergy; -import com.example.let_server.domain.menuAllergy.domain.MenuAllergy; -import com.example.let_server.domain.menuAllergy.mapper.MenuAllergyMapper; +import com.example.let.server.domain.allergy.domain.Allergy; +import com.example.let.server.domain.menuallergy.domain.MenuAllergy; +import com.example.let.server.domain.menuallergy.mapper.MenuAllergyMapper; import lombok.RequiredArgsConstructor; import java.util.List; -import java.util.Optional; @RequiredArgsConstructor public class MybatisMenuAllergyRepository implements MenuAllergyRepository { diff --git a/src/main/java/com/example/let_server/domain/menuAllergy/service/MenuAllergyService.java b/src/main/java/com/example/let/server/domain/menuallergy/service/MenuAllergyService.java similarity index 66% rename from src/main/java/com/example/let_server/domain/menuAllergy/service/MenuAllergyService.java rename to src/main/java/com/example/let/server/domain/menuallergy/service/MenuAllergyService.java index 46cd8eb..7d4dd67 100644 --- a/src/main/java/com/example/let_server/domain/menuAllergy/service/MenuAllergyService.java +++ b/src/main/java/com/example/let/server/domain/menuallergy/service/MenuAllergyService.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.menuAllergy.service; +package com.example.let.server.domain.menuallergy.service; -import com.example.let_server.domain.allergy.dto.response.AllergyResponse; +import com.example.let.server.domain.allergy.dto.response.AllergyResponse; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/menuAllergy/service/impl/MenuAllergyServiceImpl.java b/src/main/java/com/example/let/server/domain/menuallergy/service/impl/MenuAllergyServiceImpl.java similarity index 66% rename from src/main/java/com/example/let_server/domain/menuAllergy/service/impl/MenuAllergyServiceImpl.java rename to src/main/java/com/example/let/server/domain/menuallergy/service/impl/MenuAllergyServiceImpl.java index 433c2f7..b7fbca8 100644 --- a/src/main/java/com/example/let_server/domain/menuAllergy/service/impl/MenuAllergyServiceImpl.java +++ b/src/main/java/com/example/let/server/domain/menuallergy/service/impl/MenuAllergyServiceImpl.java @@ -1,21 +1,19 @@ -package com.example.let_server.domain.menuAllergy.service.impl; - -import com.example.let_server.domain.allergy.domain.Allergy; -import com.example.let_server.domain.allergy.dto.response.AllergyResponse; -import com.example.let_server.domain.allergy.error.AllergyError; -import com.example.let_server.domain.allergy.service.AllergyService; -import com.example.let_server.domain.meal.service.MealService; -import com.example.let_server.domain.menu.domain.Menu; -import com.example.let_server.domain.menu.service.MenuService; -import com.example.let_server.domain.menuAllergy.domain.MenuAllergy; -import com.example.let_server.domain.menuAllergy.repository.MenuAllergyRepository; -import com.example.let_server.domain.menuAllergy.service.MenuAllergyService; +package com.example.let.server.domain.menuallergy.service.impl; + +import com.example.let.server.domain.allergy.domain.Allergy; +import com.example.let.server.domain.allergy.dto.response.AllergyResponse; +import com.example.let.server.domain.allergy.service.AllergyService; +import com.example.let.server.domain.meal.service.MealService; +import com.example.let.server.domain.menu.domain.Menu; +import com.example.let.server.domain.menu.service.MenuService; +import com.example.let.server.domain.menuallergy.domain.MenuAllergy; +import com.example.let.server.domain.menuallergy.repository.MenuAllergyRepository; +import com.example.let.server.domain.menuallergy.service.MenuAllergyService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.stream.Collectors; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/let_server/domain/menuRank/controller/MenuRankController.java b/src/main/java/com/example/let/server/domain/menurank/controller/MenuRankController.java similarity index 75% rename from src/main/java/com/example/let_server/domain/menuRank/controller/MenuRankController.java rename to src/main/java/com/example/let/server/domain/menurank/controller/MenuRankController.java index b07b4a4..3dc4a29 100644 --- a/src/main/java/com/example/let_server/domain/menuRank/controller/MenuRankController.java +++ b/src/main/java/com/example/let/server/domain/menurank/controller/MenuRankController.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.menuRank.controller; +package com.example.let.server.domain.menurank.controller; -import com.example.let_server.domain.menuRank.docs.MenuRankDocs; -import com.example.let_server.domain.menuRank.dto.response.MenuRankingDto; -import com.example.let_server.domain.menuRank.service.MenuRankService; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.menurank.docs.MenuRankDocs; +import com.example.let.server.domain.menurank.dto.response.MenuRankingDto; +import com.example.let.server.domain.menurank.service.MenuRankService; +import com.example.let.server.global.common.BaseResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/example/let_server/domain/menuRank/docs/MenuRankDocs.java b/src/main/java/com/example/let/server/domain/menurank/docs/MenuRankDocs.java similarity index 77% rename from src/main/java/com/example/let_server/domain/menuRank/docs/MenuRankDocs.java rename to src/main/java/com/example/let/server/domain/menurank/docs/MenuRankDocs.java index aefe9ac..e5bf12d 100644 --- a/src/main/java/com/example/let_server/domain/menuRank/docs/MenuRankDocs.java +++ b/src/main/java/com/example/let/server/domain/menurank/docs/MenuRankDocs.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.menuRank.docs; +package com.example.let.server.domain.menurank.docs; -import com.example.let_server.domain.menuRank.dto.response.MenuRankingDto; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.menurank.dto.response.MenuRankingDto; +import com.example.let.server.global.common.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/example/let_server/domain/menuRank/domain/MenuRankHistory.java b/src/main/java/com/example/let/server/domain/menurank/domain/MenuRankHistory.java similarity index 62% rename from src/main/java/com/example/let_server/domain/menuRank/domain/MenuRankHistory.java rename to src/main/java/com/example/let/server/domain/menurank/domain/MenuRankHistory.java index 8aa4f14..897d6be 100644 --- a/src/main/java/com/example/let_server/domain/menuRank/domain/MenuRankHistory.java +++ b/src/main/java/com/example/let/server/domain/menurank/domain/MenuRankHistory.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.menuRank.domain; +package com.example.let.server.domain.menurank.domain; -import com.example.let_server.domain.menu.domain.Menu; +import com.example.let.server.domain.menu.domain.Menu; import java.util.Date; diff --git a/src/main/java/com/example/let_server/domain/menuRank/dto/response/MenuRankingDto.java b/src/main/java/com/example/let/server/domain/menurank/dto/response/MenuRankingDto.java similarity index 83% rename from src/main/java/com/example/let_server/domain/menuRank/dto/response/MenuRankingDto.java rename to src/main/java/com/example/let/server/domain/menurank/dto/response/MenuRankingDto.java index 924f6fe..b7e1db9 100644 --- a/src/main/java/com/example/let_server/domain/menuRank/dto/response/MenuRankingDto.java +++ b/src/main/java/com/example/let/server/domain/menurank/dto/response/MenuRankingDto.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.menuRank.dto.response; +package com.example.let.server.domain.menurank.dto.response; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/example/let_server/domain/menuRank/mapper/MenuRankMapper.java b/src/main/java/com/example/let/server/domain/menurank/mapper/MenuRankMapper.java similarity index 79% rename from src/main/java/com/example/let_server/domain/menuRank/mapper/MenuRankMapper.java rename to src/main/java/com/example/let/server/domain/menurank/mapper/MenuRankMapper.java index 653b904..4e87a59 100644 --- a/src/main/java/com/example/let_server/domain/menuRank/mapper/MenuRankMapper.java +++ b/src/main/java/com/example/let/server/domain/menurank/mapper/MenuRankMapper.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.menuRank.mapper; +package com.example.let.server.domain.menurank.mapper; -import com.example.let_server.domain.menuRank.dto.response.MenuRankingDto; +import com.example.let.server.domain.menurank.dto.response.MenuRankingDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/let_server/domain/menuRank/repository/MenuRankRepository.java b/src/main/java/com/example/let/server/domain/menurank/repository/MenuRankRepository.java similarity index 71% rename from src/main/java/com/example/let_server/domain/menuRank/repository/MenuRankRepository.java rename to src/main/java/com/example/let/server/domain/menurank/repository/MenuRankRepository.java index 0cd4695..7e6e9cc 100644 --- a/src/main/java/com/example/let_server/domain/menuRank/repository/MenuRankRepository.java +++ b/src/main/java/com/example/let/server/domain/menurank/repository/MenuRankRepository.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.menuRank.repository; +package com.example.let.server.domain.menurank.repository; -import com.example.let_server.domain.menuRank.dto.response.MenuRankingDto; +import com.example.let.server.domain.menurank.dto.response.MenuRankingDto; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/menuRank/repository/MybatisMenuRankRepository.java b/src/main/java/com/example/let/server/domain/menurank/repository/MybatisMenuRankRepository.java similarity index 81% rename from src/main/java/com/example/let_server/domain/menuRank/repository/MybatisMenuRankRepository.java rename to src/main/java/com/example/let/server/domain/menurank/repository/MybatisMenuRankRepository.java index 05e343e..d0dce92 100644 --- a/src/main/java/com/example/let_server/domain/menuRank/repository/MybatisMenuRankRepository.java +++ b/src/main/java/com/example/let/server/domain/menurank/repository/MybatisMenuRankRepository.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.menuRank.repository; +package com.example.let.server.domain.menurank.repository; -import com.example.let_server.domain.menuRank.dto.response.MenuRankingDto; -import com.example.let_server.domain.menuRank.mapper.MenuRankMapper; +import com.example.let.server.domain.menurank.dto.response.MenuRankingDto; +import com.example.let.server.domain.menurank.mapper.MenuRankMapper; import lombok.RequiredArgsConstructor; import java.util.Date; diff --git a/src/main/java/com/example/let_server/domain/menuRank/service/MenuRankService.java b/src/main/java/com/example/let/server/domain/menurank/service/MenuRankService.java similarity index 56% rename from src/main/java/com/example/let_server/domain/menuRank/service/MenuRankService.java rename to src/main/java/com/example/let/server/domain/menurank/service/MenuRankService.java index 3ab70b1..e524a46 100644 --- a/src/main/java/com/example/let_server/domain/menuRank/service/MenuRankService.java +++ b/src/main/java/com/example/let/server/domain/menurank/service/MenuRankService.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.menuRank.service; +package com.example.let.server.domain.menurank.service; -import com.example.let_server.domain.menuRank.dto.response.MenuRankingDto; +import com.example.let.server.domain.menurank.dto.response.MenuRankingDto; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/menuRank/service/impl/MenuRankServiceImpl.java b/src/main/java/com/example/let/server/domain/menurank/service/impl/MenuRankServiceImpl.java similarity index 85% rename from src/main/java/com/example/let_server/domain/menuRank/service/impl/MenuRankServiceImpl.java rename to src/main/java/com/example/let/server/domain/menurank/service/impl/MenuRankServiceImpl.java index c935ba6..15a37ed 100644 --- a/src/main/java/com/example/let_server/domain/menuRank/service/impl/MenuRankServiceImpl.java +++ b/src/main/java/com/example/let/server/domain/menurank/service/impl/MenuRankServiceImpl.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.menuRank.service.impl; +package com.example.let.server.domain.menurank.service.impl; -import com.example.let_server.domain.menu.repository.MenuRepository; -import com.example.let_server.domain.menuRank.dto.response.MenuRankingDto; -import com.example.let_server.domain.menuRank.repository.MenuRankRepository; -import com.example.let_server.domain.menuRank.service.MenuRankService; +import com.example.let.server.domain.menu.repository.MenuRepository; +import com.example.let.server.domain.menurank.dto.response.MenuRankingDto; +import com.example.let.server.domain.menurank.repository.MenuRankRepository; +import com.example.let.server.domain.menurank.service.MenuRankService; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/let_server/domain/statistics/controller/StatisticsController.java b/src/main/java/com/example/let/server/domain/statistics/controller/StatisticsController.java similarity index 78% rename from src/main/java/com/example/let_server/domain/statistics/controller/StatisticsController.java rename to src/main/java/com/example/let/server/domain/statistics/controller/StatisticsController.java index d4a88ff..1a16396 100644 --- a/src/main/java/com/example/let_server/domain/statistics/controller/StatisticsController.java +++ b/src/main/java/com/example/let/server/domain/statistics/controller/StatisticsController.java @@ -1,12 +1,12 @@ -package com.example.let_server.domain.statistics.controller; +package com.example.let.server.domain.statistics.controller; -import com.example.let_server.domain.statistics.docs.StatisticsDocs; -import com.example.let_server.domain.statistics.dto.response.MonthlyStatisticsResponse; -import com.example.let_server.domain.statistics.dto.response.MealStatistics; -import com.example.let_server.domain.statistics.dto.response.LowParticipationAnalysis; -import com.example.let_server.domain.statistics.dto.response.MealDetails; -import com.example.let_server.domain.statistics.service.StatisticsService; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.statistics.docs.StatisticsDocs; +import com.example.let.server.domain.statistics.dto.response.MonthlyStatisticsResponse; +import com.example.let.server.domain.statistics.dto.response.MealStatistics; +import com.example.let.server.domain.statistics.dto.response.LowParticipationAnalysis; +import com.example.let.server.domain.statistics.dto.response.MealDetails; +import com.example.let.server.domain.statistics.service.StatisticsService; +import com.example.let.server.global.common.BaseResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -46,4 +46,4 @@ public ResponseEntity> getMealDetails( MealDetails details = statisticsService.getMealDetails(mealId); return BaseResponse.of(details); } -} \ No newline at end of file +} diff --git a/src/main/java/com/example/let_server/domain/statistics/docs/StatisticsDocs.java b/src/main/java/com/example/let/server/domain/statistics/docs/StatisticsDocs.java similarity index 90% rename from src/main/java/com/example/let_server/domain/statistics/docs/StatisticsDocs.java rename to src/main/java/com/example/let/server/domain/statistics/docs/StatisticsDocs.java index 989e813..1c5429f 100644 --- a/src/main/java/com/example/let_server/domain/statistics/docs/StatisticsDocs.java +++ b/src/main/java/com/example/let/server/domain/statistics/docs/StatisticsDocs.java @@ -1,10 +1,10 @@ -package com.example.let_server.domain.statistics.docs; +package com.example.let.server.domain.statistics.docs; -import com.example.let_server.domain.statistics.dto.response.MonthlyStatisticsResponse; -import com.example.let_server.domain.statistics.dto.response.MealStatistics; -import com.example.let_server.domain.statistics.dto.response.LowParticipationAnalysis; -import com.example.let_server.domain.statistics.dto.response.MealDetails; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.statistics.dto.response.MonthlyStatisticsResponse; +import com.example.let.server.domain.statistics.dto.response.MealStatistics; +import com.example.let.server.domain.statistics.dto.response.LowParticipationAnalysis; +import com.example.let.server.domain.statistics.dto.response.MealDetails; +import com.example.let.server.global.common.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/src/main/java/com/example/let_server/domain/statistics/dto/response/LowParticipationAnalysis.java b/src/main/java/com/example/let/server/domain/statistics/dto/response/LowParticipationAnalysis.java similarity index 81% rename from src/main/java/com/example/let_server/domain/statistics/dto/response/LowParticipationAnalysis.java rename to src/main/java/com/example/let/server/domain/statistics/dto/response/LowParticipationAnalysis.java index d43bd44..b40ffa5 100644 --- a/src/main/java/com/example/let_server/domain/statistics/dto/response/LowParticipationAnalysis.java +++ b/src/main/java/com/example/let/server/domain/statistics/dto/response/LowParticipationAnalysis.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.statistics.dto.response; +package com.example.let.server.domain.statistics.dto.response; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/statistics/dto/response/LowParticipationMeal.java b/src/main/java/com/example/let/server/domain/statistics/dto/response/LowParticipationMeal.java similarity index 83% rename from src/main/java/com/example/let_server/domain/statistics/dto/response/LowParticipationMeal.java rename to src/main/java/com/example/let/server/domain/statistics/dto/response/LowParticipationMeal.java index 7a6217a..203ced4 100644 --- a/src/main/java/com/example/let_server/domain/statistics/dto/response/LowParticipationMeal.java +++ b/src/main/java/com/example/let/server/domain/statistics/dto/response/LowParticipationMeal.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.statistics.dto.response; +package com.example.let.server.domain.statistics.dto.response; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/statistics/dto/response/MealDetails.java b/src/main/java/com/example/let/server/domain/statistics/dto/response/MealDetails.java similarity index 82% rename from src/main/java/com/example/let_server/domain/statistics/dto/response/MealDetails.java rename to src/main/java/com/example/let/server/domain/statistics/dto/response/MealDetails.java index 1786d44..196f138 100644 --- a/src/main/java/com/example/let_server/domain/statistics/dto/response/MealDetails.java +++ b/src/main/java/com/example/let/server/domain/statistics/dto/response/MealDetails.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.statistics.dto.response; +package com.example.let.server.domain.statistics.dto.response; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/statistics/dto/response/MealStatistics.java b/src/main/java/com/example/let/server/domain/statistics/dto/response/MealStatistics.java similarity index 85% rename from src/main/java/com/example/let_server/domain/statistics/dto/response/MealStatistics.java rename to src/main/java/com/example/let/server/domain/statistics/dto/response/MealStatistics.java index e2ce9b8..fb0156a 100644 --- a/src/main/java/com/example/let_server/domain/statistics/dto/response/MealStatistics.java +++ b/src/main/java/com/example/let/server/domain/statistics/dto/response/MealStatistics.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.statistics.dto.response; +package com.example.let.server.domain.statistics.dto.response; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/statistics/dto/response/MonthlyStatisticsResponse.java b/src/main/java/com/example/let/server/domain/statistics/dto/response/MonthlyStatisticsResponse.java similarity index 89% rename from src/main/java/com/example/let_server/domain/statistics/dto/response/MonthlyStatisticsResponse.java rename to src/main/java/com/example/let/server/domain/statistics/dto/response/MonthlyStatisticsResponse.java index 62d7d85..9cb19b5 100644 --- a/src/main/java/com/example/let_server/domain/statistics/dto/response/MonthlyStatisticsResponse.java +++ b/src/main/java/com/example/let/server/domain/statistics/dto/response/MonthlyStatisticsResponse.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.statistics.dto.response; +package com.example.let.server.domain.statistics.dto.response; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/example/let_server/domain/statistics/service/StatisticsService.java b/src/main/java/com/example/let/server/domain/statistics/service/StatisticsService.java similarity index 53% rename from src/main/java/com/example/let_server/domain/statistics/service/StatisticsService.java rename to src/main/java/com/example/let/server/domain/statistics/service/StatisticsService.java index 3e5a65f..76ba919 100644 --- a/src/main/java/com/example/let_server/domain/statistics/service/StatisticsService.java +++ b/src/main/java/com/example/let/server/domain/statistics/service/StatisticsService.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.statistics.service; +package com.example.let.server.domain.statistics.service; -import com.example.let_server.domain.statistics.dto.response.MonthlyStatisticsResponse; -import com.example.let_server.domain.statistics.dto.response.MealStatistics; -import com.example.let_server.domain.statistics.dto.response.LowParticipationAnalysis; -import com.example.let_server.domain.statistics.dto.response.MealDetails; +import com.example.let.server.domain.statistics.dto.response.MonthlyStatisticsResponse; +import com.example.let.server.domain.statistics.dto.response.MealStatistics; +import com.example.let.server.domain.statistics.dto.response.LowParticipationAnalysis; +import com.example.let.server.domain.statistics.dto.response.MealDetails; public interface StatisticsService { MonthlyStatisticsResponse getMonthlyStatistics(int year, int month); diff --git a/src/main/java/com/example/let_server/domain/statistics/service/impl/StatisticsServiceImpl.java b/src/main/java/com/example/let/server/domain/statistics/service/impl/StatisticsServiceImpl.java similarity index 80% rename from src/main/java/com/example/let_server/domain/statistics/service/impl/StatisticsServiceImpl.java rename to src/main/java/com/example/let/server/domain/statistics/service/impl/StatisticsServiceImpl.java index a837746..db21492 100644 --- a/src/main/java/com/example/let_server/domain/statistics/service/impl/StatisticsServiceImpl.java +++ b/src/main/java/com/example/let/server/domain/statistics/service/impl/StatisticsServiceImpl.java @@ -1,21 +1,19 @@ -package com.example.let_server.domain.statistics.service.impl; +package com.example.let.server.domain.statistics.service.impl; -import com.example.let_server.domain.eater.service.EaterService; -import com.example.let_server.domain.mealRating.service.MealRatingService; -import com.example.let_server.domain.menu.service.MenuService; -import com.example.let_server.domain.menuRank.service.MenuRankService; -import com.example.let_server.domain.meal.service.MealService; -import com.example.let_server.domain.statistics.dto.response.MonthlyStatisticsResponse; -import com.example.let_server.domain.statistics.dto.response.MealStatistics; -import com.example.let_server.domain.statistics.dto.response.LowParticipationAnalysis; -import com.example.let_server.domain.statistics.dto.response.LowParticipationMeal; -import com.example.let_server.domain.statistics.dto.response.MealDetails; -import com.example.let_server.domain.statistics.service.StatisticsService; -import com.example.let_server.domain.user.service.UserService; +import com.example.let.server.domain.eater.service.EaterService; +import com.example.let.server.domain.mealrating.service.MealRatingService; +import com.example.let.server.domain.menurank.service.MenuRankService; +import com.example.let.server.domain.meal.service.MealService; +import com.example.let.server.domain.statistics.dto.response.MonthlyStatisticsResponse; +import com.example.let.server.domain.statistics.dto.response.MealStatistics; +import com.example.let.server.domain.statistics.dto.response.LowParticipationAnalysis; +import com.example.let.server.domain.statistics.dto.response.LowParticipationMeal; +import com.example.let.server.domain.statistics.dto.response.MealDetails; +import com.example.let.server.domain.statistics.service.StatisticsService; +import com.example.let.server.domain.user.service.UserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.Arrays; import java.util.List; @Service diff --git a/src/main/java/com/example/let_server/domain/user/controller/UserController.java b/src/main/java/com/example/let/server/domain/user/controller/UserController.java similarity index 78% rename from src/main/java/com/example/let_server/domain/user/controller/UserController.java rename to src/main/java/com/example/let/server/domain/user/controller/UserController.java index 447648d..58e2201 100644 --- a/src/main/java/com/example/let_server/domain/user/controller/UserController.java +++ b/src/main/java/com/example/let/server/domain/user/controller/UserController.java @@ -1,9 +1,9 @@ -package com.example.let_server.domain.user.controller; +package com.example.let.server.domain.user.controller; -import com.example.let_server.domain.user.docs.UserDocs; -import com.example.let_server.domain.user.dto.response.UserInfoResponse; -import com.example.let_server.domain.user.service.UserService; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.user.docs.UserDocs; +import com.example.let.server.domain.user.dto.response.UserInfoResponse; +import com.example.let.server.domain.user.service.UserService; +import com.example.let.server.global.common.BaseResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/example/let_server/domain/user/docs/UserDocs.java b/src/main/java/com/example/let/server/domain/user/docs/UserDocs.java similarity index 91% rename from src/main/java/com/example/let_server/domain/user/docs/UserDocs.java rename to src/main/java/com/example/let/server/domain/user/docs/UserDocs.java index 3357992..628f8da 100644 --- a/src/main/java/com/example/let_server/domain/user/docs/UserDocs.java +++ b/src/main/java/com/example/let/server/domain/user/docs/UserDocs.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.user.docs; +package com.example.let.server.domain.user.docs; -import com.example.let_server.domain.user.dto.response.UserInfoResponse; -import com.example.let_server.global.common.BaseResponse; +import com.example.let.server.domain.user.dto.response.UserInfoResponse; +import com.example.let.server.global.common.BaseResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; diff --git a/src/main/java/com/example/let_server/domain/user/domain/User.java b/src/main/java/com/example/let/server/domain/user/domain/User.java similarity index 87% rename from src/main/java/com/example/let_server/domain/user/domain/User.java rename to src/main/java/com/example/let/server/domain/user/domain/User.java index 316fadb..fcde25e 100644 --- a/src/main/java/com/example/let_server/domain/user/domain/User.java +++ b/src/main/java/com/example/let/server/domain/user/domain/User.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.user.domain; +package com.example.let.server.domain.user.domain; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/let_server/domain/user/domain/UserRole.java b/src/main/java/com/example/let/server/domain/user/domain/UserRole.java similarity index 52% rename from src/main/java/com/example/let_server/domain/user/domain/UserRole.java rename to src/main/java/com/example/let/server/domain/user/domain/UserRole.java index b063f9d..750c229 100644 --- a/src/main/java/com/example/let_server/domain/user/domain/UserRole.java +++ b/src/main/java/com/example/let/server/domain/user/domain/UserRole.java @@ -1,4 +1,4 @@ -package com.example.let_server.domain.user.domain; +package com.example.let.server.domain.user.domain; public enum UserRole { ROLE_ADMIN, diff --git a/src/main/java/com/example/let_server/domain/user/dto/response/UserEaterResponse.java b/src/main/java/com/example/let/server/domain/user/dto/response/UserEaterResponse.java similarity index 78% rename from src/main/java/com/example/let_server/domain/user/dto/response/UserEaterResponse.java rename to src/main/java/com/example/let/server/domain/user/dto/response/UserEaterResponse.java index 04826c1..cfb53dc 100644 --- a/src/main/java/com/example/let_server/domain/user/dto/response/UserEaterResponse.java +++ b/src/main/java/com/example/let/server/domain/user/dto/response/UserEaterResponse.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.user.dto.response; +package com.example.let.server.domain.user.dto.response; -import com.example.let_server.domain.user.domain.User; +import com.example.let.server.domain.user.domain.User; import lombok.Builder; @Builder diff --git a/src/main/java/com/example/let_server/domain/user/dto/response/UserInfoResponse.java b/src/main/java/com/example/let/server/domain/user/dto/response/UserInfoResponse.java similarity index 80% rename from src/main/java/com/example/let_server/domain/user/dto/response/UserInfoResponse.java rename to src/main/java/com/example/let/server/domain/user/dto/response/UserInfoResponse.java index 3b82fb2..4238bbf 100644 --- a/src/main/java/com/example/let_server/domain/user/dto/response/UserInfoResponse.java +++ b/src/main/java/com/example/let/server/domain/user/dto/response/UserInfoResponse.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.user.dto.response; +package com.example.let.server.domain.user.dto.response; -import com.example.let_server.domain.user.domain.User; +import com.example.let.server.domain.user.domain.User; import lombok.Builder; @Builder diff --git a/src/main/java/com/example/let_server/domain/user/dto/response/UserResponse.java b/src/main/java/com/example/let/server/domain/user/dto/response/UserResponse.java similarity index 75% rename from src/main/java/com/example/let_server/domain/user/dto/response/UserResponse.java rename to src/main/java/com/example/let/server/domain/user/dto/response/UserResponse.java index 3125bae..90b8b0f 100644 --- a/src/main/java/com/example/let_server/domain/user/dto/response/UserResponse.java +++ b/src/main/java/com/example/let/server/domain/user/dto/response/UserResponse.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.user.dto.response; +package com.example.let.server.domain.user.dto.response; -import com.example.let_server.domain.user.domain.User; -import com.example.let_server.domain.user.domain.UserRole; +import com.example.let.server.domain.user.domain.User; +import com.example.let.server.domain.user.domain.UserRole; import lombok.Builder; @Builder diff --git a/src/main/java/com/example/let_server/domain/user/error/UserError.java b/src/main/java/com/example/let/server/domain/user/error/UserError.java similarity index 78% rename from src/main/java/com/example/let_server/domain/user/error/UserError.java rename to src/main/java/com/example/let/server/domain/user/error/UserError.java index 5669457..54cf453 100644 --- a/src/main/java/com/example/let_server/domain/user/error/UserError.java +++ b/src/main/java/com/example/let/server/domain/user/error/UserError.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.user.error; +package com.example.let.server.domain.user.error; -import com.example.let_server.global.error.CustomError; +import com.example.let.server.global.error.CustomError; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/let_server/domain/user/mapper/UserMapper.java b/src/main/java/com/example/let/server/domain/user/mapper/UserMapper.java similarity index 78% rename from src/main/java/com/example/let_server/domain/user/mapper/UserMapper.java rename to src/main/java/com/example/let/server/domain/user/mapper/UserMapper.java index b095705..6fbc61a 100644 --- a/src/main/java/com/example/let_server/domain/user/mapper/UserMapper.java +++ b/src/main/java/com/example/let/server/domain/user/mapper/UserMapper.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.user.mapper; +package com.example.let.server.domain.user.mapper; -import com.example.let_server.domain.user.domain.User; +import com.example.let.server.domain.user.domain.User; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/user/repository/MybatisUserRepository.java b/src/main/java/com/example/let/server/domain/user/repository/MybatisUserRepository.java similarity index 87% rename from src/main/java/com/example/let_server/domain/user/repository/MybatisUserRepository.java rename to src/main/java/com/example/let/server/domain/user/repository/MybatisUserRepository.java index f953682..712faf1 100644 --- a/src/main/java/com/example/let_server/domain/user/repository/MybatisUserRepository.java +++ b/src/main/java/com/example/let/server/domain/user/repository/MybatisUserRepository.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.user.repository; +package com.example.let.server.domain.user.repository; -import com.example.let_server.domain.user.domain.User; -import com.example.let_server.domain.user.mapper.UserMapper; +import com.example.let.server.domain.user.domain.User; +import com.example.let.server.domain.user.mapper.UserMapper; import lombok.RequiredArgsConstructor; import java.util.List; diff --git a/src/main/java/com/example/let_server/domain/user/repository/UserRepository.java b/src/main/java/com/example/let/server/domain/user/repository/UserRepository.java similarity index 74% rename from src/main/java/com/example/let_server/domain/user/repository/UserRepository.java rename to src/main/java/com/example/let/server/domain/user/repository/UserRepository.java index fbe815b..13080fc 100644 --- a/src/main/java/com/example/let_server/domain/user/repository/UserRepository.java +++ b/src/main/java/com/example/let/server/domain/user/repository/UserRepository.java @@ -1,6 +1,6 @@ -package com.example.let_server.domain.user.repository; +package com.example.let.server.domain.user.repository; -import com.example.let_server.domain.user.domain.User; +import com.example.let.server.domain.user.domain.User; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/example/let_server/domain/user/service/UserService.java b/src/main/java/com/example/let/server/domain/user/service/UserService.java similarity index 56% rename from src/main/java/com/example/let_server/domain/user/service/UserService.java rename to src/main/java/com/example/let/server/domain/user/service/UserService.java index e1d33ff..4777b1e 100644 --- a/src/main/java/com/example/let_server/domain/user/service/UserService.java +++ b/src/main/java/com/example/let/server/domain/user/service/UserService.java @@ -1,7 +1,7 @@ -package com.example.let_server.domain.user.service; +package com.example.let.server.domain.user.service; -import com.example.let_server.domain.user.domain.User; -import com.example.let_server.domain.user.dto.response.UserInfoResponse; +import com.example.let.server.domain.user.domain.User; +import com.example.let.server.domain.user.dto.response.UserInfoResponse; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/example/let_server/domain/user/service/impl/UserServiceImpl.java b/src/main/java/com/example/let/server/domain/user/service/impl/UserServiceImpl.java similarity index 67% rename from src/main/java/com/example/let_server/domain/user/service/impl/UserServiceImpl.java rename to src/main/java/com/example/let/server/domain/user/service/impl/UserServiceImpl.java index be885a3..ed3eadf 100644 --- a/src/main/java/com/example/let_server/domain/user/service/impl/UserServiceImpl.java +++ b/src/main/java/com/example/let/server/domain/user/service/impl/UserServiceImpl.java @@ -1,14 +1,13 @@ -package com.example.let_server.domain.user.service.impl; +package com.example.let.server.domain.user.service.impl; -import com.example.let_server.domain.user.domain.User; -import com.example.let_server.domain.user.dto.response.UserInfoResponse; -import com.example.let_server.domain.user.repository.UserRepository; -import com.example.let_server.domain.user.service.UserService; -import com.example.let_server.global.security.holder.SecurityHolder; +import com.example.let.server.domain.user.domain.User; +import com.example.let.server.domain.user.dto.response.UserInfoResponse; +import com.example.let.server.domain.user.repository.UserRepository; +import com.example.let.server.domain.user.service.UserService; +import com.example.let.server.global.security.holder.SecurityHolder; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/example/let_server/global/common/BaseResponse.java b/src/main/java/com/example/let/server/global/common/BaseResponse.java similarity index 62% rename from src/main/java/com/example/let_server/global/common/BaseResponse.java rename to src/main/java/com/example/let/server/global/common/BaseResponse.java index 30846c5..5e96eb4 100644 --- a/src/main/java/com/example/let_server/global/common/BaseResponse.java +++ b/src/main/java/com/example/let/server/global/common/BaseResponse.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.common; +package com.example.let.server.global.common; import org.springframework.http.ResponseEntity; @@ -7,12 +7,15 @@ public record BaseResponse( int status, String message ) { + private static final int DEFAULT_SUCCESS_STATUS = 200; + private static final String DEFAULT_MESSAGE = ""; + public static ResponseEntity> of(T data) { - return BaseResponse.of(data, 200, ""); + return BaseResponse.of(data, DEFAULT_SUCCESS_STATUS, DEFAULT_MESSAGE); } public static ResponseEntity> of(T data, int status) { - return BaseResponse.of(data, status, ""); + return BaseResponse.of(data, status, DEFAULT_MESSAGE); } public static ResponseEntity> of(T data, int status, String message) { diff --git a/src/main/java/com/example/let_server/global/config/mybatis/MybatisConfig.java b/src/main/java/com/example/let/server/global/config/mybatis/MybatisConfig.java similarity index 53% rename from src/main/java/com/example/let_server/global/config/mybatis/MybatisConfig.java rename to src/main/java/com/example/let/server/global/config/mybatis/MybatisConfig.java index c4c205d..0a0ac4d 100644 --- a/src/main/java/com/example/let_server/global/config/mybatis/MybatisConfig.java +++ b/src/main/java/com/example/let/server/global/config/mybatis/MybatisConfig.java @@ -1,40 +1,39 @@ -package com.example.let_server.global.config.mybatis; +package com.example.let.server.global.config.mybatis; -import com.example.let_server.domain.allergy.mapper.AllergyMapper; -import com.example.let_server.domain.allergy.repository.AllergyRepository; -import com.example.let_server.domain.allergy.repository.MybatisAllergyRepository; -import com.example.let_server.domain.eater.mapper.EaterMapper; -import com.example.let_server.domain.eater.repository.EaterRepository; -import com.example.let_server.domain.eater.repository.MybatisEaterRepository; -import com.example.let_server.domain.exercises.mapper.ExerciseMapper; -import com.example.let_server.domain.exercises.repository.ExerciseRepository; -import com.example.let_server.domain.exercises.repository.MybatisExerciseRepository; -import com.example.let_server.domain.meal.mapper.MealMapper; -import com.example.let_server.domain.meal.repository.MealRepository; -import com.example.let_server.domain.meal.repository.MybatisMealRepository; -import com.example.let_server.domain.mealMenu.mapper.MealMenuMapper; -import com.example.let_server.domain.mealMenu.repository.MealMenuRepository; -import com.example.let_server.domain.mealMenu.repository.MybatisMealMenuRepository; -import com.example.let_server.domain.mealRating.mapper.MealRatingMapper; -import com.example.let_server.domain.mealRating.repository.MealRatingRepository; -import com.example.let_server.domain.mealRating.repository.MybatisMealRatingRepository; -import com.example.let_server.domain.menu.mapper.MenuMapper; -import com.example.let_server.domain.menu.repository.MenuRepository; -import com.example.let_server.domain.menu.repository.MybatisMenuRepository; -import com.example.let_server.domain.menuAllergy.mapper.MenuAllergyMapper; -import com.example.let_server.domain.menuAllergy.repository.MenuAllergyRepository; -import com.example.let_server.domain.menuAllergy.repository.MybatisMenuAllergyRepository; -import com.example.let_server.domain.menuRank.mapper.MenuRankMapper; -import com.example.let_server.domain.menuRank.repository.MenuRankRepository; -import com.example.let_server.domain.menuRank.repository.MybatisMenuRankRepository; -import com.example.let_server.domain.user.mapper.UserMapper; -import com.example.let_server.domain.user.repository.MybatisUserRepository; -import com.example.let_server.domain.user.repository.UserRepository; +import com.example.let.server.domain.allergy.mapper.AllergyMapper; +import com.example.let.server.domain.allergy.repository.AllergyRepository; +import com.example.let.server.domain.allergy.repository.MybatisAllergyRepository; +import com.example.let.server.domain.eater.mapper.EaterMapper; +import com.example.let.server.domain.eater.repository.EaterRepository; +import com.example.let.server.domain.eater.repository.MybatisEaterRepository; +import com.example.let.server.domain.exercises.mapper.ExerciseMapper; +import com.example.let.server.domain.exercises.repository.ExerciseRepository; +import com.example.let.server.domain.exercises.repository.MybatisExerciseRepository; +import com.example.let.server.domain.meal.mapper.MealMapper; +import com.example.let.server.domain.meal.repository.MealRepository; +import com.example.let.server.domain.meal.repository.MybatisMealRepository; +import com.example.let.server.domain.mealmenu.mapper.MealMenuMapper; +import com.example.let.server.domain.mealmenu.repository.MealMenuRepository; +import com.example.let.server.domain.mealmenu.repository.MybatisMealMenuRepository; +import com.example.let.server.domain.mealrating.mapper.MealRatingMapper; +import com.example.let.server.domain.mealrating.repository.MealRatingRepository; +import com.example.let.server.domain.mealrating.repository.MybatisMealRatingRepository; +import com.example.let.server.domain.menu.mapper.MenuMapper; +import com.example.let.server.domain.menu.repository.MenuRepository; +import com.example.let.server.domain.menu.repository.MybatisMenuRepository; +import com.example.let.server.domain.menuallergy.mapper.MenuAllergyMapper; +import com.example.let.server.domain.menuallergy.repository.MenuAllergyRepository; +import com.example.let.server.domain.menuallergy.repository.MybatisMenuAllergyRepository; +import com.example.let.server.domain.menurank.mapper.MenuRankMapper; +import com.example.let.server.domain.menurank.repository.MenuRankRepository; +import com.example.let.server.domain.menurank.repository.MybatisMenuRankRepository; +import com.example.let.server.domain.user.mapper.UserMapper; +import com.example.let.server.domain.user.repository.MybatisUserRepository; +import com.example.let.server.domain.user.repository.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; - @Configuration @RequiredArgsConstructor public class MybatisConfig { diff --git a/src/main/java/com/example/let_server/global/config/rest/RestTemplateConfig.java b/src/main/java/com/example/let/server/global/config/rest/RestTemplateConfig.java similarity index 85% rename from src/main/java/com/example/let_server/global/config/rest/RestTemplateConfig.java rename to src/main/java/com/example/let/server/global/config/rest/RestTemplateConfig.java index 39bf075..b939617 100644 --- a/src/main/java/com/example/let_server/global/config/rest/RestTemplateConfig.java +++ b/src/main/java/com/example/let/server/global/config/rest/RestTemplateConfig.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.config.rest; +package com.example.let.server.global.config.rest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/example/let_server/global/config/security/SecurityConfig.java b/src/main/java/com/example/let/server/global/config/security/SecurityConfig.java similarity index 88% rename from src/main/java/com/example/let_server/global/config/security/SecurityConfig.java rename to src/main/java/com/example/let/server/global/config/security/SecurityConfig.java index bae34ef..ef6dd66 100644 --- a/src/main/java/com/example/let_server/global/config/security/SecurityConfig.java +++ b/src/main/java/com/example/let/server/global/config/security/SecurityConfig.java @@ -1,9 +1,9 @@ -package com.example.let_server.global.config.security; +package com.example.let.server.global.config.security; -import com.example.let_server.global.security.jwt.filter.JwtAuthenticationFilter; -import com.example.let_server.global.security.jwt.filter.JwtExceptionFilter; -import com.example.let_server.global.security.jwt.handler.JwtAccessDeniedHandler; -import com.example.let_server.global.security.jwt.handler.JwtAuthenticationEntryPoint; +import com.example.let.server.global.security.jwt.filter.JwtAuthenticationFilter; +import com.example.let.server.global.security.jwt.filter.JwtExceptionFilter; +import com.example.let.server.global.security.jwt.handler.JwtAccessDeniedHandler; +import com.example.let.server.global.security.jwt.handler.JwtAuthenticationEntryPoint; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -21,9 +21,6 @@ @Configuration @RequiredArgsConstructor public class SecurityConfig { - private static final String USER = "USER"; - private static final String ADMIN = "ADMIN"; - private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint; private final JwtAccessDeniedHandler jwtAccessDeniedHandler; private final JwtAuthenticationFilter jwtAuthenticationFilter; diff --git a/src/main/java/com/example/let_server/global/config/spring/SpringConfig.java b/src/main/java/com/example/let/server/global/config/spring/SpringConfig.java similarity index 67% rename from src/main/java/com/example/let_server/global/config/spring/SpringConfig.java rename to src/main/java/com/example/let/server/global/config/spring/SpringConfig.java index fdb4db2..681570f 100644 --- a/src/main/java/com/example/let_server/global/config/spring/SpringConfig.java +++ b/src/main/java/com/example/let/server/global/config/spring/SpringConfig.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.config.spring; +package com.example.let.server.global.config.spring; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/example/let_server/global/config/swagger/SwaggerConfig.java b/src/main/java/com/example/let/server/global/config/swagger/SwaggerConfig.java similarity index 96% rename from src/main/java/com/example/let_server/global/config/swagger/SwaggerConfig.java rename to src/main/java/com/example/let/server/global/config/swagger/SwaggerConfig.java index 1305254..211229c 100644 --- a/src/main/java/com/example/let_server/global/config/swagger/SwaggerConfig.java +++ b/src/main/java/com/example/let/server/global/config/swagger/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.config.swagger; +package com.example.let.server.global.config.swagger; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/src/main/java/com/example/let_server/global/error/CustomError.java b/src/main/java/com/example/let/server/global/error/CustomError.java similarity index 69% rename from src/main/java/com/example/let_server/global/error/CustomError.java rename to src/main/java/com/example/let/server/global/error/CustomError.java index 45da16e..465b939 100644 --- a/src/main/java/com/example/let_server/global/error/CustomError.java +++ b/src/main/java/com/example/let/server/global/error/CustomError.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.error; +package com.example.let.server.global.error; public interface CustomError { String getMessage(); diff --git a/src/main/java/com/example/let_server/global/error/CustomException.java b/src/main/java/com/example/let/server/global/error/CustomException.java similarity index 80% rename from src/main/java/com/example/let_server/global/error/CustomException.java rename to src/main/java/com/example/let/server/global/error/CustomException.java index 7ad757b..ce1b301 100644 --- a/src/main/java/com/example/let_server/global/error/CustomException.java +++ b/src/main/java/com/example/let/server/global/error/CustomException.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.error; +package com.example.let.server.global.error; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/let_server/global/error/ErrorResponse.java b/src/main/java/com/example/let/server/global/error/ErrorResponse.java similarity index 90% rename from src/main/java/com/example/let_server/global/error/ErrorResponse.java rename to src/main/java/com/example/let/server/global/error/ErrorResponse.java index 91f2434..4ed0843 100644 --- a/src/main/java/com/example/let_server/global/error/ErrorResponse.java +++ b/src/main/java/com/example/let/server/global/error/ErrorResponse.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.error; +package com.example.let.server.global.error; import lombok.Builder; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/example/let_server/global/error/GlobalExceptionHandler.java b/src/main/java/com/example/let/server/global/error/GlobalExceptionHandler.java similarity index 90% rename from src/main/java/com/example/let_server/global/error/GlobalExceptionHandler.java rename to src/main/java/com/example/let/server/global/error/GlobalExceptionHandler.java index 57ef3d9..5857e63 100644 --- a/src/main/java/com/example/let_server/global/error/GlobalExceptionHandler.java +++ b/src/main/java/com/example/let/server/global/error/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.error; +package com.example.let.server.global.error; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/src/main/java/com/example/let_server/global/security/details/CustomUserDetails.java b/src/main/java/com/example/let/server/global/security/details/CustomUserDetails.java similarity index 91% rename from src/main/java/com/example/let_server/global/security/details/CustomUserDetails.java rename to src/main/java/com/example/let/server/global/security/details/CustomUserDetails.java index a5b7ead..cb7afa7 100644 --- a/src/main/java/com/example/let_server/global/security/details/CustomUserDetails.java +++ b/src/main/java/com/example/let/server/global/security/details/CustomUserDetails.java @@ -1,6 +1,6 @@ -package com.example.let_server.global.security.details; +package com.example.let.server.global.security.details; -import com.example.let_server.domain.user.domain.User; +import com.example.let.server.domain.user.domain.User; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.security.core.GrantedAuthority; @@ -57,5 +57,4 @@ public boolean isCredentialsNonExpired() { public boolean isEnabled() { return true; } - } diff --git a/src/main/java/com/example/let_server/global/security/holder/SecurityHolder.java b/src/main/java/com/example/let/server/global/security/holder/SecurityHolder.java similarity index 56% rename from src/main/java/com/example/let_server/global/security/holder/SecurityHolder.java rename to src/main/java/com/example/let/server/global/security/holder/SecurityHolder.java index 1d629f7..bfeb629 100644 --- a/src/main/java/com/example/let_server/global/security/holder/SecurityHolder.java +++ b/src/main/java/com/example/let/server/global/security/holder/SecurityHolder.java @@ -1,7 +1,9 @@ -package com.example.let_server.global.security.holder; +package com.example.let.server.global.security.holder; -import com.example.let_server.domain.user.domain.User; -import com.example.let_server.domain.user.repository.UserRepository; +import com.example.let.server.domain.user.domain.User; +import com.example.let.server.domain.user.error.UserError; +import com.example.let.server.domain.user.repository.UserRepository; +import com.example.let.server.global.error.CustomException; import lombok.RequiredArgsConstructor; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; @@ -12,6 +14,6 @@ public class SecurityHolder { private final UserRepository userRepository; public User getUser() { - return userRepository.findByUsername(SecurityContextHolder.getContext().getAuthentication().getName()).orElseThrow(() -> new IllegalArgumentException("User not found")); + return userRepository.findByUsername(SecurityContextHolder.getContext().getAuthentication().getName()).orElseThrow(() -> new CustomException(UserError.USER_NOT_FOUND)); } } diff --git a/src/main/java/com/example/let_server/global/security/jwt/config/JwtPropoties.java b/src/main/java/com/example/let/server/global/security/jwt/config/JwtProperties.java similarity index 76% rename from src/main/java/com/example/let_server/global/security/jwt/config/JwtPropoties.java rename to src/main/java/com/example/let/server/global/security/jwt/config/JwtProperties.java index 7ca06b0..0b5adaf 100644 --- a/src/main/java/com/example/let_server/global/security/jwt/config/JwtPropoties.java +++ b/src/main/java/com/example/let/server/global/security/jwt/config/JwtProperties.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.security.jwt.config; +package com.example.let.server.global.security.jwt.config; import lombok.Getter; import lombok.Setter; @@ -7,7 +7,7 @@ @Getter @Setter @ConfigurationProperties(prefix = "jwt") -public class JwtPropoties { +public class JwtProperties { private String secretKey; private long accessTokenExpiration; private long refreshTokenExpiration; diff --git a/src/main/java/com/example/let_server/global/security/jwt/dto/Jwt.java b/src/main/java/com/example/let/server/global/security/jwt/dto/Jwt.java similarity index 59% rename from src/main/java/com/example/let_server/global/security/jwt/dto/Jwt.java rename to src/main/java/com/example/let/server/global/security/jwt/dto/Jwt.java index 9e884a9..66b6ff7 100644 --- a/src/main/java/com/example/let_server/global/security/jwt/dto/Jwt.java +++ b/src/main/java/com/example/let/server/global/security/jwt/dto/Jwt.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.security.jwt.dto; +package com.example.let.server.global.security.jwt.dto; public record Jwt( String accessToken, diff --git a/src/main/java/com/example/let/server/global/security/jwt/enums/JwtType.java b/src/main/java/com/example/let/server/global/security/jwt/enums/JwtType.java new file mode 100644 index 0000000..4cfdb94 --- /dev/null +++ b/src/main/java/com/example/let/server/global/security/jwt/enums/JwtType.java @@ -0,0 +1,6 @@ +package com.example.let.server.global.security.jwt.enums; + +public enum JwtType { + ACCESS, + REFRESH +} diff --git a/src/main/java/com/example/let_server/global/security/jwt/error/JwtError.java b/src/main/java/com/example/let/server/global/security/jwt/error/JwtError.java similarity index 74% rename from src/main/java/com/example/let_server/global/security/jwt/error/JwtError.java rename to src/main/java/com/example/let/server/global/security/jwt/error/JwtError.java index f6a9de6..f35b46d 100644 --- a/src/main/java/com/example/let_server/global/security/jwt/error/JwtError.java +++ b/src/main/java/com/example/let/server/global/security/jwt/error/JwtError.java @@ -1,6 +1,6 @@ -package com.example.let_server.global.security.jwt.error; +package com.example.let.server.global.security.jwt.error; -import com.example.let_server.global.error.CustomError; +import com.example.let.server.global.error.CustomError; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -12,8 +12,7 @@ public enum JwtError implements CustomError { UNSUPPORTED_TOKEN(401, "Unsupported JWT token"), MALFORMED_TOKEN(401, "Malformed JWT token"), INVALID_TOKEN_TYPE(401, "Invalid token type"), - INVALID_REFRESH_TOKEN(401, "Invalid refresh token"), - ; + INVALID_REFRESH_TOKEN(401, "Invalid refresh token"); private final int status; private final String message; diff --git a/src/main/java/com/example/let_server/global/security/jwt/filter/JwtAuthenticationFilter.java b/src/main/java/com/example/let/server/global/security/jwt/filter/JwtAuthenticationFilter.java similarity index 90% rename from src/main/java/com/example/let_server/global/security/jwt/filter/JwtAuthenticationFilter.java rename to src/main/java/com/example/let/server/global/security/jwt/filter/JwtAuthenticationFilter.java index 4b22e07..eb73d90 100644 --- a/src/main/java/com/example/let_server/global/security/jwt/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/example/let/server/global/security/jwt/filter/JwtAuthenticationFilter.java @@ -1,6 +1,6 @@ -package com.example.let_server.global.security.jwt.filter; +package com.example.let.server.global.security.jwt.filter; -import com.example.let_server.global.security.jwt.provider.JwtProvider; +import com.example.let.server.global.security.jwt.provider.JwtProvider; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; diff --git a/src/main/java/com/example/let_server/global/security/jwt/filter/JwtExceptionFilter.java b/src/main/java/com/example/let/server/global/security/jwt/filter/JwtExceptionFilter.java similarity index 63% rename from src/main/java/com/example/let_server/global/security/jwt/filter/JwtExceptionFilter.java rename to src/main/java/com/example/let/server/global/security/jwt/filter/JwtExceptionFilter.java index 1af731b..5e9e345 100644 --- a/src/main/java/com/example/let_server/global/security/jwt/filter/JwtExceptionFilter.java +++ b/src/main/java/com/example/let/server/global/security/jwt/filter/JwtExceptionFilter.java @@ -1,21 +1,23 @@ -package com.example.let_server.global.security.jwt.filter; +package com.example.let.server.global.security.jwt.filter; -import com.example.let_server.global.error.CustomError; -import com.example.let_server.global.error.CustomException; +import com.example.let.server.global.error.CustomError; +import com.example.let.server.global.error.CustomException; +import com.example.let.server.global.error.ErrorResponse; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.http.MediaType; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; import java.io.IOException; -import java.util.HashMap; -import java.util.Map; @Component public class JwtExceptionFilter extends OncePerRequestFilter { + private static final String CHARACTER_ENCODING = "UTF-8"; + @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { try { @@ -29,15 +31,11 @@ private void sendErrorResponse(HttpServletResponse response, CustomException e) CustomError error = e.getError(); response.setStatus(error.getStatus()); - response.setContentType("application/json"); - response.setCharacterEncoding("UTF-8"); + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setCharacterEncoding(CHARACTER_ENCODING); ObjectMapper mapper = new ObjectMapper(); - Map map = new HashMap<>(); - - map.put("message", error.getMessage()); - map.put("status", error.getStatus()); - response.getWriter().write(mapper.writeValueAsString(map)); + response.getWriter().write(mapper.writeValueAsString(new ErrorResponse(error.getStatus(), error.getMessage()))); } } diff --git a/src/main/java/com/example/let_server/global/security/jwt/handler/JwtAccessDeniedHandler.java b/src/main/java/com/example/let/server/global/security/jwt/handler/JwtAccessDeniedHandler.java similarity index 91% rename from src/main/java/com/example/let_server/global/security/jwt/handler/JwtAccessDeniedHandler.java rename to src/main/java/com/example/let/server/global/security/jwt/handler/JwtAccessDeniedHandler.java index b885bd5..a80fbed 100644 --- a/src/main/java/com/example/let_server/global/security/jwt/handler/JwtAccessDeniedHandler.java +++ b/src/main/java/com/example/let/server/global/security/jwt/handler/JwtAccessDeniedHandler.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.security.jwt.handler; +package com.example.let.server.global.security.jwt.handler; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/example/let_server/global/security/jwt/handler/JwtAuthenticationEntryPoint.java b/src/main/java/com/example/let/server/global/security/jwt/handler/JwtAuthenticationEntryPoint.java similarity index 91% rename from src/main/java/com/example/let_server/global/security/jwt/handler/JwtAuthenticationEntryPoint.java rename to src/main/java/com/example/let/server/global/security/jwt/handler/JwtAuthenticationEntryPoint.java index 9ec15fc..b0a4ae6 100644 --- a/src/main/java/com/example/let_server/global/security/jwt/handler/JwtAuthenticationEntryPoint.java +++ b/src/main/java/com/example/let/server/global/security/jwt/handler/JwtAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package com.example.let_server.global.security.jwt.handler; +package com.example.let.server.global.security.jwt.handler; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/example/let_server/global/security/jwt/provider/JwtProvider.java b/src/main/java/com/example/let/server/global/security/jwt/provider/JwtProvider.java similarity index 64% rename from src/main/java/com/example/let_server/global/security/jwt/provider/JwtProvider.java rename to src/main/java/com/example/let/server/global/security/jwt/provider/JwtProvider.java index b9de9ec..d882f86 100644 --- a/src/main/java/com/example/let_server/global/security/jwt/provider/JwtProvider.java +++ b/src/main/java/com/example/let/server/global/security/jwt/provider/JwtProvider.java @@ -1,19 +1,20 @@ -package com.example.let_server.global.security.jwt.provider; - -import com.example.let_server.domain.auth.repository.RefreshTokenRepository; -import com.example.let_server.domain.user.domain.User; -import com.example.let_server.domain.user.error.UserError; -import com.example.let_server.domain.user.repository.UserRepository; -import com.example.let_server.global.error.CustomException; -import com.example.let_server.global.security.details.CustomUserDetails; -import com.example.let_server.global.security.jwt.config.JwtPropoties; -import com.example.let_server.global.security.jwt.dto.Jwt; -import com.example.let_server.global.security.jwt.enums.JwtType; -import com.example.let_server.global.security.jwt.error.JwtError; +package com.example.let.server.global.security.jwt.provider; + +import com.example.let.server.domain.auth.repository.RefreshTokenRepository; +import com.example.let.server.domain.user.domain.User; +import com.example.let.server.domain.user.error.UserError; +import com.example.let.server.domain.user.repository.UserRepository; +import com.example.let.server.global.error.CustomException; +import com.example.let.server.global.security.details.CustomUserDetails; +import com.example.let.server.global.security.jwt.config.JwtProperties; +import com.example.let.server.global.security.jwt.dto.Jwt; +import com.example.let.server.global.security.jwt.enums.JwtType; +import com.example.let.server.global.security.jwt.error.JwtError; import io.jsonwebtoken.*; import jakarta.annotation.PostConstruct; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.UserDetails; @@ -28,7 +29,11 @@ @Component @RequiredArgsConstructor public class JwtProvider { - private final JwtPropoties jwtPropoties; + private static final String TYPE = "JWT"; + private static final String TOKEN_TYPE = "type"; + private static final String BEARER_PREFIX = "Bearer "; + + private final JwtProperties jwtProperties; private final UserRepository userRepository; private final RefreshTokenRepository refreshTokenRepository; private SecretKey key; @@ -36,7 +41,7 @@ public class JwtProvider { @PostConstruct protected void init() { key = new SecretKeySpec( - jwtPropoties.getSecretKey().getBytes(StandardCharsets.UTF_8), + jwtProperties.getSecretKey().getBytes(StandardCharsets.UTF_8), Jwts.SIG.HS512.key().build().getAlgorithm()); } @@ -45,21 +50,27 @@ public Jwt generateToken(String username) { String accessToken = Jwts.builder() .header() - .type(JwtType.ACCESS.name()) + .type(TYPE) .and() .subject(username) + .claims() + .add(TOKEN_TYPE, JwtType.ACCESS.name()) .issuedAt(now) - .expiration(new Date(now.getTime() + jwtPropoties.getAccessTokenExpiration())) + .expiration(new Date(now.getTime() + jwtProperties.getAccessTokenExpiration())) + .and() .signWith(key) .compact(); String refreshToken = Jwts.builder() .header() - .type(JwtType.REFRESH.name()) + .type(TYPE) .and() .subject(username) + .claims() + .add(TOKEN_TYPE, JwtType.REFRESH.name()) .issuedAt(now) - .expiration(new Date((now.getTime() + jwtPropoties.getRefreshTokenExpiration()))) + .expiration(new Date((now.getTime() + jwtProperties.getRefreshTokenExpiration()))) + .and() .signWith(key) .compact(); @@ -85,10 +96,10 @@ public Authentication getAuthentication(String token) { } public String extractToken(HttpServletRequest request) { - String token = request.getHeader("Authorization"); + String token = request.getHeader(HttpHeaders.AUTHORIZATION); - if (StringUtils.hasText(token) && token.startsWith("Bearer ")) { - return token.substring(7); + if (StringUtils.hasText(token) && token.startsWith(BEARER_PREFIX)) { + return token.substring(BEARER_PREFIX.length()); } return null; @@ -117,10 +128,10 @@ private Claims getClaims(String token) { } public JwtType getType(String token) { - return JwtType.valueOf(Jwts.parser() + return JwtType.valueOf((String) Jwts.parser() .verifyWith(key) .build() .parseSignedClaims(token) - .getHeader().getType()); + .getPayload().get(TOKEN_TYPE)); } } diff --git a/src/main/java/com/example/let_server/domain/allergy/service/AllergyService.java b/src/main/java/com/example/let_server/domain/allergy/service/AllergyService.java deleted file mode 100644 index 14341ad..0000000 --- a/src/main/java/com/example/let_server/domain/allergy/service/AllergyService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.example.let_server.domain.allergy.service; - -import com.example.let_server.domain.allergy.domain.Allergy; - -import java.util.Optional; - -public interface AllergyService { - Allergy findByAllergyId(Long allergyId); -} diff --git a/src/main/java/com/example/let_server/domain/auth/service/AuthService.java b/src/main/java/com/example/let_server/domain/auth/service/AuthService.java deleted file mode 100644 index bfd534f..0000000 --- a/src/main/java/com/example/let_server/domain/auth/service/AuthService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.let_server.domain.auth.service; - -import com.example.let_server.domain.auth.dto.request.LoginRequest; -import com.example.let_server.domain.auth.dto.request.ReissueRequest; -import com.example.let_server.domain.auth.dto.request.SignUpRequest; -import com.example.let_server.global.security.jwt.dto.Jwt; - -public interface AuthService { - void signup(SignUpRequest request); - - Jwt login(LoginRequest request); - - Jwt reissue(ReissueRequest request); -} diff --git a/src/main/java/com/example/let_server/domain/exercises/repository/ExerciseRepository.java b/src/main/java/com/example/let_server/domain/exercises/repository/ExerciseRepository.java deleted file mode 100644 index 9ae3c09..0000000 --- a/src/main/java/com/example/let_server/domain/exercises/repository/ExerciseRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.example.let_server.domain.exercises.repository; - -import com.example.let_server.domain.exercises.domain.Exercises; - -import java.util.List; - -public interface ExerciseRepository { - List findAll(); -} \ No newline at end of file diff --git a/src/main/java/com/example/let_server/global/security/details/CustomUserDetailsService.java b/src/main/java/com/example/let_server/global/security/details/CustomUserDetailsService.java deleted file mode 100644 index 58ae394..0000000 --- a/src/main/java/com/example/let_server/global/security/details/CustomUserDetailsService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.let_server.global.security.details; - -import com.example.let_server.domain.user.domain.User; -import com.example.let_server.domain.user.error.UserError; -import com.example.let_server.domain.user.repository.UserRepository; -import com.example.let_server.global.error.CustomException; -import lombok.RequiredArgsConstructor; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; - -@RequiredArgsConstructor -public class CustomUserDetailsService implements UserDetailsService { - private final UserRepository userRepository; - - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - User user = userRepository.findByUsername(username) - .orElseThrow(() -> new CustomException(UserError.USER_NOT_FOUND)); - return new CustomUserDetails(user); - } -} diff --git a/src/main/java/com/example/let_server/global/security/jwt/enums/JwtType.java b/src/main/java/com/example/let_server/global/security/jwt/enums/JwtType.java deleted file mode 100644 index a46af6f..0000000 --- a/src/main/java/com/example/let_server/global/security/jwt/enums/JwtType.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.let_server.global.security.jwt.enums; - -public enum JwtType { - ACCESS, - REFRESH -} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5d2b36a..51bade4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -16,7 +16,7 @@ spring: port: ${PORT} sql: init: - mode: always + mode: embedded schema-locations: classpath:sql/schema.sql jwt: @@ -25,7 +25,7 @@ jwt: refresh-token-expiration: 4380000000 mybatis: - type-aliases-package: com.example.let_server.domain + type-aliases-package: com.example.let.server.domain configuration: map-underscore-to-camel-case: true default-executor-type: BATCH @@ -34,6 +34,6 @@ mybatis: logging: level: - com.example.let_server.domain.mealMenu.service.impl.MealMenuServiceImpl: INFO + com.example.let.server.domain.mealmenu.service.impl.MealMenuServiceImpl: INFO org.springframework.jdbc.core: WARN org.springframework.transaction: WARN \ No newline at end of file diff --git a/src/main/resources/mapper/allergy/AllergyMapper.xml b/src/main/resources/mapper/allergy/AllergyMapper.xml index b249bcc..8d34049 100644 --- a/src/main/resources/mapper/allergy/AllergyMapper.xml +++ b/src/main/resources/mapper/allergy/AllergyMapper.xml @@ -2,10 +2,10 @@ - + \ No newline at end of file diff --git a/src/main/resources/mapper/eater/EaterMapper.xml b/src/main/resources/mapper/eater/EaterMapper.xml index 9a4aeea..c4bce03 100644 --- a/src/main/resources/mapper/eater/EaterMapper.xml +++ b/src/main/resources/mapper/eater/EaterMapper.xml @@ -2,20 +2,20 @@ - + - + - + - - insert into Eater(eater_id,user_id,meal_id,eaten) + + insert into eaters(eater_id, user_id, meal_id, eaten) values (#{eaterId}, #{user.userId}, #{meal.mealId}, #{eaten}) @@ -23,18 +23,18 @@ SELECT - e.eater_id AS eater_id, - e.eaten AS eaten, - u.user_id AS user_id, - u.student_id AS student_id, - u.real_name AS real_name - FROM Eater e - JOIN User u ON e.user_id = u.user_id + e.eater_id AS eater_id, + e.eaten AS eaten, + u.user_id AS user_id, + u.student_id AS student_id, + u.real_name AS real_name + FROM eaters e + JOIN users u ON e.user_id = u.user_id WHERE u.student_id >= #{lowerBound} AND u.student_id < #{upperBound} - SELECT base.meal_type, IFNULL(ROUND(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 1 AND e.eaten THEN 1 ELSE 0 END) * 100.0 / @@ -48,9 +48,9 @@ UNION ALL SELECT '중식' UNION ALL SELECT '석식' ) base - LEFT JOIN Meal m ON base.meal_type = m.meal_type - LEFT JOIN Eater e ON m.meal_id = e.meal_id - LEFT JOIN User u ON e.user_id = u.user_id + LEFT JOIN meals m ON base.meal_type = m.meal_type + LEFT JOIN eaters e ON m.meal_id = e.meal_id + LEFT JOIN users u ON e.user_id = u.user_id WHERE DATE(m.meal_date) = #{mealDate} AND m.meal_type = #{mealType} @@ -61,85 +61,95 @@ - + SELECT base.meal_type, + IFNULL(ROUND(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 1 AND e.eaten THEN 1 ELSE 0 END) * 100.0 / + NULLIF(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 1 THEN 1 ELSE 0 END), 0), 0), + 0) AS grade1Ration, + IFNULL(ROUND(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 2 AND e.eaten THEN 1 ELSE 0 END) * 100.0 / + NULLIF(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 2 THEN 1 ELSE 0 END), 0), 0), + 0) AS grade2Ration, + IFNULL(ROUND(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 3 AND e.eaten THEN 1 ELSE 0 END) * 100.0 / + NULLIF(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 3 THEN 1 ELSE 0 END), 0), 0), + 0) AS grade3Ration + FROM (SELECT '조식' AS meal_type + UNION ALL + SELECT '중식' + UNION ALL + SELECT '석식') base + LEFT JOIN meals m ON base.meal_type = m.meal_type + LEFT JOIN eaters e ON m.meal_id = e.meal_id + LEFT JOIN users u ON e.user_id = u.user_id + WHERE MONTH (m.meal_date) = #{month} + AND YEAR (m.meal_date) = #{year} + AND m.meal_type = #{mealType} GROUP BY base.meal_type - + SELECT base.meal_type, + IFNULL(ROUND(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 1 AND e.eaten THEN 1 ELSE 0 END) * 100.0 / + NULLIF(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 1 THEN 1 ELSE 0 END), 0), 0), + 0) AS grade1Ration, + IFNULL(ROUND(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 2 AND e.eaten THEN 1 ELSE 0 END) * 100.0 / + NULLIF(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 2 THEN 1 ELSE 0 END), 0), 0), + 0) AS grade2Ration, + IFNULL(ROUND(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 3 AND e.eaten THEN 1 ELSE 0 END) * 100.0 / + NULLIF(SUM(CASE WHEN FLOOR(u.student_id / 1000) = 3 THEN 1 ELSE 0 END), 0), 0), + 0) AS grade3Ration + FROM (SELECT '조식' AS meal_type + UNION ALL + SELECT '중식' + UNION ALL + SELECT '석식') base + LEFT JOIN meals m ON base.meal_type = m.meal_type + LEFT JOIN eaters e ON m.meal_id = e.meal_id + LEFT JOIN users u ON e.user_id = u.user_id + WHERE MONTH (m.meal_date) = #{month} + AND YEAR (m.meal_date) = #{year} GROUP BY base.meal_type ORDER BY FIELD(base.meal_type, '조식', '중식', '석식') \ No newline at end of file diff --git a/src/main/resources/mapper/exercises/ExerciseMapper.xml b/src/main/resources/mapper/exercises/ExerciseMapper.xml index 51c9df2..d041cad 100644 --- a/src/main/resources/mapper/exercises/ExerciseMapper.xml +++ b/src/main/resources/mapper/exercises/ExerciseMapper.xml @@ -3,10 +3,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + @@ -17,14 +17,13 @@ diff --git a/src/main/resources/mapper/meal/MealMapper.xml b/src/main/resources/mapper/meal/MealMapper.xml index fc25fb2..26f703e 100644 --- a/src/main/resources/mapper/meal/MealMapper.xml +++ b/src/main/resources/mapper/meal/MealMapper.xml @@ -2,48 +2,50 @@ - + - insert into Meal(meal_id,meal_date,meal_type,score,calorie) - values (#{mealId},#{mealDate},#{mealType},#{score},#{calorie}) + insert into meals(meal_id, meal_date, meal_type, score, calorie) + values (#{mealId}, #{mealDate}, #{mealType}, #{score}, #{calorie}) - + SELECT m.meal_id as mealId, + m.meal_date as date, m.meal_type as mealType, COALESCE(GROUP_CONCAT(DISTINCT menu.menu_name SEPARATOR ', '), '메뉴 정보 없음') as menuName, COUNT(DISTINCT u.user_id) as totalStudents, @@ -51,33 +53,30 @@ ROUND((COUNT(DISTINCT CASE WHEN e.eaten = true THEN e.user_id END) * 100.0 / COUNT(DISTINCT u.user_id)), 2) as participationRate, AVG(r.rating) as averageRating, m.calorie as calorie - FROM Meal m - CROSS JOIN User u - LEFT JOIN Eater e ON e.meal_id = m.meal_id AND e.user_id = u.user_id - LEFT JOIN MealRating r ON r.meal_id = m.meal_id - LEFT JOIN MealMenu mm ON mm.meal_id = m.meal_id - LEFT JOIN Menu menu ON menu.menu_id = mm.menu_id + FROM meals m + CROSS JOIN users u + LEFT JOIN eaters e + ON e.meal_id = m.meal_id AND e.user_id = u.user_id + LEFT JOIN meal_ratings r ON r.meal_id = m.meal_id + LEFT JOIN meal_menus mm ON mm.meal_id = m.meal_id + LEFT JOIN menus menu ON menu.menu_id = mm.menu_id WHERE m.meal_id = #{mealId} GROUP BY m.meal_id, m.meal_date, m.meal_type, m.calorie - + SELECT m.meal_id as mealId, DATE (m.meal_date) as date, m.meal_type as mealType, COALESCE (GROUP_CONCAT(DISTINCT menu.menu_name SEPARATOR ', '), '메뉴 정보 없음') as menuName, COUNT (DISTINCT u.user_id) as totalStudents, COUNT (DISTINCT CASE WHEN e.eaten = true THEN e.user_id END) as eatenCount, ROUND((COUNT (DISTINCT CASE WHEN e.eaten = true THEN e.user_id END) * 100.0 / COUNT (DISTINCT u.user_id)), 2) as participationRate + FROM meals m + CROSS JOIN users u + LEFT JOIN eaters e + ON e.meal_id = m.meal_id AND e.user_id = u.user_id + LEFT JOIN meal_menus mm ON mm.meal_id = m.meal_id + LEFT JOIN menus menu ON menu.menu_id = mm.menu_id + WHERE + DATE_FORMAT(m.meal_date + , '%Y-%m') = #{period} GROUP BY m.meal_id, m.meal_date, m.meal_type HAVING participationRate < #{threshold} ORDER BY participationRate ASC diff --git a/src/main/resources/mapper/mealMenu/MealMenuMapper.xml b/src/main/resources/mapper/mealMenu/MealMenuMapper.xml index d7b421e..acab67d 100644 --- a/src/main/resources/mapper/mealMenu/MealMenuMapper.xml +++ b/src/main/resources/mapper/mealMenu/MealMenuMapper.xml @@ -2,36 +2,37 @@ - - + + - + - + - + - + - + @@ -40,7 +41,7 @@ - + @@ -50,8 +51,8 @@ - insert into MealMenu(meal_menu_id,menu_id,meal_id) - values (#{mealMenuId},#{menu.menuId},#{meal.mealId}) + insert into meal_menus(meal_menu_id, menu_id, meal_id) + values (#{mealMenuId}, #{menu.menuId}, #{meal.mealId}) @@ -69,11 +70,11 @@ ml.meal_type AS meal_type, ml.calorie AS calorie, ml.score AS score - FROM MealMenu mm - JOIN Menu m ON mm.menu_id = m.menu_id - JOIN Meal ml ON mm.meal_id = ml.meal_id - JOIN MenuAllergy ma ON m.menu_id = ma.menu_id - JOIN Allergy a ON ma.allergy_idx = a.allergy_idx + FROM meal_menus mm + JOIN menus m ON mm.menu_id = m.menu_id + JOIN meals ml ON mm.meal_id = ml.meal_id + JOIN menu_allergies ma ON m.menu_id = ma.menu_id + JOIN allergies a ON ma.allergy_idx = a.allergy_idx WHERE DATE_FORMAT(ml.meal_date, '%Y-%m') = #{yearMonth} AND ml.meal_type = #{mealType} @@ -89,88 +90,78 @@ diff --git a/src/main/resources/mapper/mealRating/MealRatingMapper.xml b/src/main/resources/mapper/mealRating/MealRatingMapper.xml index 30e74bd..a3d8f0a 100644 --- a/src/main/resources/mapper/mealRating/MealRatingMapper.xml +++ b/src/main/resources/mapper/mealRating/MealRatingMapper.xml @@ -2,19 +2,23 @@ - + - insert into MealRating(meal_rating_id,meal_id,rating) - values (#{mealRatingId},#{meal.mealId},#{rating}) + insert into meal_ratings(meal_rating_id, meal_id, rating) + values (#{mealRatingId}, #{meal.mealId}, #{rating}) - + SELECT * + FROM meal_ratings + WHERE meal_id = #{mealId} \ No newline at end of file diff --git a/src/main/resources/mapper/menu/MenuMapper.xml b/src/main/resources/mapper/menu/MenuMapper.xml index 6b54423..272fba6 100644 --- a/src/main/resources/mapper/menu/MenuMapper.xml +++ b/src/main/resources/mapper/menu/MenuMapper.xml @@ -2,41 +2,41 @@ - + - insert into Menu(menu_name,menu_score,like_count,dislike_count,current_rank) - values (#{menuName},#{menuScore},#{likeCount},#{dislikeCount},#{currentRank}) - ON DUPLICATE KEY UPDATE menu_id = LAST_INSERT_ID(menu_id) + insert into menus(menu_name, menu_score, like_count, dislike_count, current_rank) + values (#{menuName}, #{menuScore}, #{likeCount}, #{dislikeCount}, #{currentRank}) ON DUPLICATE KEY + UPDATE menu_id = LAST_INSERT_ID(menu_id) - update Menu set current_rank = #{rank} + update menus set current_rank = #{rank} where menu_id = #{menuId} - + SELECT * FROM menus WHERE menu_name = #{menuName} LIMIT 1 - UPDATE Menu + UPDATE menus SET like_count = like_count +1 WHERE menu_id = #{menuId} - UPDATE Menu + UPDATE menus SET dislike_count = dislike_count +1 WHERE menu_id = #{menuId} - + SELECT * FROM menus \ No newline at end of file diff --git a/src/main/resources/mapper/menuAllergy/MenuAllergyMapper.xml b/src/main/resources/mapper/menuAllergy/MenuAllergyMapper.xml index f6cfb78..8357fb6 100644 --- a/src/main/resources/mapper/menuAllergy/MenuAllergyMapper.xml +++ b/src/main/resources/mapper/menuAllergy/MenuAllergyMapper.xml @@ -2,23 +2,25 @@ - - - INSERT INTO MenuAllergy(menu_id, allergy_idx) - VALUES (#{menu.menuId}, #{allergy.allergyId}) - ON DUPLICATE KEY UPDATE menu_id = menu_id; + + + INSERT INTO menu_allergies(menu_id, allergy_idx) + VALUES (#{menu.menuId}, #{allergy.allergyId}) ON DUPLICATE KEY + UPDATE menu_id = menu_id; + + - insert into MenuAllergy(menu_id, allergy_idx) + insert into menu_allergies(menu_id, allergy_idx) values (#{menuId}, #{allergyId}) diff --git a/src/main/resources/mapper/menuRank/MenuRank.xml b/src/main/resources/mapper/menuRank/MenuRankMapper.xml similarity index 76% rename from src/main/resources/mapper/menuRank/MenuRank.xml rename to src/main/resources/mapper/menuRank/MenuRankMapper.xml index 0786354..de03230 100644 --- a/src/main/resources/mapper/menuRank/MenuRank.xml +++ b/src/main/resources/mapper/menuRank/MenuRankMapper.xml @@ -1,9 +1,10 @@ + - + - + @@ -11,7 +12,7 @@ - UPDATE Menu + UPDATE menus SET menu_score = ( CASE WHEN like_count + dislike_count = 0 THEN 0 @@ -30,18 +31,19 @@ - INSERT INTO MenuRankHistory (menu_id, date, rank, rank_diff) + INSERT INTO menu_rank_histories (menu_id, date, rank, rank_diff) VALUES (#{menuId}, #{date}, #{rank}, #{rankDiff}) \ No newline at end of file diff --git a/src/main/resources/mapper/user/UserMapper.xml b/src/main/resources/mapper/user/UserMapper.xml index 4d03d40..035d48b 100644 --- a/src/main/resources/mapper/user/UserMapper.xml +++ b/src/main/resources/mapper/user/UserMapper.xml @@ -2,31 +2,32 @@ - - - insert into User(user_id, username, password, student_id, real_name, role) + + + insert into users(user_id, username, password, student_id, real_name, role) values (#{userId}, #{username}, #{password}, #{studentId}, #{realName}, #{role}) \ No newline at end of file diff --git a/src/main/resources/sql/schema.sql b/src/main/resources/sql/schema.sql index a85c94f..9ca727c 100644 --- a/src/main/resources/sql/schema.sql +++ b/src/main/resources/sql/schema.sql @@ -1,127 +1,126 @@ --- User 테이블 -CREATE TABLE IF NOT EXISTS `User` ( - `user_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, - `username` VARCHAR(255) NOT NULL, +-- users 테이블 +CREATE TABLE IF NOT EXISTS `users` ( + `user_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `username` VARCHAR(255) NOT NULL, `password` VARCHAR(255) NOT NULL, `student_id` BIGINT NOT NULL UNIQUE, `real_name` VARCHAR(255) NOT NULL, `role` ENUM('ROLE_ADMIN', 'ROLE_USER') NOT NULL ); --- Allergy 테이블 -CREATE TABLE IF NOT EXISTS `Allergy` ( - `allergy_idx` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, - `allergy_name` VARCHAR(255) NOT NULL +-- allergies 테이블 +CREATE TABLE IF NOT EXISTS `allergies` ( + `allergy_idx` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `allergy_name` VARCHAR(255) NOT NULL ); --- Menu 테이블 -CREATE TABLE IF NOT EXISTS `Menu` ( - `menu_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, - `menu_name` VARCHAR(255) NOT NULL, +-- menus 테이블 +CREATE TABLE IF NOT EXISTS `menus` ( + `menu_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `menu_name` VARCHAR(255) NOT NULL, `menu_score` DOUBLE NOT NULL DEFAULT 0.0, `like_count` BIGINT NOT NULL DEFAULT 0, `dislike_count` BIGINT NOT NULL DEFAULT 0, `current_rank` INT DEFAULT NULL ); --- Meal 테이블 -CREATE TABLE IF NOT EXISTS `Meal` ( - `meal_id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - `meal_date` DATE NOT NULL, - `meal_type` ENUM('조식', '중식', '석식') NOT NULL, +-- meals 테이블 +CREATE TABLE IF NOT EXISTS `meals` ( + `meal_id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `meal_date` DATE NOT NULL, + `meal_type` ENUM('조식', '중식', '석식') NOT NULL, `score` FLOAT NOT NULL DEFAULT 0.0, `calorie` FLOAT NOT NULL DEFAULT 0.0, UNIQUE (`meal_date`, `meal_type`) ); --- MealMenu (중간 테이블) -CREATE TABLE IF NOT EXISTS `MealMenu` ( - `meal_menu_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, - `menu_id` BIGINT NOT NULL, - `meal_id` INT NOT NULL, - UNIQUE (`menu_id`, `meal_id`), - FOREIGN KEY (`menu_id`) REFERENCES `Menu` (`menu_id`) ON DELETE CASCADE, - FOREIGN KEY (`meal_id`) REFERENCES `Meal` (`meal_id`) ON DELETE CASCADE +-- meal_menus (중간 테이블) +CREATE TABLE IF NOT EXISTS `meal_menus` ( + `meal_menu_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `menu_id` BIGINT NOT NULL, + `meal_id` INT NOT NULL, + UNIQUE (`menu_id`, `meal_id`), + FOREIGN KEY (`menu_id`) REFERENCES `menus` (`menu_id`) ON DELETE CASCADE, + FOREIGN KEY (`meal_id`) REFERENCES `meals` (`meal_id`) ON DELETE CASCADE ); --- MenuAllergy (중간 테이블) -CREATE TABLE IF NOT EXISTS `MenuAllergy` ( - `menu_allergy_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, - `allergy_idx` BIGINT NOT NULL, - `menu_id` BIGINT NOT NULL, - UNIQUE (`allergy_idx`, `menu_id`), - FOREIGN KEY (`allergy_idx`) REFERENCES `Allergy` (`allergy_idx`) ON DELETE CASCADE, - FOREIGN KEY (`menu_id`) REFERENCES `Menu` (`menu_id`) ON DELETE CASCADE +-- menu_allergies (중간 테이블) +CREATE TABLE IF NOT EXISTS `menu_allergies` ( + `menu_allergy_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `allergy_idx` BIGINT NOT NULL, + `menu_id` BIGINT NOT NULL, + UNIQUE (`allergy_idx`, `menu_id`), + FOREIGN KEY (`allergy_idx`) REFERENCES `allergies` (`allergy_idx`) ON DELETE CASCADE, + FOREIGN KEY (`menu_id`) REFERENCES `menus` (`menu_id`) ON DELETE CASCADE ); --- Eater 테이블 -CREATE TABLE IF NOT EXISTS `Eater` ( - `eater_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, - `user_id` BIGINT NOT NULL, - `meal_id` INT NOT NULL, - `eaten` BOOLEAN NOT NULL DEFAULT FALSE, - UNIQUE (`user_id`, `meal_id`), - FOREIGN KEY (`user_id`) REFERENCES `User` (`user_id`) ON DELETE CASCADE, - FOREIGN KEY (`meal_id`) REFERENCES `Meal` (`meal_id`) ON DELETE CASCADE +-- eaters 테이블 +CREATE TABLE IF NOT EXISTS `eaters` ( + `eater_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `user_id` BIGINT NOT NULL, + `meal_id` INT NOT NULL, + `eaten` BOOLEAN NOT NULL DEFAULT FALSE, + UNIQUE (`user_id`, `meal_id`), + FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE, + FOREIGN KEY (`meal_id`) REFERENCES `meals` (`meal_id`) ON DELETE CASCADE ); --- MealRating 테이블 -CREATE TABLE IF NOT EXISTS `MealRating` ( - `meal_rating_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, - `meal_id` INT NOT NULL, - `rating` FLOAT NOT NULL, - FOREIGN KEY (`meal_id`) REFERENCES `Meal` (`meal_id`) ON DELETE CASCADE +-- meal_ratings 테이블 +CREATE TABLE IF NOT EXISTS `meal_ratings` ( + `meal_rating_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `meal_id` INT NOT NULL, + `rating` FLOAT NOT NULL, + FOREIGN KEY (`meal_id`) REFERENCES `meals` (`meal_id`) ON DELETE CASCADE ); --- MenuRankHistory 테이블 -CREATE TABLE IF NOT EXISTS `MenuRankHistory` ( - `history_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, - `menu_id` BIGINT NOT NULL, - `date` DATE NOT NULL, - `rank` INT NOT NULL, - `rank_diff` INT NOT NULL, - UNIQUE (`menu_id`, `date`), - FOREIGN KEY (`menu_id`) REFERENCES `Menu` (`menu_id`) ON DELETE CASCADE +-- menu_rank_histories 테이블 +CREATE TABLE IF NOT EXISTS `menu_rank_histories` ( + `history_id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, + `menu_id` BIGINT NOT NULL, + `date` DATE NOT NULL, + `rank` INT NOT NULL, + `rank_diff` INT NOT NULL, + UNIQUE (`menu_id`, `date`), + FOREIGN KEY (`menu_id`) REFERENCES `menus` (`menu_id`) ON DELETE CASCADE ); +-- exercises 테이블 +CREATE TABLE IF NOT EXISTS `exercises` ( + `id` BIGINT AUTO_INCREMENT PRIMARY KEY, + `category` ENUM('MOVING', 'STRETCH', 'ETC') NOT NULL, + `duration` INT NOT NULL, + `title` VARCHAR(100) NOT NULL, + `description` VARCHAR(255) NOT NULL, + `method` VARCHAR(255) NOT NULL + ); -CREATE TABLE IF NOT EXISTS `Exercises` ( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - category ENUM('MOVING', 'STRETCH', 'ETC') NOT NULL, - duration INT NOT NULL, - title VARCHAR(100) NOT NULL, - description VARCHAR(255) NOT NULL, - method VARCHAR(255) NOT NULL -); - -INSERT INTO `Allergy` (`allergy_name`) VALUES - ('난류(계란 등)'), - ('우유'), - ('메밀'), - ('땅콩'), - ('대두(콩)'), - ('밀'), - ('고등어'), - ('게'), - ('새우'), - ('돼지고기'), - ('복숭아'), - ('토마토'), - ('아황산염'), - ('호두'), - ('닭고기'), - ('소고기'), - ('오징어'), - ('조개류(굴, 전복, 홍합 포함)'), - ('잣'); - +INSERT INTO `allergies` (`allergy_name`) VALUES + ('난류(계란 등)'), + ('우유'), + ('메밀'), + ('땅콩'), + ('대두(콩)'), + ('밀'), + ('고등어'), + ('게'), + ('새우'), + ('돼지고기'), + ('복숭아'), + ('토마토'), + ('아황산염'), + ('호두'), + ('닭고기'), + ('소고기'), + ('오징어'), + ('조개류(굴, 전복, 홍합 포함)'), + ('잣'); -INSERT INTO Exercises (category, duration, title, description, method) VALUES - ('MOVING', 5, '걷기 5분', '가장 기본적인 건강한 소화방법', '5분간 2~3바퀴 돌 정도로 걸어 보아요.'), - ('MOVING', 7, '조깅 7분', '소화를 하며 체력도 올리는 효과적인 방법', '가볍게 땀이 날 정도 속도로 뛰어 보아요.'), - ('STRETCH', 2, '목 스트레칭 2분', '건강한 목을 위해 목 스트레칭을 해 보아요.', '좌우·앞뒤로 천천히 10회씩 해 보아요.'), - ( 'STRETCH', 1, '어깨 돌리기 1분', '건강한 어깨를 위해 어깨 스트레칭을 해 보아요.', '앞·뒤 각각 10회씩 해 보아요.'), - ( 'STRETCH', 1, '허리 옆으로 숙이기 1분', '펴진 허리를 위해 허리 스트레칭을 해 보아요.', '좌우 번갈아 10회씩 해 보아요.'), - ( 'STRETCH', 2, '벽 짚고 종아리 스트레칭 2분', '뭉쳐있는 다리 근육을 풀어 보아요.', '좌우 각 30초씩 2회씩 해 보아요.'), - ( 'STRETCH', 1, '몸 앞으로 굽히기 1분', '온몸을 한번에 풀어 보아요.', '1분동안 최대한 오래 굽혀보아요.'), - ( 'ETC', 2, '복식호흡 2분', '온몸의 스트레스를 풀어 보아요.', '4초 들이마시기, 4초 내쉬기 반복해요.'); +INSERT INTO `exercises` (`category`, `duration`, `title`, `description`, `method`) VALUES + ('MOVING', 5, '걷기 5분', '가장 기본적인 건강한 소화방법', '5분간 2~3바퀴 돌 정도로 걸어 보아요.'), + ('MOVING', 7, '조깅 7분', '소화를 하며 체력도 올리는 효과적인 방법', '가볍게 땀이 날 정도 속도로 뛰어 보아요.'), + ('STRETCH', 2, '목 스트레칭 2분', '건강한 목을 위해 목 스트레칭을 해 보아요.', '좌우·앞뒤로 천천히 10회씩 해 보아요.'), + ('STRETCH', 1, '어깨 돌리기 1분', '건강한 어깨를 위해 어깨 스트레칭을 해 보아요.', '앞·뒤 각각 10회씩 해 보아요.'), + ('STRETCH', 1, '허리 옆으로 숙이기 1분', '펴진 허리를 위해 허리 스트레칭을 해 보아요.', '좌우 번갈아 10회씩 해 보아요.'), + ('STRETCH', 2, '벽 짚고 종아리 스트레칭 2분', '뭉쳐있는 다리 근육을 풀어 보아요.', '좌우 각 30초씩 2회씩 해 보아요.'), + ('STRETCH', 1, '몸 앞으로 굽히기 1분', '온몸을 한번에 풀어 보아요.', '1분동안 최대한 오래 굽혀보아요.'), + ('ETC', 2, '복식호흡 2분', '온몸의 스트레스를 풀어 보아요.', '4초 들이마시기, 4초 내쉬기 반복해요.');