Skip to content
This repository has been archived by the owner on Aug 13, 2022. It is now read-only.

Commit

Permalink
DMLOperationError -> DMLOperationResult
Browse files Browse the repository at this point in the history
  • Loading branch information
yyy9942 committed Oct 18, 2019
1 parent d8b2935 commit 1334e2d
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 37 deletions.
16 changes: 8 additions & 8 deletions src/main/java/com/delfood/controller/MemberController.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.delfood.controller;

import com.delfood.dto.MemberDTO;
import com.delfood.mapper.DMLOperationError;
import com.delfood.mapper.DMLOperationResult;
import com.delfood.service.MemberService;
import javax.servlet.http.HttpSession;
import javax.validation.constraints.NotNull;
Expand Down Expand Up @@ -199,8 +199,8 @@ public ResponseEntity<UpdateMemberPasswordResponse> updateMemberInfo(HttpSession
new ResponseEntity<UpdateMemberPasswordResponse>(updateResponse, HttpStatus.BAD_REQUEST);
} else {
// 성공시
DMLOperationError dmlResponse = memberService.updateMemberPassword(id, newPassword);
if (dmlResponse == DMLOperationError.SUCCESS) {
DMLOperationResult dmlResponse = memberService.updateMemberPassword(id, newPassword);
if (dmlResponse == DMLOperationResult.SUCCESS) {
updateResponse = UpdateMemberPasswordResponse.SUCCESS;
responseEntity =
new ResponseEntity<UpdateMemberPasswordResponse>(updateResponse, HttpStatus.OK);
Expand Down Expand Up @@ -231,8 +231,8 @@ public ResponseEntity<DeleteMemberResponse> deleteMemberInfo(HttpSession session
responseEntity =
new ResponseEntity<DeleteMemberResponse>(deleteResponse, HttpStatus.UNAUTHORIZED);
} else {
DMLOperationError dmlResponse = memberService.deleteMember(id);
if (dmlResponse == DMLOperationError.SUCCESS) {
DMLOperationResult dmlResponse = memberService.deleteMember(id);
if (dmlResponse == DMLOperationResult.SUCCESS) {
deleteResponse = DeleteMemberResponse.SUCCESS;
// 회원 탈퇴시 로그아웃 시켜야 하기 때문에 세션 정보를 날린다
session.invalidate();
Expand Down Expand Up @@ -274,12 +274,12 @@ public ResponseEntity<UpdateMemberAddressResponse> updateMemberAddress(
responseEntity = new ResponseEntity<MemberController.UpdateMemberAddressResponse>(
UpdateMemberAddressResponse.NO_LOGIN, HttpStatus.UNAUTHORIZED);
} else {
DMLOperationError dmlResponse = memberService.updateMemberAddress(id, address, addressDetail);
if (dmlResponse == DMLOperationError.SUCCESS) {
DMLOperationResult dmlResponse = memberService.updateMemberAddress(id, address, addressDetail);
if (dmlResponse == DMLOperationResult.SUCCESS) {
// 성공시
responseEntity = new ResponseEntity<MemberController.UpdateMemberAddressResponse>(
UpdateMemberAddressResponse.SUCCESS, HttpStatus.OK);
} else if (dmlResponse == DMLOperationError.NONE_CHANGED) {
} else if (dmlResponse == DMLOperationResult.NONE_CHANGED) {
// 주소 변경이 되지 않았을 때
log.error("Member Address Update ERROR " + dmlResponse);
throw new RuntimeException("Member Address Update ERROR");
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/delfood/controller/OwnerController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.delfood.dto.OwnerDTO;
import com.delfood.dto.OwnerDTO.Status;
import com.delfood.mapper.DMLOperationError;
import com.delfood.mapper.DMLOperationResult;
import com.delfood.service.OwnerService;
import javax.servlet.http.HttpSession;
import lombok.AllArgsConstructor;
Expand Down Expand Up @@ -175,8 +175,8 @@ public ResponseEntity<UpdateOwnerResponse> updateOwnerInfo(
UpdateOwnerResponse.EMPTY_CONTENT, HttpStatus.BAD_REQUEST);
}

DMLOperationError dmlOperationError = ownerService.updateOwnerMailAndTel(id, mail, tel);
if (dmlOperationError == DMLOperationError.SUCCESS) {
DMLOperationResult dmlOperationError = ownerService.updateOwnerMailAndTel(id, mail, tel);
if (dmlOperationError == DMLOperationResult.SUCCESS) {
return new ResponseEntity<OwnerController.UpdateOwnerResponse>(
UpdateOwnerResponse.SUCCESS, HttpStatus.OK);
} else {
Expand Down Expand Up @@ -215,9 +215,9 @@ public ResponseEntity<UpdateOwnerResponse> updatePassword(
responseEntity = new ResponseEntity<OwnerController.UpdateOwnerResponse>(
UpdateOwnerResponse.PASSWORD_DUPLICATED, HttpStatus.CONFLICT);
} else {
DMLOperationError dmlOperationError = ownerService.updateOwnerPassword(id, newPassword);
DMLOperationResult dmlOperationError = ownerService.updateOwnerPassword(id, newPassword);

if (DMLOperationError.SUCCESS.equals(dmlOperationError)) {
if (DMLOperationResult.SUCCESS.equals(dmlOperationError)) {
responseEntity = new ResponseEntity<OwnerController.UpdateOwnerResponse>(
UpdateOwnerResponse.SUCCESS, HttpStatus.OK);
} else {
Expand Down
2 changes: 1 addition & 1 deletion ...com/delfood/mapper/DMLOperationError.java → ...om/delfood/mapper/DMLOperationResult.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.delfood.mapper;

// SUCCESS 빼고 에러발생시 아래 내용을 포함하여 throw Exception
public enum DMLOperationError {
public enum DMLOperationResult {
SUCCESS, NONE_CHANGED, TOO_MANY_CHANGED, EMPTY_RESULT
}
26 changes: 13 additions & 13 deletions src/main/java/com/delfood/service/MemberService.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.delfood.service;

import com.delfood.dto.MemberDTO;
import com.delfood.mapper.DMLOperationError;
import com.delfood.mapper.DMLOperationResult;
import com.delfood.mapper.MemberMapper;
import com.delfood.utils.SHA256Util;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -62,15 +62,15 @@ public boolean isDuplicatedId(String id) {
* @param password 변경할 비밀번호
* @return
*/
public DMLOperationError updateMemberPassword(String id, String password) {
public DMLOperationResult updateMemberPassword(String id, String password) {
String cryptoPassword = SHA256Util.encryptSHA256(password);
int result = memberMapper.updateMemberPassword(id, cryptoPassword);
if (result == 1) {
return DMLOperationError.SUCCESS; // 원하는 1개의 데이터만 수정
return DMLOperationResult.SUCCESS; // 원하는 1개의 데이터만 수정
} else if (result == 0) {
return DMLOperationError.NONE_CHANGED; // 데이터가 수정되지 않음. WHERE 조건 확인 필요
return DMLOperationResult.NONE_CHANGED; // 데이터가 수정되지 않음. WHERE 조건 확인 필요
} else {
return DMLOperationError.TOO_MANY_CHANGED; // 데이터가 너무 많이 바뀜. WHERE 조건 확인 필요.
return DMLOperationResult.TOO_MANY_CHANGED; // 데이터가 너무 많이 바뀜. WHERE 조건 확인 필요.
}

}
Expand All @@ -81,14 +81,14 @@ public DMLOperationError updateMemberPassword(String id, String password) {
* @param id 탈퇴할 회원의 아이디
* @return
*/
public DMLOperationError deleteMember(String id) {
public DMLOperationResult deleteMember(String id) {
int result = memberMapper.deleteMember(id);
if (result == 1) {
return DMLOperationError.SUCCESS; // 원하는 1개의 데이터만 수정
return DMLOperationResult.SUCCESS; // 원하는 1개의 데이터만 수정
} else if (result == 0) {
return DMLOperationError.NONE_CHANGED; // 데이터가 수정되지 않음. WHERE 조건 확인 필요
return DMLOperationResult.NONE_CHANGED; // 데이터가 수정되지 않음. WHERE 조건 확인 필요
} else {
return DMLOperationError.TOO_MANY_CHANGED; // 데이터가 너무 많이 바뀜. WHERE 조건 확인 필요.
return DMLOperationResult.TOO_MANY_CHANGED; // 데이터가 너무 많이 바뀜. WHERE 조건 확인 필요.
}
}

Expand All @@ -100,14 +100,14 @@ public DMLOperationError deleteMember(String id) {
* @param addressDetail 변경할 상세 주소
* @return
*/
public DMLOperationError updateMemberAddress(String id, String address, String addressDetail) {
public DMLOperationResult updateMemberAddress(String id, String address, String addressDetail) {
int result = memberMapper.updateMemberAddress(id, address, addressDetail);
if (result == 1) {
return DMLOperationError.SUCCESS; // 원하는 1개의 데이터만 수정
return DMLOperationResult.SUCCESS; // 원하는 1개의 데이터만 수정
} else if (result == 0) {
return DMLOperationError.NONE_CHANGED; // 데이터가 수정되지 않음. WHERE 조건 확인 필요
return DMLOperationResult.NONE_CHANGED; // 데이터가 수정되지 않음. WHERE 조건 확인 필요
} else {
return DMLOperationError.TOO_MANY_CHANGED; // 데이터가 너무 많이 바뀜. WHERE 조건 확인 필요. 정상적인 상황에서는 발생하지
return DMLOperationResult.TOO_MANY_CHANGED; // 데이터가 너무 많이 바뀜. WHERE 조건 확인 필요. 정상적인 상황에서는 발생하지
// 않음.
}
}
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/com/delfood/service/OwnerService.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.delfood.service;

import com.delfood.dto.OwnerDTO;
import com.delfood.mapper.DMLOperationError;
import com.delfood.mapper.DMLOperationResult;
import com.delfood.mapper.OwnerMapper;
import com.delfood.utils.SHA256Util;
import lombok.extern.log4j.Log4j2;
Expand Down Expand Up @@ -76,14 +76,14 @@ public OwnerDTO getOwner(String id) {
* @return
*/
@Transactional(rollbackFor = RuntimeException.class)
public DMLOperationError updateOwnerMailAndTel(String id, String mail, String tel) {
public DMLOperationResult updateOwnerMailAndTel(String id, String mail, String tel) {
int result = ownerMapper.updateMailAndTel(id, mail, tel);
if (result == 1) {
return DMLOperationError.SUCCESS; // 정상 수행
return DMLOperationResult.SUCCESS; // 정상 수행
} else if (result == 0) {
return DMLOperationError.NONE_CHANGED; // 데이터가 변경되지 않음
return DMLOperationResult.NONE_CHANGED; // 데이터가 변경되지 않음
} else {
throw new RuntimeException("password update error : " + DMLOperationError.TOO_MANY_CHANGED);
throw new RuntimeException("password update error : " + DMLOperationResult.TOO_MANY_CHANGED);
}
}

Expand All @@ -95,15 +95,15 @@ public DMLOperationError updateOwnerMailAndTel(String id, String mail, String te
* @return
*/
@Transactional(rollbackFor = RuntimeException.class) // runtimeException이 발생하면 rollback을 수행한다.
public DMLOperationError updateOwnerPassword(String id, String password) {
public DMLOperationResult updateOwnerPassword(String id, String password) {
String cryptoPassword = SHA256Util.encryptSHA256(password);
int result = ownerMapper.updatePassword(id, cryptoPassword);
if (result == 1) {
return DMLOperationError.SUCCESS;
return DMLOperationResult.SUCCESS;
} else if (result == 0) {
return DMLOperationError.NONE_CHANGED;
return DMLOperationResult.NONE_CHANGED;
} else {
throw new RuntimeException("password update error : " + DMLOperationError.TOO_MANY_CHANGED);
throw new RuntimeException("password update error : " + DMLOperationResult.TOO_MANY_CHANGED);
}

}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/delfood/service/ShopService.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.delfood.service;

import com.delfood.dto.ShopDTO;
import com.delfood.mapper.DMLOperationError;
import com.delfood.mapper.DMLOperationResult;
import com.delfood.mapper.ShopMapper;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down

0 comments on commit 1334e2d

Please sign in to comment.