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
e8f9ef32
Commit
e8f9ef32
authored
Jul 24, 2018
by
ssathu-nisum-com
Committed by
tdutta-nisum-com
Jul 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Account_Domains_DropDowns (#48)
parent
bfd0ed71
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
85 additions
and
2 deletions
+85
-2
UserController.java
...main/java/com/nisum/mytime/controller/UserController.java
+27
-0
DomainRepo.java
src/main/java/com/nisum/mytime/repository/DomainRepo.java
+4
-0
DomainServiceImpl.java
...main/java/com/nisum/mytime/service/DomainServiceImpl.java
+2
-2
UserService.java
src/main/java/com/nisum/mytime/service/UserService.java
+9
-0
UserServiceImpl.java
src/main/java/com/nisum/mytime/service/UserServiceImpl.java
+43
-0
No files found.
src/main/java/com/nisum/mytime/controller/UserController.java
View file @
e8f9ef32
package
com
.
nisum
.
mytime
.
controller
;
package
com
.
nisum
.
mytime
.
controller
;
import
java.util.Collection
;
import
java.util.Comparator
;
import
java.util.Comparator
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
...
@@ -18,7 +19,9 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -18,7 +19,9 @@ import org.springframework.web.bind.annotation.RestController;
import
com.nisum.mytime.exception.handler.MyTimeException
;
import
com.nisum.mytime.exception.handler.MyTimeException
;
import
com.nisum.mytime.model.Account
;
import
com.nisum.mytime.model.Account
;
import
com.nisum.mytime.model.AccountInfo
;
import
com.nisum.mytime.model.Designation
;
import
com.nisum.mytime.model.Designation
;
import
com.nisum.mytime.model.Domains
;
import
com.nisum.mytime.model.EmployeeLocationDetails
;
import
com.nisum.mytime.model.EmployeeLocationDetails
;
import
com.nisum.mytime.model.EmployeeRoles
;
import
com.nisum.mytime.model.EmployeeRoles
;
import
com.nisum.mytime.model.Location
;
import
com.nisum.mytime.model.Location
;
...
@@ -226,4 +229,28 @@ public class UserController {
...
@@ -226,4 +229,28 @@ public class UserController {
.
getEmployeesByStatus
(
status
);
.
getEmployeesByStatus
(
status
);
return
new
ResponseEntity
<>(
employeesRoles
,
HttpStatus
.
OK
);
return
new
ResponseEntity
<>(
employeesRoles
,
HttpStatus
.
OK
);
}
}
@RequestMapping
(
value
=
"/getDeliveryLeads"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
public
ResponseEntity
<
List
<
HashMap
<
String
,
String
>>>
getDeliveryLeads
(
@RequestParam
(
"domainId"
)
String
domainId
)
throws
MyTimeException
{
List
<
HashMap
<
String
,
String
>>
managers
=
userService
.
getDeliveryLeads
(
domainId
);
return
new
ResponseEntity
<>(
managers
,
HttpStatus
.
OK
);
}
@RequestMapping
(
value
=
"/getAccountsInfo"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
public
ResponseEntity
<
List
<
AccountInfo
>>
getAccountsInfo
()
throws
MyTimeException
{
List
<
AccountInfo
>
technologies
=
userService
.
getAccountsInfo
().
stream
()
.
filter
(
e
->
"Active"
.
equalsIgnoreCase
(
e
.
getStatus
()))
.
collect
(
Collectors
.
toList
());
return
new
ResponseEntity
<>(
technologies
,
HttpStatus
.
OK
);
}
@RequestMapping
(
value
=
"/getDomains"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
public
ResponseEntity
<
List
<
Domains
>>
getDomains
(
@RequestParam
(
"accountId"
)
String
accountId
)
throws
MyTimeException
{
List
<
Domains
>
domains
=
userService
.
getDomains
(
accountId
).
stream
()
.
filter
(
e
->
"Active"
.
equalsIgnoreCase
(
e
.
getStatus
())).
collect
(
Collectors
.
toList
());
return
new
ResponseEntity
<>(
domains
,
HttpStatus
.
OK
);
}
}
}
\ No newline at end of file
src/main/java/com/nisum/mytime/repository/DomainRepo.java
View file @
e8f9ef32
...
@@ -6,5 +6,9 @@ import com.nisum.mytime.model.Domains;
...
@@ -6,5 +6,9 @@ import com.nisum.mytime.model.Domains;
public
interface
DomainRepo
extends
MongoRepository
<
Domains
,
String
>
{
public
interface
DomainRepo
extends
MongoRepository
<
Domains
,
String
>
{
List
<
Domains
>
findByDomainNameAndAccountId
(
String
domianName
,
String
accountId
);
List
<
Domains
>
findByDomainNameAndAccountId
(
String
domianName
,
String
accountId
);
List
<
Domains
>
findByAccountId
(
String
accountId
);
Domains
findByDomainId
(
String
domainId
);
}
}
\ No newline at end of file
src/main/java/com/nisum/mytime/service/DomainServiceImpl.java
View file @
e8f9ef32
...
@@ -91,8 +91,8 @@ public class DomainServiceImpl implements DomainService {
...
@@ -91,8 +91,8 @@ public class DomainServiceImpl implements DomainService {
String
accountId
=
domain
.
getAccountId
();
String
accountId
=
domain
.
getAccountId
();
Query
accountInfoQuery
=
new
Query
(
Criteria
.
where
(
"accountId"
).
in
(
accountId
));
Query
accountInfoQuery
=
new
Query
(
Criteria
.
where
(
"accountId"
).
in
(
accountId
));
List
<
AccountInfo
>
accountList
=
mongoTemplate
.
find
(
accountInfoQuery
,
AccountInfo
.
class
);
List
<
AccountInfo
>
accountList
=
mongoTemplate
.
find
(
accountInfoQuery
,
AccountInfo
.
class
);
accountMap
.
put
(
"Account
Id"
,
accountId
);
accountMap
.
put
(
"AccountId"
,
accountId
);
accountMap
.
put
(
"Account
Name"
,
accountList
.
get
(
0
).
getAccountName
());
accountMap
.
put
(
"AccountName"
,
accountList
.
get
(
0
).
getAccountName
());
domainMap
.
put
(
"AccountInfo"
,
accountMap
);
domainMap
.
put
(
"AccountInfo"
,
accountMap
);
updatedEmployeeList
=
new
ArrayList
<>();
updatedEmployeeList
=
new
ArrayList
<>();
...
...
src/main/java/com/nisum/mytime/service/UserService.java
View file @
e8f9ef32
package
com
.
nisum
.
mytime
.
service
;
package
com
.
nisum
.
mytime
.
service
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
com.nisum.mytime.exception.handler.MyTimeException
;
import
com.nisum.mytime.exception.handler.MyTimeException
;
import
com.nisum.mytime.model.Account
;
import
com.nisum.mytime.model.Account
;
import
com.nisum.mytime.model.AccountInfo
;
import
com.nisum.mytime.model.Designation
;
import
com.nisum.mytime.model.Designation
;
import
com.nisum.mytime.model.Domains
;
import
com.nisum.mytime.model.EmpLoginData
;
import
com.nisum.mytime.model.EmpLoginData
;
import
com.nisum.mytime.model.EmployeeLocationDetails
;
import
com.nisum.mytime.model.EmployeeLocationDetails
;
import
com.nisum.mytime.model.EmployeeRoles
;
import
com.nisum.mytime.model.EmployeeRoles
;
...
@@ -67,4 +70,10 @@ public interface UserService {
...
@@ -67,4 +70,10 @@ public interface UserService {
List
<
EmployeeRoles
>
getEmployeesByFunctionalGrp
(
String
functionalGrp
);
List
<
EmployeeRoles
>
getEmployeesByFunctionalGrp
(
String
functionalGrp
);
List
<
EmployeeRoles
>
getEmployeesByStatus
(
String
status
);
List
<
EmployeeRoles
>
getEmployeesByStatus
(
String
status
);
List
<
HashMap
<
String
,
String
>>
getDeliveryLeads
(
String
domainId
);
public
List
<
AccountInfo
>
getAccountsInfo
()
throws
MyTimeException
;
public
List
<
Domains
>
getDomains
(
String
accountId
)
throws
MyTimeException
;
}
}
src/main/java/com/nisum/mytime/service/UserServiceImpl.java
View file @
e8f9ef32
...
@@ -3,6 +3,7 @@ package com.nisum.mytime.service;
...
@@ -3,6 +3,7 @@ package com.nisum.mytime.service;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -17,7 +18,9 @@ import org.springframework.stereotype.Service;
...
@@ -17,7 +18,9 @@ import org.springframework.stereotype.Service;
import
com.nisum.mytime.exception.handler.MyTimeException
;
import
com.nisum.mytime.exception.handler.MyTimeException
;
import
com.nisum.mytime.model.Account
;
import
com.nisum.mytime.model.Account
;
import
com.nisum.mytime.model.AccountInfo
;
import
com.nisum.mytime.model.Designation
;
import
com.nisum.mytime.model.Designation
;
import
com.nisum.mytime.model.Domains
;
import
com.nisum.mytime.model.EmpLoginData
;
import
com.nisum.mytime.model.EmpLoginData
;
import
com.nisum.mytime.model.EmployeeLocationDetails
;
import
com.nisum.mytime.model.EmployeeLocationDetails
;
import
com.nisum.mytime.model.EmployeeRoles
;
import
com.nisum.mytime.model.EmployeeRoles
;
...
@@ -27,8 +30,10 @@ import com.nisum.mytime.model.Project;
...
@@ -27,8 +30,10 @@ import com.nisum.mytime.model.Project;
import
com.nisum.mytime.model.ProjectTeamMate
;
import
com.nisum.mytime.model.ProjectTeamMate
;
import
com.nisum.mytime.model.Shift
;
import
com.nisum.mytime.model.Shift
;
import
com.nisum.mytime.model.Skill
;
import
com.nisum.mytime.model.Skill
;
import
com.nisum.mytime.repository.AccountInfoRepo
;
import
com.nisum.mytime.repository.AccountRepo
;
import
com.nisum.mytime.repository.AccountRepo
;
import
com.nisum.mytime.repository.DesignationRepo
;
import
com.nisum.mytime.repository.DesignationRepo
;
import
com.nisum.mytime.repository.DomainRepo
;
import
com.nisum.mytime.repository.EmployeeLocationDetailsRepo
;
import
com.nisum.mytime.repository.EmployeeLocationDetailsRepo
;
import
com.nisum.mytime.repository.EmployeeRolesRepo
;
import
com.nisum.mytime.repository.EmployeeRolesRepo
;
import
com.nisum.mytime.repository.LocationRepo
;
import
com.nisum.mytime.repository.LocationRepo
;
...
@@ -81,6 +86,12 @@ public class UserServiceImpl implements UserService {
...
@@ -81,6 +86,12 @@ public class UserServiceImpl implements UserService {
@Autowired
@Autowired
private
EmployeeLocationDetailsRepo
employeeLocationDetailsRepo
;
private
EmployeeLocationDetailsRepo
employeeLocationDetailsRepo
;
@Autowired
private
DomainRepo
domainRepo
;
@Autowired
private
AccountInfoRepo
accountInfoRepo
;
@Override
@Override
public
Boolean
fetchEmployeesData
(
String
perticularDate
,
public
Boolean
fetchEmployeesData
(
String
perticularDate
,
...
@@ -449,4 +460,36 @@ public class UserServiceImpl implements UserService {
...
@@ -449,4 +460,36 @@ public class UserServiceImpl implements UserService {
.
findByEmpStatusOrderByEmployeeNameAsc
(
status
);
.
findByEmpStatusOrderByEmployeeNameAsc
(
status
);
}
}
}
}
@Override
public
List
<
HashMap
<
String
,
String
>>
getDeliveryLeads
(
String
domainId
)
{
List
<
HashMap
<
String
,
String
>>
EmployeeList
=
null
;
Domains
domains
=
domainRepo
.
findByDomainId
(
domainId
);
EmployeeList
=
getEmployeeData
(
domains
.
getDeliveryManagers
());
return
EmployeeList
;
}
public
List
<
HashMap
<
String
,
String
>>
getEmployeeData
(
List
<
String
>
ids
)
{
List
<
HashMap
<
String
,
String
>>
EmployeeList
=
new
ArrayList
<>();
Query
query
=
new
Query
(
Criteria
.
where
(
"employeeId"
).
in
(
ids
));
List
<
EmployeeRoles
>
employeeRoles
=
mongoTemplate
.
find
(
query
,
EmployeeRoles
.
class
);
for
(
EmployeeRoles
employeesRole
:
employeeRoles
)
{
HashMap
<
String
,
String
>
managerMap
=
new
HashMap
<>();
managerMap
.
put
(
"id"
,
employeesRole
.
getEmployeeId
());
managerMap
.
put
(
"name"
,
employeesRole
.
getEmployeeName
());
EmployeeList
.
add
(
managerMap
);
}
return
EmployeeList
;
}
@Override
public
List
<
AccountInfo
>
getAccountsInfo
()
throws
MyTimeException
{
return
accountInfoRepo
.
findAll
();
}
@Override
public
List
<
Domains
>
getDomains
(
String
accountId
)
throws
MyTimeException
{
List
<
Domains
>
domains
=
domainRepo
.
findByAccountId
(
accountId
);
return
domains
;
}
}
}
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