[BE] feat: 발자국 삭제 및 발자국 상태 수동 변경 구현

backend/src/main/java/com/happy/friendogly/common/ErrorCode.java

@@ -2,10 +2,10 @@
 
 public enum ErrorCode {
 
-    // TODO: 추가 필요
     DEFAULT_ERROR_CODE,
     FAILED_LOAD_SERVER_FIREBASE_CREDENTIALS,
     INVALID_FIREBASE_CREDENTIALS,
     FILE_SIZE_EXCEED,
+    NOT_ALLOW_OTHER_FOOTPRINT_CHANGE,
     ;
 }

backend/src/main/java/com/happy/friendogly/footprint/controller/FootprintController.java

@@ -4,18 +4,20 @@
 import com.happy.friendogly.common.ApiResponse;
 import com.happy.friendogly.footprint.dto.request.FindNearFootprintRequest;
 import com.happy.friendogly.footprint.dto.request.SaveFootprintRequest;
-import com.happy.friendogly.footprint.dto.request.UpdateWalkStatusRequest;
+import com.happy.friendogly.footprint.dto.request.UpdateWalkStatusAutoRequest;
 import com.happy.friendogly.footprint.dto.response.FindMyLatestFootprintTimeAndPetExistenceResponse;
 import com.happy.friendogly.footprint.dto.response.FindNearFootprintResponse;
 import com.happy.friendogly.footprint.dto.response.FindOneFootprintResponse;
 import com.happy.friendogly.footprint.dto.response.SaveFootprintResponse;
-import com.happy.friendogly.footprint.dto.response.UpdateWalkStatusResponse;
+import com.happy.friendogly.footprint.dto.response.UpdateWalkStatusAutoResponse;
+import com.happy.friendogly.footprint.dto.response.UpdateWalkStatusManualResponse;
 import com.happy.friendogly.footprint.service.FootprintCommandService;
 import com.happy.friendogly.footprint.service.FootprintQueryService;
 import jakarta.validation.Valid;
 import java.net.URI;
 import java.util.List;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -54,7 +56,6 @@ public ApiResponse<FindOneFootprintResponse> findOne(
             @Auth Long memberId,
             @PathVariable Long footprintId
     ) {
-        // TODO: 추후 토큰에서 memberId를 가져오도록 변경
         FindOneFootprintResponse response = footprintQueryService.findOne(memberId, footprintId);
         return ApiResponse.ofSuccess(response);
     }
@@ -64,7 +65,6 @@ public ApiResponse<List<FindNearFootprintResponse>> findNear(
             @Auth Long memberId,
             @Valid FindNearFootprintRequest request
     ) {
-        // TODO: 추후 토큰에서 memberId를 가져오도록 변경
         List<FindNearFootprintResponse> response = footprintQueryService.findNear(memberId, request);
         return ApiResponse.ofSuccess(response);
     }
