Update-api-create-activity-tb-code

src/main/java/vn/azteam/tpf/service/TBCodeService.java

@@ -1,6 +1,7 @@
 package vn.azteam.tpf.service;
 
 
+import vn.azteam.tpf.domain.TBCode;
 import vn.azteam.tpf.service.dto.TBCodeDTO;
 import java.util.List;
 import java.util.Optional;
@@ -17,6 +18,8 @@ public interface TBCodeService {
 
     Optional<TBCodeDTO> updateStatusTBCode(TBCodeDTO tBCodeDTO);
 
+    Optional<TBCode> findByCode(String code);
+
 //    /**
 //     * Update crop's PIC
 //     * @param cropPersonInChargeDTO

src/main/java/vn/azteam/tpf/service/dto/ActivityCodeCreationDTO.java

@@ -5,18 +5,18 @@ import java.time.Instant;
 
 public class ActivityCodeCreationDTO implements Serializable {
 
-    private Long tbCropId;
+    private String code;
     private Long activityTypeId;
     private Instant executeDate;
     private String description;
     private String location;
 
-    public Long getTbCropId() {
-        return tbCropId;
+    public String getCode() {
+        return code;
     }
 
-    public void setTbCropId(Long tbCropId) {
-        this.tbCropId = tbCropId;
+    public void setCode(String code) {
+        this.code = code;
     }
 
     public Long getActivityTypeId() {

src/main/java/vn/azteam/tpf/service/impl/TBCodeServiceImpl.java

@@ -111,6 +111,13 @@ public class TBCodeServiceImpl implements TBCodeService {
             .map(tBCodeMapper::toDto);
     }
 
+    @Override
+    @Transactional
+    public Optional<TBCode> findByCode(String code) {
+        log.debug("Request to findByCode TBCode : {}", code);
+        return tbCodeRepository.findByCode(code);
+    }
+
     @Override
     @Transactional()
     public Optional<TBCodeDTO> updateStatusTBCode(TBCodeDTO tbCodeDTO) {

src/main/java/vn/azteam/tpf/web/rest/TBCodeResource.java

@@ -10,6 +10,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import vn.azteam.tpf.domain.TBCode;
 import vn.azteam.tpf.domain.TBCodeStatusEnum;
 import vn.azteam.tpf.service.*;
 import vn.azteam.tpf.service.dto.*;
@@ -20,7 +21,6 @@ import vn.azteam.tpf.web.rest.util.HeaderUtil;
 import vn.azteam.tpf.web.rest.util.PaginationUtil;
 import vn.azteam.tpf.web.rest.util.RandomStringUtil;
 
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Instant;
@@ -151,7 +151,7 @@ public class TBCodeResource {
             tBCodeDTO.setCreatedDate(Instant.now());
             tBCodeDTO.setCreatedById(currentUser.getUserId());
             tBCodeDTO.setStatus(TBCodeStatusEnum.NEW);
-            if(tBCodeCreationDTO.getTbProductLabelId() != null) {
+            if (tBCodeCreationDTO.getTbProductLabelId() != null) {
                 tBCodeDTO.setTbProductLabelId(tBCodeCreationDTO.getTbProductLabelId());
             }
 
@@ -159,7 +159,7 @@ public class TBCodeResource {
             Boolean hasViolationException = false;
             do {
                 try {
-                    tBCodeDTO.setCode(RandomStringUtil.generateRandomStringFromUUID(8));
+                    tBCodeDTO.setCode("AZTRACE_" + RandomStringUtil.generateRandomStringFromUUID(8));
                     result = tBCodeService.save(tBCodeDTO);
                 } catch (org.springframework.dao.DataIntegrityViolationException ex) {
                     if (ex.getMessage().contains("ux_tb_code_code")) {
@@ -208,6 +208,48 @@ public class TBCodeResource {
     }
 
     // 1 api tạo hoạt động cho code
+//    @PostMapping("/tb-codes/create/activity")
+//    @Timed
+//    public ResponseEntity<TBActivityDTO> createActivityForTBCode(@RequestBody ActivityCodeCreationDTO
+//                                                                     activityCodeCreationDTO)
+//        throws URISyntaxException {
+//
+//        log.debug("REST request to save TBActivityDTO : {}", activityCodeCreationDTO);
+//        //Set created by to current user login
+//        UserDTO currentUser = userService.getCurrentUserDTO().get();
+//        if (activityCodeCreationDTO.getTbCropId() == null) {
+//            throw new BadRequestAlertException("1047", ENTITY_NAME, "1047");
+//        }
+//        if (activityCodeCreationDTO.getActivityTypeId() == null) {
+//            throw new BadRequestAlertException("1047", ENTITY_NAME, "1047");
+//        }
+//        if (activityCodeCreationDTO.getExecuteDate() == null) {
+//            throw new BadRequestAlertException("1047", ENTITY_NAME, "1047");
+//        }
+//
+//        Optional<TBCropDTO> tBCropDTO = tBCropService.findOne(activityCodeCreationDTO.getTbCropId());
+//        if (!tBCropDTO.isPresent()) {
+//            throw new BadRequestAlertException("1019", ENTITY_NAME, "1019");
+//        }
+//
+//        Optional<TBActivityTypeDTO> tbActivityTypeDTO = tBActivityTypeService.findOne(activityCodeCreationDTO.getActivityTypeId());
+//        if (!tbActivityTypeDTO.isPresent()) {
+//            throw new BadRequestAlertException("1019", ENTITY_NAME, "1019");
+//        }
+//
+//        TBActivityDTO activityDTO = new TBActivityDTO();
+//        activityDTO.setCreatedById(currentUser.getId());
+//        activityDTO.setActivityTypeId(activityCodeCreationDTO.getActivityTypeId());
+//        activityDTO.setDescription(activityCodeCreationDTO.getDescription());
+//        activityDTO.setExecuteDate(activityCodeCreationDTO.getExecuteDate());
+//        activityDTO.setCropId(activityCodeCreationDTO.getTbCropId());
+//        activityDTO.setCreatedDate(Instant.now());
+//        TBActivityDTO result = tBActivityService.save(activityDTO);
+//        return ResponseEntity.created(new URI("/tb-codes/create/activity" + result.getId()))
+//            .headers(HeaderUtil.createEntityCreationAlert("TBActivity", result.getId().toString()))
+//            .body(result);
+//    }
+
     @PostMapping("/tb-codes/create/activity")
     @Timed
     public ResponseEntity<TBActivityDTO> createActivityForTBCode(@RequestBody ActivityCodeCreationDTO
@@ -217,7 +259,7 @@ public class TBCodeResource {
         log.debug("REST request to save TBActivityDTO : {}", activityCodeCreationDTO);
         //Set created by to current user login
         UserDTO currentUser = userService.getCurrentUserDTO().get();
-        if (activityCodeCreationDTO.getTbCropId() == null) {
+        if (StringUtils.isBlank(activityCodeCreationDTO.getCode())) {
             throw new BadRequestAlertException("1047", ENTITY_NAME, "1047");
         }
         if (activityCodeCreationDTO.getActivityTypeId() == null) {
@@ -227,7 +269,19 @@ public class TBCodeResource {
             throw new BadRequestAlertException("1047", ENTITY_NAME, "1047");
         }
 
-        Optional<TBCropDTO> tBCropDTO = tBCropService.findOne(activityCodeCreationDTO.getTbCropId());
+        Optional<TBCode> tbCode = tBCodeService.findByCode(activityCodeCreationDTO.getCode());
+
+        if(!tbCode.isPresent()) {
+            throw new BadRequestAlertException("1047", ENTITY_NAME, "1047");
+        } else {
+            if(!tbCode.get().getStatus().equals(TBCodeStatusEnum.ACTIVE)
+             || !tbCode.get().getStatus().equals(TBCodeStatusEnum.NEW)) {
+                throw new BadRequestAlertException("1047", "TB Code is not active", "1047");
+            }
+        }
+
+        Long tbCropId = tbCode.get().getTbCropId();
+        Optional<TBCropDTO> tBCropDTO = tBCropService.findOne(tbCropId);
         if (!tBCropDTO.isPresent()) {
             throw new BadRequestAlertException("1019", ENTITY_NAME, "1019");
         }
@@ -242,7 +296,7 @@ public class TBCodeResource {
         activityDTO.setActivityTypeId(activityCodeCreationDTO.getActivityTypeId());
         activityDTO.setDescription(activityCodeCreationDTO.getDescription());
         activityDTO.setExecuteDate(activityCodeCreationDTO.getExecuteDate());
-        activityDTO.setCropId(activityCodeCreationDTO.getTbCropId());
+        activityDTO.setCropId(tbCropId);
         activityDTO.setCreatedDate(Instant.now());
         TBActivityDTO result = tBActivityService.save(activityDTO);
         return ResponseEntity.created(new URI("/tb-codes/create/activity" + result.getId()))