Skip to content

Commit

Permalink
Revert "rebase develop"
Browse files Browse the repository at this point in the history
This reverts commit e42daf1.
  • Loading branch information
taeyeongKims committed Jan 31, 2025
1 parent 068d48a commit 7e0f707
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
2 changes: 2 additions & 0 deletions src/main/java/com/example/api/contracts/ContractService.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public class ContractService {
private final ContractMapper contractMapper;
private final ChatRoomRepository chatRoomRepository;
private final UpdateContractConditionManager updateContractConditionManager;
private final ContractRepository contractRepository;
private final ContractMapper contractMapper;

@Transactional(readOnly = true)
public List<SuggestedBusinessResponse> getAllRelatedSuggests(final QueryAllSuggestsForMeCommand allSuggestsForMeCommand) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
package com.example.api.contracts.controller;

import com.example.api.contracts.ContractService;
import com.example.api.contracts.dto.*;

import com.example.api.contracts.dto.AcceptSuggestCommand;
import com.example.api.contracts.dto.UpdateContractConditionCommand;
import com.example.api.contracts.dto.QueryAllSuggestsForMeCommand;
import java.time.LocalDateTime;
import com.example.api.contracts.dto.SuggestedBusinessResponse;
import com.example.api.contracts.dto.UpdateContractConditionRequest;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequiredArgsConstructor
Expand Down Expand Up @@ -52,6 +62,7 @@ UpdateContractConditionCommand toCommand(final Long contractId) {
return new UpdateContractConditionCommand(contractId, this.suggestStartDateTime, this.suggestEndDateTime, this.suggestHourlyPayment);
}
}
}

@PostMapping("/api/v1/contracts/suggests/{suggestId}/chatroom")
public ResponseEntity<?> createChatRoom(
Expand All @@ -61,6 +72,16 @@ public ResponseEntity<?> createChatRoom(
return ResponseEntity.ok(null);
}

@PutMapping("/api/v1/contracts/{contractId}")
public ResponseEntity<?> updateContractCondition(
@PathVariable(required = true) final Long contractId,
@RequestBody final UpdateContractConditionRequest updateContractConditionRequest
) {
final UpdateContractConditionCommand updateCommand = updateContractConditionRequest.toCommand(contractId);
contractService.updateContract(updateCommand);
return ResponseEntity.ok(null);
}

@PostMapping("/api/v1/contracts/{contractId}/accepts")
public ResponseEntity<?> acceptContract(
@PathVariable(required = true) final Long contractId
Expand Down

0 comments on commit 7e0f707

Please sign in to comment.