Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mytime
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Narendar Vakiti
mytime
Commits
80aed22b
Commit
80aed22b
authored
May 06, 2019
by
Vijay Akula
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Provided the account name in domains json response
parent
7d429dda
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
223 additions
and
123 deletions
+223
-123
AccountController.java
...n/java/com/nisum/myteam/controller/AccountController.java
+88
-97
DomainVO.java
src/main/java/com/nisum/myteam/model/vo/DomainVO.java
+30
-0
IDomainService.java
src/main/java/com/nisum/myteam/service/IDomainService.java
+3
-4
DomainService.java
...ain/java/com/nisum/myteam/service/impl/DomainService.java
+31
-22
AccountStatus.java
...main/java/com/nisum/myteam/statuscodes/AccountStatus.java
+33
-0
BillingStatus.java
...main/java/com/nisum/myteam/statuscodes/BillingStatus.java
+4
-0
DomainStatus.java
src/main/java/com/nisum/myteam/statuscodes/DomainStatus.java
+22
-0
EmployeeStatus.java
...ain/java/com/nisum/myteam/statuscodes/EmployeeStatus.java
+4
-0
ProjectStatus.java
...main/java/com/nisum/myteam/statuscodes/ProjectStatus.java
+4
-0
ResourceStatus.java
...ain/java/com/nisum/myteam/statuscodes/ResourceStatus.java
+4
-0
No files found.
src/main/java/com/nisum/myteam/controller/AccountController.java
View file @
80aed22b
This diff is collapsed.
Click to expand it.
src/main/java/com/nisum/myteam/model/vo/DomainVO.java
0 → 100644
View file @
80aed22b
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
;
}
src/main/java/com/nisum/myteam/service/IDomainService.java
View file @
80aed22b
...
@@ -3,6 +3,7 @@ package com.nisum.myteam.service;
...
@@ -3,6 +3,7 @@ package com.nisum.myteam.service;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
import
com.nisum.myteam.model.vo.DomainVO
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
com.mongodb.WriteResult
;
import
com.mongodb.WriteResult
;
...
@@ -26,15 +27,13 @@ public interface IDomainService {
...
@@ -26,15 +27,13 @@ public interface IDomainService {
WriteResult
delete
(
String
id
)
throws
MyTeamException
;
WriteResult
delete
(
String
id
)
throws
MyTeamException
;
List
<
Domain
>
getDomainsList
()
throws
MyTeamException
;
List
<
Domain
VO
>
getDomainsList
()
throws
MyTeamException
;
Set
<
String
>
accountsAssignedToDeliveryLead
(
String
empId
)
throws
MyTeamException
;
Set
<
String
>
accountsAssignedToDeliveryLead
(
String
empId
)
throws
MyTeamException
;
List
<
Domain
>
getDomainsUnderAccount
(
String
accountId
)
throws
MyTeamException
;
List
<
Domain
>
getDomainsUnderAccount
(
String
accountId
)
throws
MyTeamException
;
Domain
getDomainById
(
String
domainId
);
Domain
getDomainById
(
String
domainId
);
}
}
src/main/java/com/nisum/myteam/service/impl/DomainService.java
View file @
80aed22b
package
com
.
nisum
.
myteam
.
service
.
impl
;
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.mongodb.WriteResult
;
import
com.nisum.myteam.exception.handler.MyTeamException
;
import
com.nisum.myteam.exception.handler.MyTeamException
;
import
com.nisum.myteam.model.dao.Domain
;
import
com.nisum.myteam.model.dao.Domain
;
import
com.nisum.myteam.model.dao.Employee
;
import
com.nisum.myteam.model.dao.Employee
;
import
com.nisum.myteam.model.vo.DomainVO
;
import
com.nisum.myteam.repository.DomainRepo
;
import
com.nisum.myteam.repository.DomainRepo
;
import
com.nisum.myteam.service.IAccountService
;
import
com.nisum.myteam.service.IDomainService
;
import
com.nisum.myteam.service.IDomainService
;
import
com.nisum.myteam.service.IEmployeeRoleService
;
import
com.nisum.myteam.service.IEmployeeRoleService
;
import
com.nisum.myteam.service.IRoleService
;
import
com.nisum.myteam.service.IRoleService
;
import
com.nisum.myteam.utils.CommomUtil
;
import
com.nisum.myteam.utils.CommomUtil
;
import
com.nisum.myteam.utils.MyTeamUtils
;
import
com.nisum.myteam.utils.MyTeamUtils
;
import
lombok.extern.slf4j.Slf4j
;
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
* @author Vijay
...
@@ -48,7 +43,9 @@ public class DomainService implements IDomainService {
...
@@ -48,7 +43,9 @@ public class DomainService implements IDomainService {
@Autowired
@Autowired
private
IEmployeeRoleService
roleMappingService
;
private
IEmployeeRoleService
roleMappingService
;
@Autowired
private
IAccountService
accountService
;
public
boolean
isDomainExists
(
Domain
domainReq
)
{
public
boolean
isDomainExists
(
Domain
domainReq
)
{
boolean
isDomainExists
=
false
;
boolean
isDomainExists
=
false
;
...
@@ -140,13 +137,25 @@ public class DomainService implements IDomainService {
...
@@ -140,13 +137,25 @@ public class DomainService implements IDomainService {
}
}
@Override
@Override
public
List
<
Domain
>
getDomainsList
()
throws
MyTeamException
{
public
List
<
DomainVO
>
getDomainsList
()
throws
MyTeamException
{
List
<
Domain
>
domainsPersistedList
=
domainRepo
.
findAll
();
for
(
Domain
domainPersisted
:
domainsPersistedList
)
{
List
<
DomainVO
>
domainVOS
=
new
ArrayList
<>();
domainPersisted
.
setDeliveryManagers
(
prepareEmployeeList
(
domainPersisted
));
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
domain
sPersistedList
;
return
domain
VOS
;
}
}
@Override
@Override
...
...
src/main/java/com/nisum/myteam/statuscodes/AccountStatus.java
0 → 100644
View file @
80aed22b
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
src/main/java/com/nisum/myteam/statuscodes/BillingStatus.java
0 → 100644
View file @
80aed22b
package
com
.
nisum
.
myteam
.
statuscodes
;
public
class
BillingStatus
{
}
src/main/java/com/nisum/myteam/statuscodes/DomainStatus.java
0 → 100644
View file @
80aed22b
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
;
}
}
src/main/java/com/nisum/myteam/statuscodes/EmployeeStatus.java
0 → 100644
View file @
80aed22b
package
com
.
nisum
.
myteam
.
statuscodes
;
public
enum
EmployeeStatus
{
}
src/main/java/com/nisum/myteam/statuscodes/ProjectStatus.java
0 → 100644
View file @
80aed22b
package
com
.
nisum
.
myteam
.
statuscodes
;
public
class
ProjectStatus
{
}
src/main/java/com/nisum/myteam/statuscodes/ResourceStatus.java
0 → 100644
View file @
80aed22b
package
com
.
nisum
.
myteam
.
statuscodes
;
public
class
ResourceStatus
{
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment