Skip to content

[BE] dto의 엔티티 생성 책임 mapper로 분리 #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
happyAndy0412 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[BE] dto의 엔티티 생성 책임 mapper로 분리 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f1c498
refactor: dto -> service 디렉토리로 이동
happyAndy0412 Jun 23, 2025
d75a866
refactor: dto.toEntity -> mapper.toEntity 책임 분리
happyAndy0412 Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions domain/src/main/java/com/kbe5/domain/company/entity/Company.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public class Company extends BaseEntity {
@Column(length = 30)
private String companyCode;

@Builder
private Company(int bizNumber, String name) {

public Company(int bizNumber, String name) {
this.bizNumber = bizNumber;
this.name = name;
}
Expand All @@ -36,7 +36,7 @@ public void update(int bizNumber, String name) {
this.name = name;
}

public void assignCompanyCode(String code) {
this.companyCode = code;
public void assignCompanyCode() {
this.companyCode = String.format("C%s", this.getId());
}
}
14 changes: 7 additions & 7 deletions rento-api/src/main/java/com/kbe5/api/domain/company/controller/CompanyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.kbe5.api.domain.company.controller;

import com.kbe5.api.domain.company.dto.request.CompanyBiznumberRequest;
import com.kbe5.api.domain.company.dto.request.CompanyRegisterRequest;
import com.kbe5.api.domain.company.dto.request.CompanyUpdateRequest;
import com.kbe5.api.domain.company.dto.response.CompanyDeleteResponse;
import com.kbe5.api.domain.company.dto.response.CompanyRegisterResponse;
import com.kbe5.api.domain.company.dto.response.CompanyResponse;
import com.kbe5.api.domain.company.dto.response.CompanyUpdateResponse;
import com.kbe5.api.domain.company.service.dto.request.CompanyBiznumberRequest;
import com.kbe5.api.domain.company.service.dto.request.CompanyRegisterRequest;
import com.kbe5.api.domain.company.service.dto.request.CompanyUpdateRequest;
import com.kbe5.api.domain.company.service.dto.response.CompanyDeleteResponse;
import com.kbe5.api.domain.company.service.dto.response.CompanyRegisterResponse;
import com.kbe5.api.domain.company.service.dto.response.CompanyResponse;
import com.kbe5.api.domain.company.service.dto.response.CompanyUpdateResponse;
import com.kbe5.common.response.api.ApiResponse;
import org.springframework.http.ResponseEntity;

Expand Down
17 changes: 8 additions & 9 deletions rento-api/src/main/java/com/kbe5/api/domain/company/controller/CompanyControllerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.kbe5.api.domain.company.controller;


import com.kbe5.api.domain.company.dto.request.CompanyBiznumberRequest;
import com.kbe5.api.domain.company.dto.request.CompanyRegisterRequest;
import com.kbe5.api.domain.company.dto.request.CompanyUpdateRequest;
import com.kbe5.api.domain.company.dto.response.CompanyDeleteResponse;
import com.kbe5.api.domain.company.dto.response.CompanyRegisterResponse;
import com.kbe5.api.domain.company.dto.response.CompanyResponse;
import com.kbe5.api.domain.company.dto.response.CompanyUpdateResponse;
import com.kbe5.api.domain.company.service.dto.request.CompanyBiznumberRequest;
import com.kbe5.api.domain.company.service.dto.request.CompanyRegisterRequest;
import com.kbe5.api.domain.company.service.dto.request.CompanyUpdateRequest;
import com.kbe5.api.domain.company.service.dto.response.CompanyDeleteResponse;
import com.kbe5.api.domain.company.service.dto.response.CompanyRegisterResponse;
import com.kbe5.api.domain.company.service.dto.response.CompanyResponse;
import com.kbe5.api.domain.company.service.dto.response.CompanyUpdateResponse;
import com.kbe5.api.domain.company.service.CompanyService;
import com.kbe5.common.apiresponse.ResEntityFactory;
import com.kbe5.common.response.api.ApiResponse;
Expand All @@ -32,10 +32,9 @@ public class CompanyControllerImpl implements CompanyController {
@PostMapping("/register")
public ResponseEntity<ApiResponse<CompanyRegisterResponse>> register(@RequestBody @Valid
CompanyRegisterRequest request) {
Company company = CompanyRegisterRequest.toEntity(request);

return ResEntityFactory.toResponse(ApiResultCode.SUCCESS,
CompanyRegisterResponse.fromEntity(companyService.register(company)));
CompanyRegisterResponse.fromEntity(companyService.register(request)));
}

@GetMapping("/{id}")
Expand Down
21 changes: 0 additions & 21 deletions rento-api/src/main/java/com/kbe5/api/domain/company/dto/request/CompanyRegisterRequest.java
View file
Open in desktop

This file was deleted.

18 changes: 8 additions & 10 deletions rento-api/src/main/java/com/kbe5/api/domain/company/service/CompanyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.kbe5.api.domain.company.service;

import com.kbe5.api.domain.company.dto.request.CompanyUpdateRequest;
import com.kbe5.api.domain.company.dto.response.CompanyDeleteResponse;
import com.kbe5.api.domain.company.service.dto.request.CompanyRegisterRequest;
import com.kbe5.api.domain.company.service.dto.request.CompanyUpdateRequest;
import com.kbe5.api.domain.company.service.dto.response.CompanyDeleteResponse;
import com.kbe5.api.domain.company.service.mapper.CompanyMapper;
import com.kbe5.api.domain.company.vo.CompanyUpdateVO;
import com.kbe5.common.exception.DomainException;
import com.kbe5.common.exception.ErrorType;
Expand All @@ -20,10 +22,10 @@ public class CompanyService {

private final CompanyRepository companyRepository;

public Company register(Company company) {
company = companyRepository.save(company);

makeCompanyCode(company);
public Company register(CompanyRegisterRequest request) {
Company company = CompanyMapper.toEntity(request);
companyRepository.save(company);
company.assignCompanyCode();

return company;
}
Expand All @@ -40,10 +42,6 @@ public Company findByCompanyCode(String code) {
.orElseThrow(() -> new DomainException(ErrorType.COMPANY_NOT_FOUND));
}

private void makeCompanyCode(Company company) {
company.assignCompanyCode("C" + company.getId());
companyRepository.save(company);
}

public Company update(Long id, CompanyUpdateRequest request) {
Company company = companyRepository
Expand Down
2 changes: 1 addition & 1 deletion .../dto/request/CompanyBiznumberRequest.java → .../dto/request/CompanyBiznumberRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.kbe5.api.domain.company.dto.request;
package com.kbe5.api.domain.company.service.dto.request;

public record CompanyBiznumberRequest(
int biznumber
Expand Down
13 changes: 13 additions & 0 deletions ...src/main/java/com/kbe5/api/domain/company/service/dto/request/CompanyRegisterRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.kbe5.api.domain.company.service.dto.request;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

public record CompanyRegisterRequest(

@NotNull
int bizNumber,

@NotBlank
String name
) {}
2 changes: 1 addition & 1 deletion ...any/dto/request/CompanyUpdateRequest.java → ...ice/dto/request/CompanyUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.kbe5.api.domain.company.dto.request;
package com.kbe5.api.domain.company.service.dto.request;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
Expand Down
2 changes: 1 addition & 1 deletion ...y/dto/response/CompanyDeleteResponse.java → ...e/dto/response/CompanyDeleteResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.kbe5.api.domain.company.dto.response;
package com.kbe5.api.domain.company.service.dto.response;

public record CompanyDeleteResponse(
Long id,
Expand Down
2 changes: 1 addition & 1 deletion ...y/dto/response/CompanyDetailResponse.java → ...e/dto/response/CompanyDetailResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.kbe5.api.domain.company.dto.response;
package com.kbe5.api.domain.company.service.dto.response;

import com.kbe5.domain.company.entity.Company;

Expand Down
2 changes: 1 addition & 1 deletion ...dto/response/CompanyRegisterResponse.java → ...dto/response/CompanyRegisterResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.kbe5.api.domain.company.dto.response;
package com.kbe5.api.domain.company.service.dto.response;


import com.kbe5.domain.company.entity.Company;
Expand Down
2 changes: 1 addition & 1 deletion ...company/dto/response/CompanyResponse.java → ...service/dto/response/CompanyResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.kbe5.api.domain.company.dto.response;
package com.kbe5.api.domain.company.service.dto.response;


import com.kbe5.domain.company.entity.Company;
Expand Down
2 changes: 1 addition & 1 deletion ...y/dto/response/CompanyUpdateResponse.java → ...e/dto/response/CompanyUpdateResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.kbe5.api.domain.company.dto.response;
package com.kbe5.api.domain.company.service.dto.response;


import com.kbe5.domain.company.entity.Company;
Expand Down
11 changes: 11 additions & 0 deletions rento-api/src/main/java/com/kbe5/api/domain/company/service/mapper/CompanyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.kbe5.api.domain.company.service.mapper;

import com.kbe5.api.domain.company.service.dto.request.CompanyRegisterRequest;
import com.kbe5.domain.company.entity.Company;

public class CompanyMapper {

public static Company toEntity(CompanyRegisterRequest request) {
return new Company(request.bizNumber(), request.name());
}
}
2 changes: 1 addition & 1 deletion rento-api/src/main/java/com/kbe5/api/domain/company/vo/CompanyUpdateVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.kbe5.api.domain.company.vo;

import com.kbe5.api.domain.company.dto.request.CompanyUpdateRequest;
import com.kbe5.api.domain.company.service.dto.request.CompanyUpdateRequest;
import com.kbe5.domain.company.entity.Company;
import lombok.Getter;

Expand Down