Merge pull request #5 from AppJam-27th/gayeong

chore: git error

src/main/java/appJam/hackerton/appjam_27/domain/friend/dto/res/FriendRes.java

@@ -5,7 +5,7 @@
 public record FriendRes(
         String userId,
         String userName,
-        Integer userRank,
+        Integer userRank
 //        Long userTime
 
 ) {

src/main/java/appJam/hackerton/appjam_27/domain/time/controller/TimeController.java

@@ -1,30 +1,24 @@
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PathVariable;
+package appJam.hackerton.appjam_27.domain.time.controller;
+
+import appJam.hackerton.appjam_27.domain.time.dto.req.TimeReq;
+import appJam.hackerton.appjam_27.domain.time.service.TimeService;
+import appJam.hackerton.appjam_27.global.response.Response;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import appJam.hackerton.appjam_27.domain.time.service.TimeService;
-import appJam.hackerton.appjam_27.global.response.ResponseData;
-import lombok.RequiredArgsConstructor;
-
-import java.sql.Time;
-import java.util.List;
-
 @RestController
 @RequestMapping("/time")
 @RequiredArgsConstructor
 public class TimeController {
     private final TimeService timeService;
 
-    @GetMapping("/{time}")
-    public ResponseData<Time> saveTime(@PathVariable("time") String time, @PathVariable("uid") Long userId) {
-        Time savedTime = timeService.saveTime(userId, time);
-        // 응답으로 적절히 ResponseData를 리턴해야 합니다.
-        return new ResponseData<Time>(savedTime);
+    @PostMapping()
+    public Response saveTime(
+            @RequestBody TimeReq timeReq
+            ) {
+        return timeService.saveTime(timeReq);
     }
 }

src/main/java/appJam/hackerton/appjam_27/domain/time/dto/req/TimeReq.java

@@ -0,0 +1,7 @@
+package appJam.hackerton.appjam_27.domain.time.dto.req;
+
+public record TimeReq(
+        String userId,
+        Long time
+) {
+}

src/main/java/appJam/hackerton/appjam_27/domain/time/dto/res/TimeRes.java

@@ -0,0 +1,6 @@
+package appJam.hackerton.appjam_27.domain.time.dto.res;
+
+public record TimeRes (
+
+){
+}

src/main/java/appJam/hackerton/appjam_27/domain/time/repository/TimeRepository.java

@@ -1,7 +1,8 @@
-import java.sql.Time;
+package appJam.hackerton.appjam_27.domain.time.repository;
 
+import appJam.hackerton.appjam_27.domain.time.entity.TimeEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface TimeRepository extends TimeEntity<Time, Long> {
+public interface TimeRepository extends JpaRepository<TimeEntity, Long> {
 
 }

src/main/java/appJam/hackerton/appjam_27/domain/time/service/TimeService.java

@@ -2,8 +2,13 @@
 
 import java.sql.Time;
 
+import appJam.hackerton.appjam_27.domain.time.dto.req.TimeReq;
+import appJam.hackerton.appjam_27.domain.time.entity.TimeEntity;
+import appJam.hackerton.appjam_27.domain.time.repository.TimeRepository;
+import appJam.hackerton.appjam_27.global.exception.custom.user.NotFoundUserException;
+import appJam.hackerton.appjam_27.global.response.Response;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
-
 import appJam.hackerton.appjam_27.domain.user.entity.UserEntity;
 import appJam.hackerton.appjam_27.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
@@ -15,11 +20,18 @@ public class TimeService {
     private final TimeRepository timeRepository;
     private final UserRepository userRepository;
 
-    public Time saveTime(Long userId, Integer userTime) {
-        UserEntity user = userRepository.findById(userId);
+    public Response saveTime(TimeReq timeReq) {
+        UserEntity user = userRepository.findByUserId(timeReq.userId())
+                .orElseThrow(NotFoundUserException::new);
+
+        TimeEntity timeEntity = TimeEntity.builder()
+                .userId(user)
+                .userTime(timeReq.time())
+                .build();
+
+        timeRepository.save(timeEntity);
 
-        Time time = new Time(user, userTime);
-        return timeRepository.save(time);
+        return Response.of(HttpStatus.OK, "성공");
     }
 
 }