Commit a5d233b1 authored by Rajeshekar's avatar Rajeshekar

Update project domain and domain id not getting saved

parent 4de4661a
...@@ -197,6 +197,8 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -197,6 +197,8 @@ public class ProjectServiceImpl implements ProjectService {
* else{ * else{
* update.set("managerIds",Arrays.asList(project.getManagerId())); } * update.set("managerIds",Arrays.asList(project.getManagerId())); }
*/ */
update.set("domain", project.getDomain());
update.set("domainId", project.getDomainId());
update.set("accountId", project.getAccountId()); update.set("accountId", project.getAccountId());
update.set("status", project.getStatus()); update.set("status", project.getStatus());
FindAndModifyOptions options = new FindAndModifyOptions(); FindAndModifyOptions options = new FindAndModifyOptions();
...@@ -369,12 +371,12 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -369,12 +371,12 @@ public class ProjectServiceImpl implements ProjectService {
billings.setProjectName(projectTeamMate.getProjectName()); billings.setProjectName(projectTeamMate.getProjectName());
billings.setBillableStatus(projectTeamMate.getBillableStatus()); billings.setBillableStatus(projectTeamMate.getBillableStatus());
billings.setActive(true); billings.setActive(true);
//TODO // TODO
Date d = projectTeamMate.getNewBillingStartDate(); Date d = projectTeamMate.getNewBillingStartDate();
d.setDate(d.getDate() + 1); d.setDate(d.getDate() + 1);
billings.setBillingStartDate(DateUtils.truncate( billings.setBillingStartDate(DateUtils.truncate(d, Calendar.DATE));
d, Calendar.DATE)); existingTeammate.setNewBillingStartDate(
existingTeammate.setNewBillingStartDate(DateUtils.truncate(d, Calendar.DATE)); DateUtils.truncate(d, Calendar.DATE));
billings.setBillingEndDate(DateUtils billings.setBillingEndDate(DateUtils
.truncate(projectTeamMate.getEndDate(), Calendar.DATE)); .truncate(projectTeamMate.getEndDate(), Calendar.DATE));
billings.setCreateDate(new Date()); billings.setCreateDate(new Date());
...@@ -467,18 +469,20 @@ public class ProjectServiceImpl implements ProjectService { ...@@ -467,18 +469,20 @@ public class ProjectServiceImpl implements ProjectService {
@Override @Override
public List<Project> getProjects(String managerId) throws MyTimeException { public List<Project> getProjects(String managerId) throws MyTimeException {
/* Query query = new Query(Criteria.where("managerId").is(managerId) /*
.and("status").ne("Completed")); * Query query = new Query(Criteria.where("managerId").is(managerId)
return mongoTemplate.find(query, Project.class);*/ * .and("status").ne("Completed")); return mongoTemplate.find(query,
List<Project> projectList = new ArrayList<>(); * Project.class);
List<Project> projects = projectRepo.findByDeliveryLeadIds(managerId); */
for (Project project : projects) { List<Project> projectList = new ArrayList<>();
if (!project.getStatus().equals("Completed")) { List<Project> projects = projectRepo.findByDeliveryLeadIds(managerId);
projectList.add(project); for (Project project : projects) {
} if (!project.getStatus().equals("Completed")) {
projectList.add(project);
} }
return projectList;
}
return projectList;
} }
@Override @Override
......
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