Merge remote-tracking branch 'origin/master'

src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java

@@ -996,12 +996,18 @@ public class CustomerServiceImpl implements CustomerService {
             //</editor-fold>
 
             //<editor-fold desc="Kiểm tra header của template" defaultstate="collapsed">
-            for (int i = 0; i < header.size(); i++) {
-                Cell cell = row.getCell(i);
-                if (!cell.getStringCellValue().equals(header.get(i).getTitle().split("#")[0])) {
-                    result.put("content", Files.readAllBytes(file.toPath()));
-                    result.put("message", "template-invalid");
-                    return result;
+            if (row.getPhysicalNumberOfCells() != header.size()) {
+                result.put("content", Files.readAllBytes(file.toPath()));
+                result.put("message", "template-invalid");
+                return result;
+            } else {
+                for (int i = 0; i < header.size(); i++) {
+                    Cell cell = row.getCell(i);
+                    if (!cell.getStringCellValue().equals(header.get(i).getTitle().split("#")[0])) {
+                        result.put("content", Files.readAllBytes(file.toPath()));
+                        result.put("message", "template-invalid");
+                        return result;
+                    }
                 }
             }
             //</editor-fold>

src/main/java/com/viettel/campaign/web/rest/CustomerController.java

@@ -198,19 +198,20 @@ public class CustomerController {
         try {
             UserSession userSession = (UserSession) RedisUtil.getInstance().get(request.getHeader("X-Auth-Token"));
             if (file.isEmpty()) {
-                return new ResponseEntity<>("file-empty", HttpStatus.OK);
+                return new ResponseEntity<>("file-empty", HttpStatus.BAD_REQUEST);
             }
-//            if (!Objects.equals(FilenameUtils.getExtension(file.getOriginalFilename()), Constants.FileType.xlsx)) {
-//                return new ResponseEntity<>("template-invalid", HttpStatus.OK);
-//            }
             String path = saveUploadFile(file);
             List<CustomizeFields> dynamicHeaders = customerService.getDynamicHeader(userSession.getCompanySiteId());
             Map<String, Object> map = customerService.readAndValidateCustomer(path, dynamicHeaders, userSession, Long.parseLong(customerListId));
             String message = (String) map.get("message");
             byte[] content = (byte[]) map.get("content");
-            return ResponseEntity.ok()
-                    .header("Message", message)
-                    .body(content);
+            if (message.equals("import-success")) {
+                return ResponseEntity.ok()
+                        .header("Message", message)
+                        .body(content);
+            } else {
+                return ResponseEntity.badRequest().header("Message", message).body(content);
+            }
         } catch (Exception e) {
             LOGGER.error(e.getMessage());
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);