Commit 6d94ee50 authored by Vijay Akula's avatar Vijay Akula

Added status codes for projects

parent 1bb325c8
......@@ -136,13 +136,13 @@ public class ProjectController {
projects = projectService.getRoleBasedProjects(employeeId);
ResponseDetails getRespDetails = new ResponseDetails(new Date(), 604, "Retrieved the projects successfully",
ResponseDetails getRespDetails = new ResponseDetails(new Date(), ProjectStatus.GET_PROJECTS.getCode(), ProjectStatus.GET_PROJECTS.getMessage(),
"Projects list", projects, request.getRequestURI(), "Project details", null);
return new ResponseEntity<ResponseDetails>(getRespDetails, HttpStatus.OK);
} else {
projects = projectService.getProjectsInsteadOfRole();
ResponseDetails getRespDetails = new ResponseDetails(new Date(), 604, "Retrieved the projects successfully",
ResponseDetails getRespDetails = new ResponseDetails(new Date(), ProjectStatus.GET_PROJECTS.getCode(), ProjectStatus.GET_PROJECTS.getMessage(),
"Projects list", projects, request.getRequestURI(), "Project details", null);
return new ResponseEntity<ResponseDetails>(getRespDetails, HttpStatus.OK);
......@@ -156,7 +156,7 @@ public class ProjectController {
}
ResponseDetails getRespDetails = new ResponseDetails(new Date(), 606, "Please Provide valid employee id",
ResponseDetails getRespDetails = new ResponseDetails(new Date(), ProjectStatus.EMPLOYEE_NOT_EXISTS.getCode(), ProjectStatus.EMPLOYEE_NOT_EXISTS.getMessage(),
"Projects list", null, request.getRequestURI(), "Project details", null);
return new ResponseEntity<ResponseDetails>(getRespDetails, HttpStatus.OK);
......@@ -170,20 +170,17 @@ public class ProjectController {
if (deliveryLeadId != null && !"".equalsIgnoreCase(deliveryLeadId)) {
ResponseDetails getRespDetails = new ResponseDetails(new Date(), 604, "Retrieved the projects successfully",
ResponseDetails getRespDetails = new ResponseDetails(new Date(), ProjectStatus.GET_PROJECTS.getCode(), ProjectStatus.GET_PROJECTS.getMessage(),
"Projects list under delivery lead", projectService.getProjectsUnderDeliveryLead(deliveryLeadId), request.getRequestURI(), "Project details", null);
return new ResponseEntity<ResponseDetails>(getRespDetails, HttpStatus.OK);
}
ResponseDetails getRespDetails = new ResponseDetails(new Date(), 606, "Please Provide valid Delivery lead id",
ResponseDetails getRespDetails = new ResponseDetails(new Date(), ProjectStatus.DELIVERYLEAD_NOT_EXISTS.getCode(), ProjectStatus.DELIVERYLEAD_NOT_EXISTS.getMessage(),
"Projects list under delivery lead", null, request.getRequestURI(), "Project details", null);
return new ResponseEntity<ResponseDetails>(getRespDetails, HttpStatus.OK);
}
}
package com.nisum.myteam.model.dao;
import java.io.Serializable;
import java.util.Date;
import com.nisum.myteam.model.AuditFields;
import org.bson.types.ObjectId;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.format.annotation.DateTimeFormat.ISO;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Setter
@Getter
@AllArgsConstructor
@NoArgsConstructor
@ToString
@Document(collection = "resources")
public class Resource extends AuditFields implements Serializable {
private static final long serialVersionUID = 1L;
@Id
private ObjectId id;
private String employeeId;
private String employeeName;
private String emailId;
private String role;
private String shift;
private String projectId;
private String projectName;
private String account;
private String experience;
private String designation;
private String billableStatus;
private String mobileNumber;
@DateTimeFormat(iso = ISO.DATE)
private Date startDate;
@DateTimeFormat(iso = ISO.DATE)
private Date endDate;
@DateTimeFormat(iso = ISO.DATE)
private Date newBillingStartDate;
private boolean active;
private String accountId;
private String domainId;
}
//package com.nisum.myteam.model.dao;
//
//import java.io.Serializable;
//import java.util.Date;
//
//import com.nisum.myteam.model.AuditFields;
//import org.bson.types.ObjectId;
//import org.springframework.data.annotation.Id;
//import org.springframework.data.mongodb.core.mapping.Document;
//import org.springframework.format.annotation.DateTimeFormat;
//import org.springframework.format.annotation.DateTimeFormat.ISO;
//
//import lombok.AllArgsConstructor;
//import lombok.Getter;
//import lombok.NoArgsConstructor;
//import lombok.Setter;
//import lombok.ToString;
//
//@Setter
//@Getter
//@AllArgsConstructor
//@NoArgsConstructor
//@ToString
//@Document(collection = "resources")
//public class Resource extends AuditFields implements Serializable {
//
// private static final long serialVersionUID = 1L;
//
// @Id
// private ObjectId id;
// private String employeeId;
// private String employeeName;
// private String emailId;
// private String role;
// private String shift;
// private String projectId;
// private String projectName;
// private String account;
// private String experience;
// private String designation;
// private String billableStatus;
// private String mobileNumber;
// @DateTimeFormat(iso = ISO.DATE)
// private Date startDate;
// @DateTimeFormat(iso = ISO.DATE)
// private Date endDate;
// @DateTimeFormat(iso = ISO.DATE)
// private Date newBillingStartDate;
// private boolean active;
//
// private String accountId;
// private String domainId;
//}
......@@ -27,7 +27,6 @@ public class ResourceAllocation extends AuditFields implements Serializable {
private String employeeId;
private String projectId;
//private String projectName;
@DateTimeFormat(iso = ISO.DATE)
private String billableStatus;
......@@ -39,8 +38,6 @@ public class ResourceAllocation extends AuditFields implements Serializable {
@DateTimeFormat(iso = ISO.DATE, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX")
private Date billingEndDate;
// private boolean active;
private String resourceRole;
}
......@@ -29,6 +29,6 @@ public class MyProjectAllocationVO {
private String shift;
private String resourceStatus;
private List<HashMap<String, String>> deliverLeadIds;
private List<HashMap<String, String>> deliveryLeadIds;
}
......@@ -303,7 +303,7 @@ public class ResourceAllocationService implements IResourceAllocationService {
}
if (project.getDeliveryLeadIds() != null) {
myProject.setDeliverLeadIds(employeeService.getDeliveryManagerMap(project.getDeliveryLeadIds()));
myProject.setDeliveryLeadIds(employeeService.getDeliveryManagerMap(project.getDeliveryLeadIds()));
}
myProjectList.add(myProject);
}
......
......@@ -8,8 +8,11 @@ public enum ProjectStatus {
ALREADY_EXISTED(703, "Project is already existed"),
PROJECTID_IS_NOT_EXISTS(704,"Project Id is not existed"),
PROJECT_NAME_IS_NOT_EXISTS(705,"Project is not existed"),
IS_NOT_FOUND(706, "Domain is Not found"),
GET_DOMIAINS(707, "Retrieved the domains successfully");
IS_NOT_FOUND(706, "Project is Not found"),
GET_PROJECTS(707, "Retrieved the projects successfully"),
EMPLOYEE_NOT_EXISTS(708,"Please Provide valid employee id"),
DELIVERYLEAD_NOT_EXISTS(709,"Please Provide valid Delivery lead id");
private int code;
private String message;
......
package com.nisum.myteam.statuscodes;
public enum ResourceCodes {
CREATE(800,"");
private int code;
private String message;
private ResourceCodes(int code,String message){
this.code=code;
this.message=message;
}
public int getCode()
{
return this.code;
}
public String getMessage()
{
return this.message;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment