Complete-API

src/main/java/vn/azteam/tpf/domain/TBCodeDetails.java

@@ -25,7 +25,7 @@ public class    TBCodeDetails implements Serializable {
     @Column(name = "tb_code_id", insertable = false, updatable = false)
     private Long tbCodeId;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.EAGER)
     @JsonIgnoreProperties("")
     @JsonIgnore
     @JoinColumn(name = "tb_code_id")

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

@@ -132,9 +132,10 @@ public class TBCodeDetailsImpl implements TBCodeDetailsService {
         Pageable pageable,
         Boolean isRequestedFromWeb) {
 //        Optional<TBCropDTO> tBCropDTO = tBCropService.findOne(id);
-        if (!userRoleUtil.currentUserHasPermissionByCropId(tBCropDTO.getId())) {
-            throw new BadRequestAlertException("1018", ENTITY_NAME, "1018");
-        }
+
+//        if (!userRoleUtil.currentUserHasPermissionByCropId(tBCropDTO.getId())) {
+//            throw new BadRequestAlertException("1018", ENTITY_NAME, "1018");
+//        }
         Optional<UserDTO> currentUser = userService.getCurrentUserDTO();
         TBCodeDetailsAndActivityDTO tbCodeDetailsAndActivityDTO = new TBCodeDetailsAndActivityDTO();
         tbCodeDetailsAndActivityDTO.setTbCropDTO(tBCropDTO);

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

@@ -82,8 +82,8 @@ public class TBCodeResource {
 
         //Authorize get list crop by customer of current user
         List<TBCodeDTO> result = page.getContent().stream()
-            .filter(item -> userRoleUtil.currentUserHasPermissionByCustomerId(item.getTbCrop().getId())
-                && userRoleUtil.currentUserHasPermissionByCropId(item.getTbCrop().getId()))
+//            .filter(item -> userRoleUtil.currentUserHasPermissionByCustomerId(item.getTbCrop().getId())
+//                && userRoleUtil.currentUserHasPermissionByCropId(item.getTbCrop().getId()))
             .sorted(Comparator.comparing(
                 TBCodeDTO::getCreatedDate,
                 Comparator.nullsFirst(Comparator.naturalOrder())).reversed())
@@ -107,8 +107,8 @@ public class TBCodeResource {
 
         //Authorize get list crop by customer of current user
         List<TBCodeDTO> result = page.getContent().stream()
-            .filter(item -> userRoleUtil.currentUserHasPermissionByCustomerId(item.getTbCrop().getId())
-                && userRoleUtil.currentUserHasPermissionByCropId(item.getTbCrop().getId()))
+//            .filter(item -> userRoleUtil.currentUserHasPermissionByCustomerId(item.getTbCrop().getId())
+//                && userRoleUtil.currentUserHasPermissionByCropId(item.getTbCrop().getId()))
             .sorted(Comparator.comparing(
                 TBCodeDTO::getCreatedDate,
                 Comparator.nullsFirst(Comparator.naturalOrder())).reversed())
@@ -208,7 +208,8 @@ public class TBCodeResource {
     @PostMapping("/tb-codes/create/activity")
     @Timed
     public ResponseEntity<TBActivityDTO> createActivityForTBCode(@RequestBody ActivityCodeCreationDTO
-                                                                     activityCodeCreationDTO) throws IOException {
+                                                                     activityCodeCreationDTO)
+        throws URISyntaxException {
 
         log.debug("REST request to save TBActivityDTO : {}", activityCodeCreationDTO);
         //Set created by to current user login
@@ -241,8 +242,8 @@ public class TBCodeResource {
         activityDTO.setCropId(activityCodeCreationDTO.getTbCropId());
         activityDTO.setCreatedDate(Instant.now());
         TBActivityDTO result = tBActivityService.save(activityDTO);
-        return ResponseEntity.badRequest()
-            .headers(HeaderUtil.createEntityUpdateAlert("TBActivity", "Created activity success!"))
+        return ResponseEntity.created(new URI("/tb-codes/create/activity" + result.getId()))
+            .headers(HeaderUtil.createEntityCreationAlert("TBActivity", result.getId().toString()))
             .body(result);
     }