Commit 80aed22b authored by Vijay Akula's avatar Vijay Akula

Provided the account name in domains json response

parent 7d429dda
package com.nisum.myteam.model.vo;
import lombok.*;
import java.util.HashMap;
import java.util.List;
@Setter
@Getter
@NoArgsConstructor
@AllArgsConstructor
@ToString
public class DomainVO {
private String Id;
private String domainId;
private String domainName;
private String accountId;
private String accountName;
private String status;
private List<HashMap<String,String>> deliveryManagers;
}
......@@ -3,6 +3,7 @@ package com.nisum.myteam.service;
import java.util.List;
import java.util.Set;
import com.nisum.myteam.model.vo.DomainVO;
import org.springframework.stereotype.Service;
import com.mongodb.WriteResult;
......@@ -26,15 +27,13 @@ public interface IDomainService {
WriteResult delete(String id) throws MyTeamException;
List<Domain> getDomainsList() throws MyTeamException;
List<DomainVO> getDomainsList() throws MyTeamException;
Set<String> accountsAssignedToDeliveryLead(String empId) throws MyTeamException;
List<Domain> getDomainsUnderAccount(String accountId)throws MyTeamException;
Domain getDomainById(String domainId);
}
package com.nisum.myteam.service.impl;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import com.mongodb.WriteResult;
import com.nisum.myteam.exception.handler.MyTeamException;
import com.nisum.myteam.model.dao.Domain;
import com.nisum.myteam.model.dao.Employee;
import com.nisum.myteam.model.vo.DomainVO;
import com.nisum.myteam.repository.DomainRepo;
import com.nisum.myteam.service.IAccountService;
import com.nisum.myteam.service.IDomainService;
import com.nisum.myteam.service.IEmployeeRoleService;
import com.nisum.myteam.service.IRoleService;
import com.nisum.myteam.utils.CommomUtil;
import com.nisum.myteam.utils.MyTeamUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.*;
/**
* @author Vijay
......@@ -48,7 +43,9 @@ public class DomainService implements IDomainService {
@Autowired
private IEmployeeRoleService roleMappingService;
@Autowired
private IAccountService accountService;
public boolean isDomainExists(Domain domainReq) {
boolean isDomainExists = false;
......@@ -140,13 +137,25 @@ public class DomainService implements IDomainService {
}
@Override
public List<Domain> getDomainsList() throws MyTeamException {
List<Domain> domainsPersistedList = domainRepo.findAll();
for (Domain domainPersisted : domainsPersistedList) {
domainPersisted.setDeliveryManagers(prepareEmployeeList(domainPersisted));
public List<DomainVO> getDomainsList() throws MyTeamException {
List<DomainVO> domainVOS = new ArrayList<>();
for (Domain domainPersisted : domainRepo.findAll()) {
DomainVO domainVO = new DomainVO();
domainVO.setId(domainPersisted.getId().toString());
domainVO.setAccountId(domainPersisted.getAccountId());
domainVO.setAccountName(accountService.getAccountById(domainPersisted.getAccountId()).getAccountName());
domainVO.setDomainId(domainPersisted.getDomainId());
domainVO.setDomainName(domainPersisted.getDomainName());
domainVO.setStatus(domainPersisted.getStatus());
domainVO.setDeliveryManagers(prepareEmployeeList(domainPersisted));
domainVOS.add(domainVO);
}
return domainsPersistedList;
return domainVOS;
}
@Override
......
package com.nisum.myteam.statuscodes;
public enum AccountStatus {
CREATE(600, "Account has been created"),
UPDATE(601, "Account has been updated"),
DELETE(602, "Account has been deleted successfully"),
GET_ACCOUNTS(603, "Retrieved the accounts successfully"),
GET_ACCOUNT(604, "Retrieved the account successfully"),
GET_ACCOUNT_NAMES(605, "Retrieved the account names successfully"),
ALREADY_EXISTED(606, "An Account is already existed"),
NOT_FOUND(607, "Account is Not found"),
NOT_VALID_ID(608, "AccountId is not valid");
private int code;
private String message;
private String description;
private AccountStatus(int code, String message) {
this.code = code;
this.message = message;
}
public int getCode() {
return this.code;
}
public String getMessage() {
return this.message;
}
}
\ No newline at end of file
package com.nisum.myteam.statuscodes;
public class BillingStatus {
}
package com.nisum.myteam.statuscodes;
public enum DomainStatus {
CREATE(600, "Account has been created"),
UPDATE(601, "Account has been updated");
private int code;
private String message;
private DomainStatus(int code, String message) {
this.code = code;
this.message = message;
}
public int getCode() {
return this.code;
}
public String getMessage() {
return this.message;
}
}
package com.nisum.myteam.statuscodes;
public enum EmployeeStatus {
}
package com.nisum.myteam.statuscodes;
public class ProjectStatus {
}
package com.nisum.myteam.statuscodes;
public class ResourceStatus {
}
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