Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
qlido committed Dec 12, 2023
2 parents a7cced6 + 7f05ffd commit d91f8ab
Showing 1 changed file with 3 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,7 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
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;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

@RestController
@RequiredArgsConstructor
Expand Down Expand Up @@ -48,8 +40,8 @@ public Long updateStatus(@PathVariable Long id){
return projectDef.deleteProject(id ,SecurityUtil.getCurrentUserWithLogin());
}

@GetMapping("/{status}")
public Page<ProjectRes> getProjectList(@PathVariable String status, @PageableDefault(size = 20) Pageable pageable){
@GetMapping()
public Page<ProjectRes> getProjectList(@RequestParam(name= "status") String status, @PageableDefault(size = 20) Pageable pageable){
return projectRead.getProjectList(status,pageable);
}
@GetMapping("/{id}")
Expand Down

0 comments on commit d91f8ab

Please sign in to comment.