@@ -73,18 +73,34 @@ public ApiResponse<List<FindNearFootprintResponse>> findNear(
     public ApiResponse<FindMyLatestFootprintTimeAndPetExistenceResponse> findMyLatestFootprintTimeAndPetExistence(
             @Auth Long memberId
     ) {
-        // TODO: 추후 토큰에서 memberId를 가져오도록 변경
         FindMyLatestFootprintTimeAndPetExistenceResponse response
                 = footprintQueryService.findMyLatestFootprintTimeAndPetExistence(memberId);
         return ApiResponse.ofSuccess(response);
     }
 
-    @PatchMapping("/walk-status")
-    public ApiResponse<UpdateWalkStatusResponse> updateWalkStatus(
+    @PatchMapping("/recent/walk-status/auto")
+    public ApiResponse<UpdateWalkStatusAutoResponse> updateWalkStatusAuto(
             @Auth Long memberId,
-            @Valid @RequestBody UpdateWalkStatusRequest request
+            @Valid @RequestBody UpdateWalkStatusAutoRequest request
     ) {
-        UpdateWalkStatusResponse walkStatusResponse = footprintCommandService.updateWalkStatus(memberId, request);
-        return ApiResponse.ofSuccess(walkStatusResponse);
+        UpdateWalkStatusAutoResponse response = footprintCommandService.updateWalkStatusAuto(memberId, request);
+        return ApiResponse.ofSuccess(response);
+    }
+
+    @PatchMapping("/recent/walk-status/manual")
+    public ApiResponse<UpdateWalkStatusManualResponse> updateWalkStatusManual(
+            @Auth Long memberId
+    ) {
+        UpdateWalkStatusManualResponse response = footprintCommandService.updateWalkStatusManual(memberId);
+        return ApiResponse.ofSuccess(response);
+    }
+
+    @DeleteMapping("/{footprintId}")
+    public ResponseEntity<Void> delete(
+            @Auth Long memberId,
+            @PathVariable Long footprintId
+    ) {
+        footprintCommandService.delete(memberId, footprintId);
+        return ResponseEntity.noContent().build();
     }
 }

backend/src/main/java/com/happy/friendogly/footprint/domain/Footprint.java

@@ -3,6 +3,7 @@
 import static com.happy.friendogly.footprint.domain.WalkStatus.AFTER;
 import static com.happy.friendogly.footprint.domain.WalkStatus.ONGOING;
 
+import com.happy.friendogly.exception.FriendoglyException;
 import com.happy.friendogly.member.domain.Member;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
@@ -126,6 +127,13 @@ public void updateWalkStatusWithCurrentLocation(Location currentLocation) {
         }
     }
 
