bcjang/operationSystem-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user block 처리 수정

Browse Source 
dynamodb UserBase 변경부분으로 교체
This commit is contained in:
bcjang
2025-02-15 02:21:19 +09:00
parent 62ba0c760e
commit d31778293a
5 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/caliverse/admin/domain/service/BlackListService.java
View File

@@ -6,6 +6,7 @@ import com.caliverse.admin.domain.entity.BlackList;
import com.caliverse.admin.domain.entity.HISTORYTYPE;
import com.caliverse.admin.domain.request.BlackListRequest;
import com.caliverse.admin.domain.response.BlackListResponse;
import com.caliverse.admin.dynamodb.service.DynamodbUserService;
import com.caliverse.admin.global.common.code.CommonCode;
import com.caliverse.admin.global.common.code.ErrorCode;
import com.caliverse.admin.global.common.code.SuccessCode;
@@ -37,6 +38,7 @@ public class BlackListService {
private final HistoryMapper historyMapper;
private final HistoryService historyService;
private final DynamoDBService dynamoDBService;
private final DynamodbUserService dynamodbUserService;
@Value("${caliverse.file}")
private String excelPath;
private final ResourceLoader resourceLoader;
@@ -104,7 +106,8 @@ public class BlackListService {
//adminDB 에 데이터 있는지 체크
int cnt = blackListMapper.getCountByGuid(item);
//gameDB isWhiteUser 값 체크
boolean isBlackUser = dynamoDBService.isWhiteOrBlackUser(item);
// boolean isBlackUser = dynamoDBService.isWhiteOrBlackUser(item);
boolean isBlackUser = dynamodbUserService.isBlockUser(item);
boolean isGuid = dynamoDBService.isGuidChecked(item);
// //guid 검증
@@ -157,7 +160,8 @@ public class BlackListService {
if(dynamoDBService.isGuidChecked(guid)){
throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.GUID_CHECK.getMessage());
}
boolean isBlackUser = dynamoDBService.isWhiteOrBlackUser(guid);
// boolean isBlackUser = dynamoDBService.isWhiteOrBlackUser(guid);
boolean isBlackUser = dynamodbUserService.isBlockUser(guid);
if(isBlackUser){
throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.DYNAMODB_EXIT_ERROR.getMessage());
}
@@ -181,7 +185,8 @@ public class BlackListService {
if(dynamoDBService.isGuidChecked(item.getGuid())){
throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.GUID_CHECK.getMessage());
}
boolean isBlackUser = dynamoDBService.isWhiteOrBlackUser(item.getGuid());
// boolean isBlackUser = dynamoDBService.isWhiteOrBlackUser(item.getGuid());
boolean isBlackUser = dynamodbUserService.isBlockUser(item.getGuid());
if(isBlackUser){
throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.DYNAMODB_EXIT_ERROR.getMessage());
}
@@ -256,11 +261,12 @@ public class BlackListService {
return blackListMapper.getScheduleBlackList();
}
public void updateScheduleBlockUser(BlackList blockUser, String type){
if(type.equals("start")){
dynamoDBService.updateBlockUserStart(blockUser);
}else{
dynamoDBService.updateBlockUserEnd(blockUser.getGuid());
}
public void updateScheduleBlockUser(BlackList blockUser, BlackList.STATUSTYPE status){
// if(status.equals(BlackList.STATUSTYPE.INPROGRESS)){
// dynamoDBService.updateBlockUserStart(blockUser);
// }else{
// dynamoDBService.updateBlockUserEnd(blockUser.getGuid());
// }
dynamodbUserService.updateBlockUser(status, blockUser);
}
}