mystatus - integration

build.gradle

 defaultTasks = ['clean','build']
 buildscript {
 	ext {
-		springBootVersion = '2.2.4.RELEASE'
+		springBootVersion = '1.5.10.RELEASE'
 	}
 	repositories {
 		mavenCentral()
@@ -11,12 +11,6 @@ buildscript {
 		classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2"
 	}
 }
-plugins {
-	id 'org.springframework.boot' version '2.2.4.RELEASE'
-	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
-	id 'java'
-}
-
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'org.springframework.boot'
@@ -27,19 +21,15 @@ test {
 }
 war {
 	dependsOn test
-    baseName = 'myTeam'
-    version = ''
+	baseName = 'myTeam'
+	version = ''
 }
-
 group = 'com.nisum.mytime'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = 1.8
-
 repositories {
 	mavenCentral()
 }
-
-
 dependencies {
 	compile('org.springframework.boot:spring-boot-starter-actuator')
 	compile('org.springframework.data:spring-data-mongodb')
@@ -56,12 +46,11 @@ dependencies {
 	compile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version:'1.5.8.RELEASE'
 	testCompile ('junit:junit:4.12')
 	compile('net.sf.ucanaccess:ucanaccess:4.0.1')
-	testCompile('org.hsqldb:hsqldb')
 	compile('com.healthmarketscience.jackcess:jackcess')
 	compile('commons-logging:commons-logging')
 	compile('commons-lang:commons-lang')
 	compile('com.jcraft:jsch:0.1.46')
-	//compile('com.itextpdf:itextpdf:5.0.6')
+// compile('com.itextpdf:itextpdf:5.0.6')
 	compile('jcifs:jcifs:1.3.17')
 	compile('javax.servlet:servlet-api')
 	compile('com.github.ozlerhakan:poiji:1.11')
@@ -69,18 +58,14 @@ dependencies {
 	compile('org.springframework.boot:spring-boot-starter-web')
 	compile('io.springfox:springfox-swagger2:2.7.0')
 	compile('io.springfox:springfox-swagger-ui:2.7.0')
-
 	compile group: 'org.thymeleaf', name: 'thymeleaf-spring4', version: '2.1.5.RELEASE'
 	compile group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect', version: '1.4.0'
-
 	compile group: 'org.springframework.boot', name: 'spring-boot-devtools'
-	
-	compile 'com.itextpdf:itextg:5.5.10'
-  	compile group: 'org.apache.poi', name: 'poi', version: '4.0.1'
-  	compile group: 'org.apache.poi', name: 'poi-ooxml', version: '4.0.1'
-  	compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.0'
-  	compile group: 'commons-io', name: 'commons-io', version: '2.6'
-  	compile group: 'com.itextpdf', name: 'itext7-core', version: '7.1.10', ext: 'pom'
-  	implementation 'com.itextpdf:itext7-core:7.1.8'
-
+	compile ('com.itextpdf:itextg:5.5.10')
+	compile group: 'org.apache.poi', name: 'poi', version: '4.0.1'
+	compile group: 'org.apache.poi', name: 'poi-ooxml', version: '4.0.1'
+	compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.0'
+	compile group: 'commons-io', name: 'commons-io', version: '2.6'
+	compile group: 'com.itextpdf', name: 'itext7-core', version: '7.1.10', ext: 'pom'
+	implementation 'com.itextpdf:itext7-core:7.1.8'
 }

src/main/java/com/nisum/myteam/MyTeamApplication.java

@@ -14,7 +14,7 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 
 @SpringBootApplication
-@EnableMongoRepositories(basePackages = { "com.nisum.myteam.repository" })
+@EnableMongoRepositories(basePackages = { "com.nisum.myteam.repository", "com.nisum.myteam.status.repository" })
 public class MyTeamApplication extends SpringBootServletInitializer {
 
 	@Override

src/main/java/com/nisum/myteam/status/controller/StatusResource.java → src/main/java/com/nisum/myteam/controller/StatusResource.java

-package com.nisum.myteam.status.controller;
+package com.nisum.myteam.controller;
 
 
+import com.nisum.myteam.status.fileexport.GenerateExcelReport;
+import com.nisum.myteam.status.fileexport.GeneratePdfReport;
+import com.nisum.myteam.status.model.FromToDates;
+import com.nisum.myteam.status.model.Status;
+import com.nisum.myteam.status.model.StatusResponse;
+import com.nisum.myteam.status.service.StatusService;
 import org.apache.commons.compress.utils.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -12,13 +18,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import com.nisum.myteam.status.fileexport.GenerateExcelReport;
-import com.nisum.myteam.status.fileexport.GeneratePdfReport;
-import com.nisum.myteam.status.model.FromToDates;
-import com.nisum.myteam.status.model.Status;
-import com.nisum.myteam.status.model.StatusResponse;
-import com.nisum.myteam.status.service.StatusService;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -26,8 +25,7 @@ import java.time.LocalDate;
 import java.util.List;
 
 @RestController
-@RequestMapping("/mystatus")
-@CrossOrigin("*")
+//@RequestMapping("/mystatus")
 public class StatusResource {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(StatusResource.class);
@@ -40,7 +38,9 @@ public class StatusResource {
    * @param status
    * @return
    */
-  @PostMapping("/saveStatusDetails")
+  //@PostMapping("/saveStatusDetails")
+  @RequestMapping(value = "/saveStatusDetails", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+
   public StatusResponse saveStatusDetails(@RequestBody Status status) {
     Status saveResponse = null;
     LOGGER.info("Creating the employee status for taskType: " + status.getTaskType());

src/main/java/com/nisum/myteam/status/model/Status.java

@@ -4,6 +4,7 @@ import lombok.*;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.mapping.Document;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 

src/main/java/com/nisum/myteam/status/repository/StatusRepository.java

@@ -2,11 +2,17 @@ package com.nisum.myteam.status.repository;
 
 
 import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.stereotype.Repository;
 
 import com.nisum.myteam.status.model.Status;
+import org.springframework.stereotype.Repository;
 
-@Repository
+import java.util.Optional;
+
+//@Repository
 public interface StatusRepository extends MongoRepository<Status, Integer> {
 
+    public Optional<Status> findById(Integer id);
+    public Boolean existsById(Integer id);
+    public void deleteById(Integer id);
+
 }

src/main/java/com/nisum/myteam/status/repository/StatusRepositoryImpl.java

@@ -37,7 +37,7 @@ public class StatusRepositoryImpl{
           Criteria.where("taskDate").gte(fromDate),
           Criteria.where("taskDate").lte(toDate))
       );
-      query.with(Sort.by(Sort.Order.desc("taskDate")));
+      //query.with(Sort.by(Sort.Order.desc("taskDate")));
       return mongoTemplate.find(query, Status.class);
     }
     catch(Exception e){
@@ -50,7 +50,8 @@ public class StatusRepositoryImpl{
     try{
       Query query = new Query().addCriteria(Criteria.where("empId").is(empId)
       );
-      query.with(Sort.by(Sort.Order.desc("taskDate"))).limit(20);
+      query.limit(20);
+      //query.with(Sort.by(Sort.Order.desc("taskDate"))).limit(20);
       return mongoTemplate.find(query, Status.class);
     }
     catch(Exception e){

src/main/java/com/nisum/myteam/status/service/StatusServiceImpl.java

@@ -6,7 +6,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.status.controller.StatusResource;
 import com.nisum.myteam.status.exceptions.EmployeeNotFoundException;
 import com.nisum.myteam.status.model.Status;
 import com.nisum.myteam.status.repository.StatusRepository;