+    public void finishWalkingManual() {
+        if (walkStatus.isBefore() || walkStatus.isAfter()) {
+            throw new FriendoglyException("산책 중에서 산책 후로의 변경만 가능합니다.");
+        }
+        endWalk();
+    }
+
     private void startWalk() {
         walkStatus = ONGOING;
         startWalkTime = LocalDateTime.now();

backend/src/main/java/com/happy/friendogly/footprint/dto/request/UpdateWalkStatusRequest.java → backend/src/main/java/com/happy/friendogly/footprint/dto/request/UpdateWalkStatusAutoRequest.java

@@ -4,7 +4,7 @@
 import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotNull;
 
-public record UpdateWalkStatusRequest(
+public record UpdateWalkStatusAutoRequest(
 
         @NotNull
         @DecimalMin(value = "-90.0", message = "위도는 -90도 이상 90도 이하로 입력해 주세요.")

backend/src/main/java/com/happy/friendogly/footprint/dto/request/UpdateWalkStatusManualRequest.java

@@ -0,0 +1,11 @@
+package com.happy.friendogly.footprint.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record UpdateWalkStatusManualRequest(
+
+        @NotBlank(message = "walkStatus는 빈 문자열이나 null을 입력할 수 없습니다.")
+        String walkStatus
+) {
+
+}

backend/src/main/java/com/happy/friendogly/footprint/dto/response/UpdateWalkStatusAutoResponse.java

@@ -0,0 +1,11 @@
+package com.happy.friendogly.footprint.dto.response;
+
+import com.happy.friendogly.footprint.domain.WalkStatus;
+import java.time.LocalDateTime;
+
+public record UpdateWalkStatusAutoResponse(
+        WalkStatus walkStatus,
+        LocalDateTime changedWalkStatusTime
+) {
+
+}

backend/src/main/java/com/happy/friendogly/footprint/dto/response/UpdateWalkStatusManualResponse.java

@@ -0,0 +1,11 @@
+package com.happy.friendogly.footprint.dto.response;
+
+import com.happy.friendogly.footprint.domain.WalkStatus;
+import java.time.LocalDateTime;
+
+public record UpdateWalkStatusManualResponse(
+        WalkStatus walkStatus,
+        LocalDateTime changedWalkStatusTime
+) {
+
+}

backend/src/main/java/com/happy/friendogly/footprint/repository/FootprintRepository.java

@@ -21,4 +21,9 @@ default Footprint getTopOneByMemberIdOrderByCreatedAtDesc(Long memberId) {
     }
 
     List<Footprint> findAllByIsDeletedFalse();
+
+    default Footprint getById(Long id) {
+        return findById(id)
+                .orElseThrow(() -> new FriendoglyException("발자국이 존재하지 않습니다."));
+    }
 }

backend/src/main/java/com/happy/friendogly/footprint/service/FootprintCommandService.java

@@ -5,9 +5,10 @@
 import com.happy.friendogly.footprint.domain.Location;
 import com.happy.friendogly.footprint.domain.WalkStatus;
 import com.happy.friendogly.footprint.dto.request.SaveFootprintRequest;
-import com.happy.friendogly.footprint.dto.request.UpdateWalkStatusRequest;
+import com.happy.friendogly.footprint.dto.request.UpdateWalkStatusAutoRequest;
 import com.happy.friendogly.footprint.dto.response.SaveFootprintResponse;
-import com.happy.friendogly.footprint.dto.response.UpdateWalkStatusResponse;
+import com.happy.friendogly.footprint.dto.response.UpdateWalkStatusAutoResponse;
+import com.happy.friendogly.footprint.dto.response.UpdateWalkStatusManualResponse;
 import com.happy.friendogly.footprint.repository.FootprintRepository;
 import com.happy.friendogly.member.domain.Member;
 import com.happy.friendogly.member.repository.MemberRepository;
@@ -103,7 +104,7 @@ private void sendWalkComingNotification(String memberName, List<String> nearDevi
         );
     }
 
-    public UpdateWalkStatusResponse updateWalkStatus(Long memberId, UpdateWalkStatusRequest request) {
+    public UpdateWalkStatusAutoResponse updateWalkStatusAuto(Long memberId, UpdateWalkStatusAutoRequest request) {
         Footprint footprint = footprintRepository.getTopOneByMemberIdOrderByCreatedAtDesc(memberId);
         if (footprint.isDeleted()) {
             throw new FriendoglyException("가장 최근 발자국이 삭제된 상태입니다.");
@@ -112,14 +113,15 @@ public UpdateWalkStatusResponse updateWalkStatus(Long memberId, UpdateWalkStatus
         WalkStatus beforeWalkStatus = footprint.getWalkStatus();
 
         footprint.updateWalkStatusWithCurrentLocation(new Location(request.latitude(), request.longitude()));
+
         if (beforeWalkStatus.isBefore() && footprint.getWalkStatus().isOngoing()) {
             Member startWalkMember = memberRepository.getById(memberId);
             List<String> nearDeviceTokens = findNearDeviceTokensWithoutMine(footprint, startWalkMember);
             String memberName = footprint.getMember().getName().getValue();
             sendWalkStartNotification(memberName, nearDeviceTokens);
         }
 
-        return new UpdateWalkStatusResponse(footprint.getWalkStatus());
+        return new UpdateWalkStatusAutoResponse(footprint.getWalkStatus(), footprint.findChangedWalkStatusTime());
     }
 
     private void sendWalkStartNotification(String startMemberName, List<String> nearDeviceTokens) {
@@ -130,6 +132,20 @@ private void sendWalkStartNotification(String startMemberName, List<String> near
         );
     }
 
+    public UpdateWalkStatusManualResponse updateWalkStatusManual(Long memberId) {
+        Footprint footprint = footprintRepository.getTopOneByMemberIdOrderByCreatedAtDesc(memberId);
+        footprint.finishWalkingManual();
+        return new UpdateWalkStatusManualResponse(footprint.getWalkStatus(), footprint.findChangedWalkStatusTime());
+    }
+
+    public void delete(Long memberId, Long footprintId) {
+        Footprint footprint = footprintRepository.getById(footprintId);
+        if (!footprint.isCreatedBy(memberId)) {
+            throw new FriendoglyException("본인의 발자국만 삭제 가능합니다.");
+        }
+        footprint.updateToDeleted();
+    }
+
     private List<String> findNearDeviceTokensWithoutMine(Footprint standardFootprint, Member member) {
         List<Footprint> footprints = footprintRepository.findAllByIsDeletedFalse();