Skip to content

Commit

Permalink
feat #18 : 커스텀에러 코드 적용, 자잘한 버그 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
j2noo committed Mar 4, 2024
1 parent 3d2cb78 commit f62c0ef
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

@RestController
@RequiredArgsConstructor
@RequestMapping("/api/model")
public class ModelController {
private final ModelService modelService;

Expand All @@ -18,7 +19,7 @@ public class ModelController {
* @param modelId
* @return
*/
@GetMapping("/api/model/{modelId}")
@GetMapping("/{modelId}")
public BaseResponse<ModelResponse> getModel(@PathVariable Long modelId) {
return BaseResponse.<ModelResponse>builder()
.isSuccess(true)
Expand All @@ -34,7 +35,7 @@ public BaseResponse<ModelResponse> getModel(@PathVariable Long modelId) {
* @param request
* @return
*/
@PostMapping("/api/model")
@PostMapping("/")
public BaseResponse<ModelResponse> createModel(@RequestBody @Valid ModelRequest request) {
return BaseResponse.<ModelResponse>builder()
.isSuccess(true)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.backend.soullive_a.dto.response;

import com.backend.soullive_a.entity.ModelIntroduction;
import lombok.Builder;

import java.time.LocalDateTime;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.backend.soullive_a.entity;
package com.backend.soullive_a.entity.model;

import jakarta.persistence.*;
import lombok.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.backend.soullive_a.entity;
package com.backend.soullive_a.entity.model.introduction;

import com.backend.soullive_a.entity.model.Model;
import jakarta.persistence.*;
import lombok.*;

Expand All @@ -8,7 +9,6 @@
@Builder
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)

public class ModelImageKeyword {

@Id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.backend.soullive_a.entity;
package com.backend.soullive_a.entity.model.introduction;

import com.backend.soullive_a.entity.model.Model;
import jakarta.persistence.*;
import lombok.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.backend.soullive_a.entity;
package com.backend.soullive_a.entity.model.introduction;

import com.backend.soullive_a.entity.model.Model;
import jakarta.persistence.*;
import lombok.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.backend.soullive_a.entity;
package com.backend.soullive_a.entity.model.introduction;

import com.backend.soullive_a.entity.model.Model;
import jakarta.persistence.*;
import lombok.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.backend.soullive_a.repository;

import com.backend.soullive_a.entity.Model;
import com.backend.soullive_a.entity.model.Model;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import com.backend.soullive_a.dto.request.ModelRequest;
import com.backend.soullive_a.dto.response.ModelResponse;
import com.backend.soullive_a.entity.Model;
import com.backend.soullive_a.entity.model.Model;
import com.backend.soullive_a.exception.custom.NotFoundUserException;
import com.backend.soullive_a.repository.ModelRepository;
import com.backend.soullive_a.service.ModelService;
import lombok.RequiredArgsConstructor;
Expand All @@ -17,7 +18,7 @@ public class ModelServiceImpl implements ModelService {
@Override
public ModelResponse getModel(Long modelId) {
Model model = modelRepository.findById(modelId)
.orElseThrow(() -> new RuntimeException("존재하지 않는 아이디"));
.orElseThrow(() -> new NotFoundUserException());

return ModelResponse.builder()
.modelId(model.getId())
Expand All @@ -33,8 +34,7 @@ public ModelResponse getModel(Long modelId) {
@Override
public ModelResponse createModel(ModelRequest request) {
// 중복 검사 로직 추가
System.out.println("S?");
modelRepository.save(Model.builder()
Model model = modelRepository.save(Model.builder()
.modelName(request.modelName())
.birth(request.birth())
.job(request.job())
Expand All @@ -44,13 +44,13 @@ public ModelResponse createModel(ModelRequest request) {
.build());

return ModelResponse.builder()
.modelId(99L) // 수정해야함. 일단 무시.
.modelName(request.modelName())
.birth(request.birth())
.job(request.job())
.info(request.info())
.agency(request.agency())
.aiRate(request.aiRate())
.modelId(model.getId())
.modelName(model.getModelName())
.birth(model.getBirth())
.job(model.getJob())
.info(model.getInfo())
.agency(model.getAgency())
.aiRate(model.getAiRate())
.build();
}

Expand Down

0 comments on commit f62c0ef

Please sign in to comment.