diff --git a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java index fb5f811..488f658 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java +++ b/src/main/java/com/palnet/biz/api/bas/group/controller/BasGroupUserController.java @@ -22,6 +22,7 @@ import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; import com.palnet.biz.api.anls.hstry.service.AnlsHstryService; +import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; import com.palnet.biz.api.bas.group.model.BasGroupUserModel; import com.palnet.biz.api.bas.group.model.BasGroupUserRqModel; import com.palnet.biz.api.bas.group.service.BasGroupUserService; @@ -29,6 +30,7 @@ import com.palnet.biz.api.comn.response.BasicResponse; import com.palnet.biz.api.comn.response.ErrorResponse; import com.palnet.biz.api.comn.response.SuccessResponse; import com.palnet.comn.code.RSErrorCode; +import com.palnet.comn.exception.CustomException; import com.palnet.comn.utils.JsonUtils; import lombok.RequiredArgsConstructor; @@ -87,5 +89,24 @@ public class BasGroupUserController { } + @PutMapping(value = "/delegate") + public ResponseEntity delegate(@RequestBody List rq) { + Map resultMap = new HashMap(); + + try { + boolean result = service.delegate(rq); + resultMap.put("result", result); + } catch (CustomException e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse(e.getMessage(), e.getErrorCode())); + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + } + + } diff --git a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java index a8ab533..53ad634 100644 --- a/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java +++ b/src/main/java/com/palnet/biz/api/bas/group/service/BasGroupUserService.java @@ -9,9 +9,11 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; +import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; import com.palnet.biz.api.bas.group.model.BasGroupJoinModel; import com.palnet.biz.api.bas.group.model.BasGroupModel; import com.palnet.biz.api.bas.group.model.BasGroupRqModel; @@ -86,5 +88,30 @@ public class BasGroupUserService { } + public boolean delegate(List rq) throws Exception{ + + for(BasGroupUserModel model : rq) { + BasGroupUserModel userInfo = new BasGroupUserModel(); + + userInfo.setCstmrGroupSno(model.getCstmrGroupSno()); + userInfo.setGroupAuthCd(model.getGroupAuthCd()); + userInfo.setJoinYn(model.getJoinYn()); + + Optional optional = ptyCstmrGroupRepository.findById(userInfo.getCstmrGroupSno()); + + if (!optional.isPresent()) { + throw new CustomException(ErrorCode.DATA_NOTFIND); + } + PtyCstmrGroup entity = optional.get(); + + entity.setGroupAuthCd(model.getGroupAuthCd()); + entity.setJoinYn(model.getJoinYn()); + + if(ptyCstmrGroupRepository.save(entity) == null) + throw new CustomException(ErrorCode.FAIL); + } + return true; + } + } diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java index 7b48cd9..4296a36 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java @@ -309,6 +309,7 @@ public class PtyGroupQueryRepository{ builder.and(bas.useYn.eq("Y")); builder.and(dtl.joinYn.eq("Y")); + builder.and(dtl.aprvlYn.eq("Y")); if(!StringUtils.isEmpty(rq.getGroupNm())) {