resolve-conflict

src/main/java/com/example/let_server/LetServerApplication.java → 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;

src/main/java/com/example/let_server/domain/allergy/domain/Allergy.java → 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;

src/main/java/com/example/let_server/domain/allergy/dto/response/AllergyResponse.java → 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;

src/main/java/com/example/let_server/domain/allergy/error/AllergyError.java → 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;
 

src/main/java/com/example/let_server/domain/allergy/mapper/AllergyMapper.java → 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;

src/main/java/com/example/let_server/domain/allergy/repository/AllergyRepository.java → 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;
 

src/main/java/com/example/let_server/domain/allergy/repository/MybatisAllergyRepository.java → 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;

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);
+}

src/main/java/com/example/let_server/domain/allergy/service/impl/AllergyServiceImpl.java → 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 {

src/main/java/com/example/let_server/domain/auth/controller/AuthController.java → 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;

src/main/java/com/example/let_server/domain/auth/docs/AuthDocs.java → 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;

src/main/java/com/example/let_server/domain/auth/dto/request/LoginRequest.java → 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,

src/main/java/com/example/let_server/domain/auth/dto/request/ReissueRequest.java → 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

src/main/java/com/example/let_server/domain/auth/dto/request/SignUpRequest.java → 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;

src/main/java/com/example/let_server/domain/auth/error/AuthError.java → 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;
 

src/main/java/com/example/let_server/domain/auth/repository/RefreshTokenRepository.java → 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);

src/main/java/com/example/let_server/domain/auth/repository/impl/RefreshTokenRepositoryImpl.java → src/main/java/com/example/let/server/domain/auth/repository/impl/RefreshTokenRepositoryImpl.java

@@ -1,24 +1,25 @@
-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;
 
 @Repository
 @RequiredArgsConstructor
 public class RefreshTokenRepositoryImpl implements RefreshTokenRepository {
-    private final RedisTemplate<String, String> redisTemplate;
+    private static final String KEY_PREFIX = "refresh_token:";
 
+    private final RedisTemplate<String, String> 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);
     }
 }

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);
+}

src/main/java/com/example/let_server/domain/auth/service/impl/AuthServiceImpl.java → 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;

src/main/java/com/example/let_server/domain/eater/controller/EaterController.java → 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;

src/main/java/com/example/let_server/domain/eater/docs/EaterDocs.java → 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<BaseResponse<List<EaterRatioResponse>>> getMealRateByGrade(
     ResponseEntity<BaseResponse<UserCalorieResponse>> 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
     );
-}
+}

src/main/java/com/example/let_server/domain/eater/domain/Eater.java → 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;

src/main/java/com/example/let_server/domain/eater/dto/response/EaterRatioResponse.java → 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
-){
+) {
 }

src/main/java/com/example/let_server/domain/eater/dto/response/EaterResponse.java → 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;
 
 

src/main/java/com/example/let_server/domain/eater/dto/response/UserCalorieResponse.java → 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;

src/main/java/com/example/let_server/domain/eater/error/EaterError.java → 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;
 

src/main/java/com/example/let_server/domain/eater/mapper/EaterMapper.java → 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;
 

src/main/java/com/example/let_server/domain/eater/repository/EaterRepository.java → 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;

src/main/java/com/example/let_server/domain/eater/repository/MybatisEaterRepository.java → 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;