Feature competency test

src/main/java/org/sunbird/common/util/ProjectUtil.java

@@ -1,12 +1,10 @@
 package org.sunbird.common.util;
 
 import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
+import java.util.*;
 
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.DateTime;
@@ -21,6 +19,8 @@
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import static java.lang.Long.parseLong;
+
 /**
  * This class will contains all the common utility methods.
  *

src/main/java/org/sunbird/passbook/competency/model/CompetencyInfo.java

@@ -5,35 +5,35 @@
 import java.util.Map;
 
 public class CompetencyInfo {
-	private String competencyId;
-	private Map<String, String> additionalParams;
-	private List<Map<String, Object>> acquiredDetails = new ArrayList<Map<String, Object>>();
+    private String competencyId;
+    private Map<String, String> additionalParams;
+    private List<Map<String, Object>> acquiredDetails = new ArrayList<Map<String, Object>>();
 
-	public CompetencyInfo(String competencyId) {
-		this.competencyId = competencyId;
-	}
+    public CompetencyInfo(String competencyId) {
+        this.competencyId = competencyId;
+    }
 
-	public String getCompetencyId() {
-		return competencyId;
-	}
+    public String getCompetencyId() {
+        return competencyId;
+    }
 
-	public void setCompetencyId(String competencyId) {
-		this.competencyId = competencyId;
-	}
+    public void setCompetencyId(String competencyId) {
+        this.competencyId = competencyId;
+    }
 
-	public Map<String, String> getAdditionalParams() {
-		return additionalParams;
-	}
+    public Map<String, String> getAdditionalParams() {
+        return additionalParams;
+    }
 
-	public void setAdditionalParams(Map<String, String> additionalParams) {
-		this.additionalParams = additionalParams;
-	}
+    public void setAdditionalParams(Map<String, String> additionalParams) {
+        this.additionalParams = additionalParams;
+    }
 
-	public List<Map<String, Object>> getAcquiredDetails() {
-		return acquiredDetails;
-	}
+    public List<Map<String, Object>> getAcquiredDetails() {
+        return acquiredDetails;
+    }
 
-	public void setAcquiredDetails(List<Map<String, Object>> acquiredDetails) {
-		this.acquiredDetails = acquiredDetails;
-	}
+    public void setAcquiredDetails(List<Map<String, Object>> acquiredDetails) {
+        this.acquiredDetails = acquiredDetails;
+    }
 }

src/main/java/org/sunbird/passbook/competency/model/CompetencyPassbookInfo.java

@@ -6,35 +6,35 @@
 import org.sunbird.common.util.Constants;
 
 public class CompetencyPassbookInfo {
-	private String userId;
-	private String typeName = Constants.COMPETENCY;
-	private Map<String, CompetencyInfo> competencies = new HashMap<String, CompetencyInfo>();
+    private String userId;
+    private String typeName = Constants.COMPETENCY;
+    private Map<String, CompetencyInfo> competencies = new HashMap<String, CompetencyInfo>();
 
-	public CompetencyPassbookInfo(String userId) {
-		this.userId = userId;
-	}
+    public CompetencyPassbookInfo(String userId) {
+        this.userId = userId;
+    }
 
-	public String getUserId() {
-		return userId;
-	}
+    public String getUserId() {
+        return userId;
+    }
 
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 
-	public String getTypeName() {
-		return typeName;
-	}
+    public String getTypeName() {
+        return typeName;
+    }
 
-	public void setTypeName(String typeName) {
-		this.typeName = typeName;
-	}
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
 
-	public Map<String, CompetencyInfo> getCompetencies() {
-		return competencies;
-	}
+    public Map<String, CompetencyInfo> getCompetencies() {
+        return competencies;
+    }
 
-	public void setCompetencies(Map<String, CompetencyInfo> competencies) {
-		this.competencies = competencies;
-	}
+    public void setCompetencies(Map<String, CompetencyInfo> competencies) {
+        this.competencies = competencies;
+    }
 }

src/main/java/org/sunbird/passbook/controller/PassbookController.java

@@ -15,34 +15,39 @@
 
 /**
  * Provides REST APIs for Passbook feature
- * 
- * @author karthik
  *
+ * @author karthik
  */
 @RestController
 public class PassbookController {
-	@Autowired
-	PassbookService passbookService;
+    @Autowired
+    PassbookService passbookService;
+
+    @PatchMapping("/user/v1/passbook")
+    public ResponseEntity<SBApiResponse> updatePassbook(@RequestHeader(Constants.X_AUTH_USER_ID) String requestedUserId,
+                                                        @RequestBody Map<String, Object> request) {
+        SBApiResponse response = passbookService.updatePassbook(requestedUserId, request);
+        return new ResponseEntity<>(response, response.getResponseCode());
+    }
 
-	@PatchMapping("/user/v1/passbook")
-	public ResponseEntity<SBApiResponse> updatePassbook(@RequestHeader(Constants.X_AUTH_USER_ID) String requestedUserId,
-			@RequestBody Map<String, Object> request) {
-		SBApiResponse response = passbookService.updatePassbook(requestedUserId, request);
-		return new ResponseEntity<>(response, response.getResponseCode());
-	}
+    @PostMapping("/user/v1/migrateData")
+    public ResponseEntity<SBApiResponse> migrateData() {
+        SBApiResponse response = passbookService.migrateData();
+        return new ResponseEntity<>(response, response.getResponseCode());
+    }
 
-	@PostMapping("/user/v1/passbook")
-	public ResponseEntity<SBApiResponse> getUserPassbook(
-			@RequestHeader(Constants.X_AUTH_USER_ID) String requestedUserId, @RequestBody Map<String, Object> request)
-			throws Exception {
-		SBApiResponse response = passbookService.getPassbook(requestedUserId, request);
-		return new ResponseEntity<>(response, response.getResponseCode());
-	}
+    @PostMapping("/user/v1/passbook")
+    public ResponseEntity<SBApiResponse> getUserPassbook(
+            @RequestHeader(Constants.X_AUTH_USER_ID) String requestedUserId, @RequestBody Map<String, Object> request)
+            throws Exception {
+        SBApiResponse response = passbookService.getPassbook(requestedUserId, request);
+        return new ResponseEntity<>(response, response.getResponseCode());
+    }
 
-	@PostMapping("/admin/user/v1/passbook")
-	public ResponseEntity<SBApiResponse> getU(@RequestHeader(Constants.X_AUTH_USER_ID) String requestedUserId,
-			@RequestBody Map<String, Object> request) throws Exception {
-		SBApiResponse response = passbookService.getPassbookByAdmin(requestedUserId, request);
-		return new ResponseEntity<>(response, response.getResponseCode());
-	}
+    @PostMapping("/admin/user/v1/passbook")
+    public ResponseEntity<SBApiResponse> getU(@RequestHeader(Constants.X_AUTH_USER_ID) String requestedUserId,
+                                              @RequestBody Map<String, Object> request) throws Exception {
+        SBApiResponse response = passbookService.getPassbookByAdmin(requestedUserId, request);
+        return new ResponseEntity<>(response, response.getResponseCode());
+    }
 }

