Feature/13 user

.github/workflows/ci.yml

@@ -28,11 +28,6 @@ jobs:
           java-version: "17"
           cache: gradle
 
-      - name: Copy application.yml into runner
-        run: |
-          mkdir -p src/main/resources
-          echo "${{ secrets.APPLICATION_YML }}" > src/main/resources/application.yml
-
       - name: Build + Test(Gradle)
         if: ${{ hashFiles('**/build.gradle*') != '' }}
         run: |

build.gradle

@@ -29,6 +29,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 
     //security
     implementation 'org.springframework.boot:spring-boot-starter-security'
@@ -45,24 +46,23 @@ dependencies {
     // database
     runtimeOnly 'com.mysql:mysql-connector-j'
 
+    // redis
+    implementation('org.springframework.boot:spring-boot-starter-data-redis')
+
     // swagger
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13'
 
     // OAuth
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
-    // aws secrets manager
-    implementation 'io.awspring.cloud:spring-cloud-aws-starter-secrets-manager:3.1.0'
-
     // test
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'com.h2database:h2'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
-    //lombok
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
+    // sms
+    implementation 'com.solapi:sdk:1.0.3'
 }
 
 tasks.named('test') {

docker/docker-compose.common.yml

@@ -13,6 +13,17 @@ services:
     networks:
       - tinybite-network
 
+  redis:
+    container_name: redis
+    image: redis:7.2.4
+    ports:
+      - "6379:6379"
+    volumes:
+      - redis_data:/data
+    restart: always
+    networks:
+      - tinybite-network
+
   certbot:
     container_name: certbot
     image: certbot/certbot

src/main/java/ita/tinybite/domain/auth/service/SecurityProvider.java

@@ -0,0 +1,35 @@
+package ita.tinybite.domain.auth.service;
+
+import ita.tinybite.domain.user.entity.User;
+import ita.tinybite.domain.user.repository.UserRepository;
+import ita.tinybite.global.exception.BusinessException;
+import ita.tinybite.global.exception.errorcode.UserErrorCode;
+import ita.tinybite.global.exception.errorcode.CommonErrorCode;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SecurityProvider {
+
+    private final UserRepository userRepository;
+
+    public SecurityProvider(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    public User getCurrentUser() {
+        return getUserFromContext();
+    }
+
+    private User getUserFromContext() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (!(authentication instanceof UsernamePasswordAuthenticationToken auth)) {
+            throw BusinessException.of(CommonErrorCode.UNAUTHORIZED);
+        }
+
+        Long userId = (Long) auth.getPrincipal();
+        return userRepository.findById(userId).orElseThrow(() -> BusinessException.of(UserErrorCode.USER_NOT_EXISTS));
+    }
+}

src/main/java/ita/tinybite/domain/user/controller/UserController.java

@@ -0,0 +1,44 @@
+package ita.tinybite.domain.user.controller;
+
+import ita.tinybite.domain.user.dto.req.UpdateUserReqDto;
+import ita.tinybite.domain.user.service.UserService;
+import ita.tinybite.global.response.APIResponse;
+import jakarta.validation.Valid;
+import org.springframework.web.bind.annotation.*;
+
+import static ita.tinybite.global.response.APIResponse.success;
+
+@RestController
+@RequestMapping("/api/v1/user/me")
+public class UserController {
+
+    private final UserService userService;
+
+    public UserController(UserService userService) {
+        this.userService = userService;
+    }
+
+    @GetMapping
+    public APIResponse<?> getUser() {
+        return success(userService.getUser());
+    }
+
+    @PatchMapping
+    public APIResponse<?> updateUser(@Valid @RequestBody UpdateUserReqDto req) {
+        userService.updateUser(req);
+        return success();
+    }
+
+    @PatchMapping("/location")
+    public APIResponse<?> updateLocation(@RequestParam(defaultValue = "37.3623504988728") String latitude,
+                                         @RequestParam(defaultValue = "127.117057453619") String longitude) {
+        userService.updateLocation(latitude, longitude);
+        return success();
+    }
+
+    @DeleteMapping
+    public APIResponse<?> deleteUser() {
+        userService.deleteUser();
+        return success();
+    }
+}

src/main/java/ita/tinybite/domain/user/dto/req/UpdateUserReqDto.java

@@ -0,0 +1,6 @@
+package ita.tinybite.domain.user.dto.req;
+
+public record UpdateUserReqDto(
+    String nickname
+) {
+}

src/main/java/ita/tinybite/domain/user/dto/res/UserResDto.java

@@ -0,0 +1,14 @@
+package ita.tinybite.domain.user.dto.res;
+
+import ita.tinybite.domain.user.entity.User;
+
+public record UserResDto(
+        Long userId,
+        String name,
+        String location
+) {
+
+    public static UserResDto of(User user) {
+        return new UserResDto(user.getUserId(), user.getNickname(), user.getLocation());
+    }
+}

src/main/java/ita/tinybite/domain/user/entity/User.java

@@ -2,6 +2,7 @@
 
 import ita.tinybite.domain.user.constant.LoginType;
 import ita.tinybite.domain.user.constant.UserStatus;
+import ita.tinybite.domain.user.dto.req.UpdateUserReqDto;
 import ita.tinybite.global.entity.BaseEntity;
 
 import jakarta.persistence.*;
@@ -21,7 +22,7 @@ public class User extends BaseEntity {
     @Comment("uid")
     private Long userId;
 
-    @Column(nullable = false, length = 50)
+    @Column(nullable = false, length = 50, unique = true)
     private String email;
 
     @Column(length = 50)
@@ -40,4 +41,12 @@ public class User extends BaseEntity {
 
     @Column(nullable = false, length = 100)
     private String location;
+
+    public void update(UpdateUserReqDto req) {
+        this.nickname = req.nickname();
+    }
+
+    public void updateLocation(String location) {
+        this.location = location;
+    }
 }

src/main/java/ita/tinybite/domain/user/repository/UserRepository.java

@@ -2,11 +2,16 @@
 
 import ita.tinybite.domain.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
 
+@Repository
 public interface UserRepository extends JpaRepository<User, Long> {
+
     Optional<User> findByEmail(String email);
+
     boolean existsByNickname(String nickname);
-}
 
+    User getUserByUserId(Long userId);
+}

src/main/java/ita/tinybite/domain/user/service/UserService.java

@@ -0,0 +1,46 @@
+package ita.tinybite.domain.user.service;
+
+import ita.tinybite.domain.auth.service.SecurityProvider;
+import ita.tinybite.domain.user.dto.req.UpdateUserReqDto;
+import ita.tinybite.domain.user.dto.res.UserResDto;
+import ita.tinybite.domain.user.entity.User;
+import ita.tinybite.domain.user.repository.UserRepository;
+import ita.tinybite.global.location.LocationService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserService {
+
+    private final SecurityProvider securityProvider;
+    private final UserRepository userRepository;
+    private final LocationService locationService;
+
+    public UserService(SecurityProvider securityProvider,
+                       UserRepository userRepository,
+                       LocationService locationService) {
+        this.securityProvider = securityProvider;
+        this.userRepository = userRepository;
+        this.locationService = locationService;
+    }
+
+    public UserResDto getUser() {
+        User user = securityProvider.getCurrentUser();
+        return UserResDto.of(user);
+    }
+
+    public void updateUser(UpdateUserReqDto req) {
+        User user = securityProvider.getCurrentUser();
+        user.update(req);
+    }
+
+    public void updateLocation(String latitude, String longitude) {
+        User user = securityProvider.getCurrentUser();
+        String location = locationService.getLocation(latitude, longitude);
+        user.updateLocation(location);
+    }
+
+    public void deleteUser() {
+        userRepository.delete(securityProvider.getCurrentUser());
+    }
+
+}