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
4cc7ab98
Commit
4cc7ab98
authored
Sep 12, 2018
by
b v s satyanarayana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MT-70 :SNS :: AuditFiledsAddedToTeams_ProjectTeamMates_BillingDetails_ShifTDetails
parent
278b0d3e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
138 additions
and
0 deletions
+138
-0
UserServiceImpl.java
src/main/java/com/nisum/mytime/service/UserServiceImpl.java
+1
-0
EmployeeBillingControllerTest.java
.../mytime/controllertest/EmployeeBillingControllerTest.java
+137
-0
No files found.
src/main/java/com/nisum/mytime/service/UserServiceImpl.java
View file @
4cc7ab98
...
...
@@ -276,6 +276,7 @@ public class UserServiceImpl implements UserService {
BillingDetails
billingDetailsExisting
=
listBD
.
get
(
0
);
billingDetailsExisting
.
setBillingEndDate
(
employeeRoles
.
getEndDate
());
billingDetailsExisting
.
setActive
(
false
);
billingDetailsExisting
.
setAuditFields
(
loginEmpId
,
MyTimeUtils
.
UPDATE
);
teamMatesBillingRepo
.
save
(
billingDetailsExisting
);
}
teamMate
.
setAuditFields
(
loginEmpId
,
MyTimeUtils
.
UPDATE
);
...
...
src/test/java/com/nisum/mytime/controllertest/EmployeeBillingControllerTest.java
0 → 100644
View file @
4cc7ab98
package
com
.
nisum
.
mytime
.
controllertest
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
request
.
MockMvcRequestBuilders
.
get
;
import
static
org
.
springframework
.
test
.
web
.
servlet
.
request
.
MockMvcRequestBuilders
.
post
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
org.bson.types.ObjectId
;
import
org.junit.Test
;
import
org.mockito.InjectMocks
;
import
org.mockito.Mock
;
import
org.springframework.http.MediaType
;
import
org.springframework.test.web.servlet.MockMvc
;
import
org.springframework.test.web.servlet.result.MockMvcResultMatchers
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.nisum.mytime.controller.ProjectTeamController
;
import
com.nisum.mytime.model.BillingDetails
;
import
com.nisum.mytime.model.EmployeeDashboardVO
;
import
com.nisum.mytime.repository.EmployeeVisaRepo
;
import
com.nisum.mytime.service.ProjectService
;
import
com.nisum.mytime.service.UserService
;
public
class
EmployeeBillingControllerTest
{
@Mock
UserService
userService
;
@Mock
ProjectService
projectService
;
@Mock
EmployeeVisaRepo
employeeVisaRepo
;
@InjectMocks
ProjectTeamController
projectTeamController
;
private
MockMvc
mockMvc
;
@Test
public
void
testgetEmployeeBillingDetails
()
throws
Exception
{
List
<
BillingDetails
>
billings
=
CreateTeamMateBilling
();
when
(
projectService
.
getEmployeeBillingDetailsAll
(
"16167"
)).
thenReturn
(
billings
);
mockMvc
.
perform
(
get
(
"/projectTeam/getProjectAllocations"
).
param
(
"employeeId"
,
"16167"
))
.
andExpect
(
MockMvcResultMatchers
.
status
().
isOk
());
verify
(
projectService
).
getEmployeeBillingDetailsAll
(
"16167"
);
}
@Test
public
void
testaddEmployeeBilling
()
throws
Exception
{
BillingDetails
billingDetails
=
new
BillingDetails
(
new
ObjectId
(
"9976ef15874c902c98b8a05d"
),
"16389"
,
"Mahesh Mudrakola"
,
"Acc001"
,
"Pro001"
,
"Macys"
,
"Y"
,
new
Date
(
2017
-
11
-
29
),
new
Date
(
2017
-
12
-
20
),
"Comments"
,
true
,
new
Date
(
2017
-
11
-
29
));
String
jsonvalue
=
(
new
ObjectMapper
())
.
writeValueAsString
(
billingDetails
).
toString
();
when
(
projectService
.
addEmployeeBillingDetails
(
billingDetails
))
.
thenReturn
(
billingDetails
);
mockMvc
.
perform
(
post
(
"/projectTeam/addEmployeeBilling"
)
.
contentType
(
MediaType
.
APPLICATION_JSON_VALUE
)
.
content
(
jsonvalue
))
.
andExpect
(
MockMvcResultMatchers
.
status
().
isOk
());
}
@Test
public
void
testupdateEmployeeBilling
()
throws
Exception
{
BillingDetails
billingDetails
=
new
BillingDetails
(
new
ObjectId
(
"9976ef15874c902c98b8a05d"
),
"16389"
,
"Mahesh Mudrakola"
,
"Acc001"
,
"Pro001"
,
"Macys"
,
"Y"
,
new
Date
(
2017
-
11
-
29
),
new
Date
(
2017
-
12
-
20
),
"Comments"
,
true
,
new
Date
(
2017
-
11
-
29
));
String
jsonvalue
=
(
new
ObjectMapper
())
.
writeValueAsString
(
billingDetails
).
toString
();
when
(
projectService
.
updateEmployeeBilling
(
billingDetails
))
.
thenReturn
(
billingDetails
);
mockMvc
.
perform
(
post
(
"/projectTeam/updateEmployeeBilling"
)
.
contentType
(
MediaType
.
APPLICATION_JSON_VALUE
)
.
content
(
jsonvalue
))
.
andExpect
(
MockMvcResultMatchers
.
status
().
isOk
());
}
@Test
public
void
testdeleteTeammate
()
throws
Exception
{
BillingDetails
billingDetails
=
new
BillingDetails
(
new
ObjectId
(
"9976ef15874c902c98b8a05d"
),
"16389"
,
"Mahesh Mudrakola"
,
"Acc001"
,
"Pro001"
,
"Macys"
,
"Y"
,
new
Date
(
2017
-
11
-
29
),
new
Date
(
2017
-
12
-
20
),
"Comments"
,
true
,
new
Date
(
2017
-
11
-
29
));
String
jsonvalue
=
(
new
ObjectMapper
())
.
writeValueAsString
(
billingDetails
).
toString
();
mockMvc
.
perform
(
post
(
"/projectTeam/deleteEmployeeBilling"
)
.
contentType
(
MediaType
.
APPLICATION_JSON_VALUE
)
.
content
(
jsonvalue
))
.
andExpect
(
MockMvcResultMatchers
.
status
().
isOk
());
verify
(
projectService
).
deleteEmployeeBilling
(
billingDetails
);
}
@Test
public
void
testgetEmployeesDashBoard
()
throws
Exception
{
List
<
EmployeeDashboardVO
>
dashboard
=
null
;
when
(
projectService
.
getEmployeesDashBoard
()).
thenReturn
(
dashboard
);
mockMvc
.
perform
(
get
(
"/projectTeam/getEmployeesDashBoard"
))
.
andExpect
(
MockMvcResultMatchers
.
status
().
isOk
());
verify
(
projectService
).
getEmployeesDashBoard
();
}
private
List
<
BillingDetails
>
CreateTeamMateBilling
()
{
List
<
BillingDetails
>
data
=
new
ArrayList
<>();
BillingDetails
team1
=
new
BillingDetails
();
team1
.
setId
(
new
ObjectId
(
"5b307d7d708ef705c4ca59cc"
));
team1
.
setEmployeeId
(
"16167"
);
team1
.
setEmployeeName
(
"Mogana Kurmaran"
);
team1
.
setProjectId
(
"Nisum0000"
);
team1
.
setProjectName
(
"Free Pool"
);
team1
.
setBillingStartDate
(
new
Date
(
2017
-
01
-
10
));
team1
.
setBillingEndDate
(
new
Date
(
2017
-
02
-
10
));
team1
.
setActive
(
true
);
data
.
add
(
team1
);
BillingDetails
team2
=
new
BillingDetails
();
team2
.
setId
(
new
ObjectId
(
"5b2f4a969ed316fef01adcce"
));
team2
.
setEmployeeId
(
"16050"
);
team2
.
setEmployeeName
(
"Rajeshekar Sayannagari"
);
team2
.
setProjectId
(
"Nisum0000"
);
team2
.
setProjectName
(
"Free Pool"
);
team2
.
setBillingStartDate
(
new
Date
(
2017
-
01
-
15
));
team2
.
setBillingEndDate
(
new
Date
(
2017
-
02
-
15
));
team2
.
setActive
(
false
);
data
.
add
(
team2
);
return
data
;
}
}
\ No newline at end of file
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