src/main/java/org/sunbird/passbook/model/CompetencyPassbook.java

@@ -5,37 +5,36 @@
 
 /**
  * Competency Passbook Object for user representation
- * 
- * @author karthik
  *
+ * @author karthik
  */
 public class CompetencyPassbook {
-	private String competencyId;
-	private Map<String, String> additionalParam;
-	private List<Map<String, Object>> acquiredDetails;
+    private String competencyId;
+    private Map<String, String> additionalParam;
+    private List<Map<String, Object>> acquiredDetails;
 
-	public String getCompetencyId() {
-		return competencyId;
-	}
+    public String getCompetencyId() {
+        return competencyId;
+    }
 
-	public void setCompetencyId(String competencyId) {
-		this.competencyId = competencyId;
-	}
+    public void setCompetencyId(String competencyId) {
+        this.competencyId = competencyId;
+    }
 
-	public Map<String, String> getAdditionalParam() {
-		return additionalParam;
-	}
+    public Map<String, String> getAdditionalParam() {
+        return additionalParam;
+    }
 
-	public void setAdditionalParam(Map<String, String> additionalParam) {
-		this.additionalParam = additionalParam;
-	}
+    public void setAdditionalParam(Map<String, String> additionalParam) {
+        this.additionalParam = additionalParam;
+    }
 
-	public List<Map<String, Object>> getAcquiredDetails() {
-		return acquiredDetails;
-	}
+    public List<Map<String, Object>> getAcquiredDetails() {
+        return acquiredDetails;
+    }
 
-	public void setAcquiredDetails(List<Map<String, Object>> acquiredDetails) {
-		this.acquiredDetails = acquiredDetails;
-	}
+    public void setAcquiredDetails(List<Map<String, Object>> acquiredDetails) {
+        this.acquiredDetails = acquiredDetails;
+    }
 
 }