Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
ProjectsStatusManagement
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
hasan.bahjat
ProjectsStatusManagement
Commits
e12a00a8
Commit
e12a00a8
authored
Aug 24, 2024
by
hasan khaddour
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix tracking naming issue
parent
a2769352
Changes
37
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
37 changed files
with
1406 additions
and
37 deletions
+1406
-37
CustomersController.cs
...nagement.Api/Controllers/Customers/CustomersController.cs
+3
-3
FinancialSpendsController.cs
.../Controllers/FinancialSpends/FinancialSpendsController.cs
+2
-2
ProjectsController.cs
PSManagement.Api/Controllers/Projects/ProjectsController.cs
+3
-3
StepsController.cs
PSManagement.Api/Controllers/Steps/StepsController.cs
+3
-3
TracksController.cs
PSManagement.Api/Controllers/Tracks/TracksController.cs
+4
-2
CustomerMapperConfiguration.cs
PSManagement.Api/Mappers/CustomerMapperConfiguration.cs
+5
-1
MapperConfiguration.cs
...Application/ApplicationDTOsMappers/MapperConfiguration.cs
+6
-2
EmployeeDTO.cs
PSManagement.Application/Employees/Common/EmployeeDTO.cs
+2
-0
GetAvailableEmployeesQueryHandler.cs
...etAvailableEmployees/GetAvailableEmployeesQueryHandler.cs
+1
-1
GetEmployeeByIdQueryHandler.cs
...es/Queries/GetEmployeeById/GetEmployeeByIdQueryHandler.cs
+2
-0
GetEmployeeParticipationQueryHandler.cs
...yeeParticipations/GetEmployeeParticipationQueryHandler.cs
+2
-1
GetEmployeeTrackHistoryQueryHandler.cs
...ployeeTrackHistory/GetEmployeeTrackHistoryQueryHandler.cs
+3
-1
GetEmployeesByFilterQuery.cs
...Queries/GetEmployeesByFilter/GetEmployeesByFilterQuery.cs
+1
-0
GetEmployeesByFilterQueryHandler.cs
.../GetEmployeesByFilter/GetEmployeesByFilterQueryHandler.cs
+5
-0
AddProjectStepCommandHandler.cs
...s/Commands/AddProjectStep/AddProjectStepCommandHandler.cs
+1
-1
GetProjectByIdQueryHandler.cs
...ases/Queries/GetProjectById/GetProjectByIdQueryHandler.cs
+2
-2
EmployeeTrackDTO.cs
PSManagement.Application/Tracks/Common/EmployeeTrackDTO.cs
+2
-0
TrackDTO.cs
PSManagement.Application/Tracks/Common/TrackDTO.cs
+2
-1
AddEmployeeTrackCommandHandler.cs
...mmands/AddEmployeeTrack/AddEmployeeTrackCommandHandler.cs
+4
-2
AddStepTrackCommand.cs
...acks/UseCaes/Commands/AddStepTrack/AddStepTrackCommand.cs
+0
-1
UpdateEmployeeWorkTrackCommandHandler.cs
...mployeeWorkTrack/UpdateEmployeeWorkTrackCommandHandler.cs
+1
-1
GetTracksByProjectQueryHandler.cs
...ries/GetTracksByProject/GetTracksByProjectQueryHandler.cs
+2
-1
GetEmployeesByFilterRequest.cs
...ntracts/Employees/Requests/GetEmployeesByFilterRequest.cs
+1
-0
EmployeeParticipateResponse.cs
...ntracts/Employees/Response/EmployeeParticipateResponse.cs
+3
-0
EmployeeResponse.cs
...nagement.Contracts/Employees/Response/EmployeeResponse.cs
+1
-0
GetProjectsByProjectManagerRequest.cs
...s/Projects/Requests/GetProjectsByProjectManagerRequest.cs
+1
-1
ProjectDetailsResponse.cs
...ent.Contracts/Projects/Response/ProjectDetailsResponse.cs
+1
-0
ProjectResponse.cs
PSManagement.Contracts/Projects/Response/ProjectResponse.cs
+1
-0
AddStepTrackRequest.cs
...nagement.Contracts/Tracks/Requests/AddStepTrackRequest.cs
+0
-1
EmployeeTrackResponse.cs
...gement.Contracts/Tracks/Response/EmployeeTrackResponse.cs
+2
-0
TrackResponse.cs
PSManagement.Contracts/Tracks/Response/TrackResponse.cs
+4
-1
Step.cs
PSManagement.Domain/Projects/Entities/Step.cs
+2
-1
EmployeeTrack.cs
PSManagement.Domain/Tracking/Entities/EmployeeTrack.cs
+1
-1
TrackEntityConfiguration.cs
...istence/EntitiesConfiguration/TrackEntityConfiguration.cs
+1
-1
20240824174450_FixTrackNaming.Designer.cs
...ence/Migrations/20240824174450_FixTrackNaming.Designer.cs
+1272
-0
20240824174450_FixTrackNaming.cs
...e.Persistence/Migrations/20240824174450_FixTrackNaming.cs
+57
-0
AppDbContextModelSnapshot.cs
...cture.Persistence/Migrations/AppDbContextModelSnapshot.cs
+3
-3
No files found.
PSManagement.Api/Controllers/Customers/CustomersController.cs
View file @
e12a00a8
...
...
@@ -81,10 +81,10 @@ namespace PSManagement.Api.Controllers.Customers
}
[
HttpDelete
]
public
async
Task
<
IActionResult
>
Delete
(
DeleteCustomerRequest
request
)
[
HttpDelete
(
"{id}"
)
]
public
async
Task
<
IActionResult
>
Delete
(
int
id
)
{
var
command
=
_mapper
.
Map
<
DeleteCustomerCommand
>(
request
);
var
command
=
new
DeleteCustomerCommand
(
id
);
var
result
=
await
_sender
.
Send
(
command
);
...
...
PSManagement.Api/Controllers/FinancialSpends/FinancialSpendsController.cs
View file @
e12a00a8
...
...
@@ -66,7 +66,7 @@ namespace PSManagement.Api.Controllers.FinancialSpends
return
HandleResult
(
_mapper
.
Map
<
Result
<
FinancialSpendingResponse
>>(
result
));
;
}
[
HttpGet
(
"
Get
ByProject"
)]
[
HttpGet
(
"ByProject"
)]
public
async
Task
<
IActionResult
>
GetByProject
([
FromQuery
]
GetFinancialSpendItemByProjecRequest
request
)
{
var
query
=
_mapper
.
Map
<
GetFinancialSpendItemByProjectQuery
>(
request
);
...
...
@@ -77,7 +77,7 @@ namespace PSManagement.Api.Controllers.FinancialSpends
}
[
HttpDelete
(
"{id}"
)]
public
async
Task
<
IActionResult
>
Delete
(
RemoveFinancialSpendItemRequest
request
,[
FromRoute
]
int
id
)
public
async
Task
<
IActionResult
>
Delete
(
[
FromQuery
]
RemoveFinancialSpendItemRequest
request
,[
FromRoute
]
int
id
)
{
if
(
id
!=
request
.
Id
)
{
Result
.
Conflict
();
...
...
PSManagement.Api/Controllers/Projects/ProjectsController.cs
View file @
e12a00a8
...
...
@@ -52,7 +52,7 @@ namespace PSManagement.Api.Controllers.Projects
{
var
query
=
_mapper
.
Map
<
ListAllProjectsQuery
>(
request
);
var
result
=
_mapper
.
Map
<
Result
<
IEnumerable
<
ProjectResponse
>>>(
await
_sender
.
Send
(
query
));
var
result
=
_mapper
.
Map
<
Result
<
IEnumerable
<
Project
Details
Response
>>>(
await
_sender
.
Send
(
query
));
return
HandleResult
(
result
);
}
...
...
@@ -65,7 +65,7 @@ namespace PSManagement.Api.Controllers.Projects
var
result
=
await
_sender
.
Send
(
query
);
return
HandleResult
(
_mapper
.
Map
<
Result
<
IEnumerable
<
ProjectResponse
>>>(
result
));
return
HandleResult
(
_mapper
.
Map
<
Result
<
IEnumerable
<
Project
Details
Response
>>>(
result
));
}
[
HttpGet
(
"ByProjectManager"
)]
...
...
@@ -75,7 +75,7 @@ namespace PSManagement.Api.Controllers.Projects
var
result
=
await
_sender
.
Send
(
query
);
return
HandleResult
(
_mapper
.
Map
<
Result
<
IEnumerable
<
ProjectResponse
>>>(
result
));
return
HandleResult
(
_mapper
.
Map
<
Result
<
IEnumerable
<
Project
Details
Response
>>>(
result
));
}
[
HttpGet
(
"GetParticipants/{id}"
)]
...
...
PSManagement.Api/Controllers/Steps/StepsController.cs
View file @
e12a00a8
...
...
@@ -51,7 +51,7 @@ namespace PSManagement.Api.Controllers.Steps
return
HandleResult
(
result
);
}
[
HttpPut
(
"{id}"
)]
[
HttpPut
(
"
ChangeStepWeight/
{id}"
)]
public
async
Task
<
IActionResult
>
PutChangeStepWeight
(
ChangeStepWeightRequest
request
,[
FromRoute
]
int
id
)
{
if
(
request
.
StepId
!=
id
)
{
...
...
@@ -75,7 +75,7 @@ namespace PSManagement.Api.Controllers.Steps
return
HandleResult
(
result
);
}
[
HttpPut
]
[
HttpPut
(
"ChangeCompletionRatio/{id}"
)
]
public
async
Task
<
IActionResult
>
PutCompletionRatio
(
UpdateCompletionRatioRequest
request
)
{
var
query
=
_mapper
.
Map
<
UpdateCompletionRatioCommand
>(
request
);
...
...
@@ -90,7 +90,7 @@ namespace PSManagement.Api.Controllers.Steps
{
var
query
=
new
RemoveStepCommand
(
id
);
var
result
=
_mapper
.
Map
<
Result
>(
await
_sender
.
Send
(
query
)
);
var
result
=
await
_sender
.
Send
(
query
);
return
HandleResult
(
result
);
}
...
...
PSManagement.Api/Controllers/Tracks/TracksController.cs
View file @
e12a00a8
...
...
@@ -44,7 +44,7 @@ namespace PSManagement.Api.Controllers.Tracks
return
HandleResult
(
result
);
}
[
HttpGet
(
"GetStepsTrack{id}"
)]
[
HttpGet
(
"GetStepsTrack
/
{id}"
)]
public
async
Task
<
IActionResult
>
GetStepsTrack
([
FromRoute
]
int
id
)
{
var
query
=
new
GetStepsTrackQuery
(
id
);
...
...
@@ -54,7 +54,7 @@ namespace PSManagement.Api.Controllers.Tracks
return
HandleResult
(
result
);
}
[
HttpGet
(
"GetEmployeesTrack{id}"
)]
[
HttpGet
(
"GetEmployeesTrack
/
{id}"
)]
public
async
Task
<
IActionResult
>
GetEmployeesTrack
([
FromRoute
]
int
id
)
{
var
query
=
new
GetEmployeesTrackQuery
(
id
);
...
...
@@ -148,6 +148,8 @@ namespace PSManagement.Api.Controllers.Tracks
return
HandleResult
(
result
);
}
[
HttpPut
(
"UpdateStepTrack"
)]
public
async
Task
<
IActionResult
>
PutStepTrack
(
UpdateStepTrackRequest
request
)
{
...
...
PSManagement.Api/Mappers/CustomerMapperConfiguration.cs
View file @
e12a00a8
...
...
@@ -59,7 +59,11 @@ namespace PSManagement.Api.Mappers
CreateMap
<
ChangeProjectTeamLeaderRequest
,
ChangeProjectTeamLeaderCommand
>().
ReverseMap
();
CreateMap
<
RemoveParticipantRequest
,
RemoveParticipantCommand
>().
ReverseMap
();
CreateMap
<
ProjectDTO
,
ProjectResponse
>().
ReverseMap
();
CreateMap
<
GetProjectsByProjectManagerRequest
,
GetProjectsByFilterQuery
>().
ConstructUsing
(
s
=>
new
GetProjectsByFilterQuery
(
null
,
null
,
null
,
null
,
s
.
ProjectManagerId
,
null
,
null
,
null
)
);
CreateMap
<
EmployeeResponse
,
EmployeeDTO
>().
ReverseMap
();
CreateMap
<
EmployeeParticipateResponse
,
EmployeeParticipateDTO
>().
ReverseMap
();
...
...
PSManagement.Application/ApplicationDTOsMappers/MapperConfiguration.cs
View file @
e12a00a8
...
...
@@ -37,7 +37,9 @@ namespace PSManagement.Application.Mappers
;
CreateMap
<
Employee
,
EmployeeDTO
>()
.
ForMember
(
e
=>
e
.
DepartmentName
,
op
=>
op
.
MapFrom
(
e
=>
e
.
Department
.
Name
));
.
ForMember
(
e
=>
e
.
DepartmentName
,
op
=>
op
.
MapFrom
(
e
=>
e
.
Department
.
Name
))
.
ForMember
(
e
=>
e
.
Email
,
op
=>
op
.
MapFrom
(
e
=>
e
.
User
.
Email
))
;
CreateMap
<
EmployeeParticipate
,
EmployeeParticipateDTO
>()
...
...
@@ -56,7 +58,9 @@ namespace PSManagement.Application.Mappers
CreateMap
<
Project
,
ProjectInfo
>()
.
ConvertUsing
(
project
=>
project
.
ProjectInfo
);
CreateMap
<
Track
,
TrackDTO
>();
CreateMap
<
Track
,
TrackDTO
>()
.
ForMember
(
e
=>
e
.
ProjectInfo
,
op
=>
op
.
MapFrom
(
s
=>
s
.
Project
.
ProjectInfo
))
;
CreateMap
<
CreateTrackCommand
,
Track
>().
ReverseMap
();
CreateMap
<
AddEmployeeTrackCommand
,
EmployeeTrack
>().
ReverseMap
();
...
...
PSManagement.Application/Employees/Common/EmployeeDTO.cs
View file @
e12a00a8
...
...
@@ -12,6 +12,8 @@ namespace PSManagement.Application.Employees.Common
public
int
Id
{
get
;
set
;
}
public
int
HIASTId
{
get
;
set
;
}
public
int
UserId
{
get
;
set
;
}
public
string
Email
{
get
;
set
;
}
public
String
DepartmentName
{
get
;
set
;
}
public
PersonalInfo
PersonalInfo
{
get
;
set
;
}
public
WorkInfo
WorkInfo
{
get
;
set
;
}
...
...
PSManagement.Application/Employees/UseCases/Queries/GetAvailableEmployees/GetAvailableEmployeesQueryHandler.cs
View file @
e12a00a8
...
...
@@ -33,7 +33,7 @@ namespace PSManagement.Application.Employees.UseCases.Queries.GetAvailableEmploy
int
pageSize
=
request
.
PageSize
.
HasValue
&&
request
.
PageSize
.
Value
>
0
&&
request
.
PageSize
.
Value
<=
30
?
request
.
PageSize
.
Value
:
30
;
_specification
.
ApplyPaging
((
pageNumber
-
1
)
*
pageSize
,
pageSize
);
_specification
.
AddInclude
(
e
=>
e
.
Department
);
_specification
.
AddInclude
(
e
=>
e
.
User
);
return
Result
.
Success
(
_mapper
.
Map
<
IEnumerable
<
EmployeeDTO
>>(
await
_employeesRepository
.
ListAsync
(
_specification
)));
}
}
...
...
PSManagement.Application/Employees/UseCases/Queries/GetEmployeeById/GetEmployeeByIdQueryHandler.cs
View file @
e12a00a8
...
...
@@ -29,6 +29,8 @@ namespace PSManagement.Application.Employees.UseCases.Queries.GetEmployeeById
public
async
Task
<
Result
<
EmployeeDTO
>>
Handle
(
GetEmployeeByIdQuery
request
,
CancellationToken
cancellationToken
)
{
_specification
.
AddInclude
(
e
=>
e
.
Department
);
_specification
.
AddInclude
(
e
=>
e
.
User
);
return
Result
.
Success
(
_mapper
.
Map
<
EmployeeDTO
>(
await
_employeesRepository
.
GetByIdAsync
(
request
.
EmployeeId
,
_specification
)));
}
}
...
...
PSManagement.Application/Employees/UseCases/Queries/GetEmployeeParticipations/GetEmployeeParticipationQueryHandler.cs
View file @
e12a00a8
...
...
@@ -35,12 +35,13 @@ namespace PSManagement.Application.Employees.UseCases.Queries.GetEmployeeById
_specification
.
ApplyPaging
((
pageNumber
-
1
)
*
pageSize
,
pageSize
);
_specification
.
AddInclude
(
e
=>
e
.
Project
);
_specification
.
AddInclude
(
"Employee.
Department
"
);
_specification
.
AddInclude
(
"Employee.
User
"
);
_specification
.
AddInclude
(
e
=>
e
.
Employee
);
_specification
.
AddInclude
(
e
=>
e
.
Employee
.
Department
);
IEnumerable
<
EmployeeParticipate
>
response
=
await
_employeesParticipateRepository
.
ListAsync
(
_specification
);
response
=
response
.
Where
(
e
=>
e
.
EmployeeId
==
request
.
EmployeeId
).
ToList
();
...
...
PSManagement.Application/Employees/UseCases/Queries/GetEmployeeTrackHistory/GetEmployeeTrackHistoryQueryHandler.cs
View file @
e12a00a8
...
...
@@ -34,7 +34,9 @@ namespace PSManagement.Application.Employees.UseCases.Queries.GetEmployeeTrackHi
int
pageSize
=
request
.
PageSize
.
HasValue
&&
request
.
PageSize
.
Value
>
0
&&
request
.
PageSize
.
Value
<=
30
?
request
.
PageSize
.
Value
:
30
;
_specification
.
AddInclude
(
e
=>
e
.
Track
);
_specification
.
AddInclude
(
e
=>
e
.
Employee
);
_specification
.
Criteria
=
e
=>
e
.
EmloyeeId
==
request
.
EmployeeId
&&
e
.
Track
.
ProjectId
==
request
.
ProjectId
;
_specification
.
AddInclude
(
e
=>
e
.
Employee
.
User
);
_specification
.
Criteria
=
e
=>
e
.
EmployeeId
==
request
.
EmployeeId
&&
e
.
Track
.
ProjectId
==
request
.
ProjectId
;
_specification
.
ApplyPaging
((
pageNumber
-
1
)
*
pageSize
,
pageSize
);
IEnumerable
<
EmployeeTrack
>
employeeTracks
=
await
_employeeTracksRepository
.
ListAsync
(
_specification
);
...
...
PSManagement.Application/Employees/UseCases/Queries/GetEmployeesByFilter/GetEmployeesByFilterQuery.cs
View file @
e12a00a8
...
...
@@ -8,6 +8,7 @@ namespace PSManagement.Application.Employees.UseCases.Queries.GetEmployeesByFilt
public
record
GetEmployeesByFilterQuery
(
string
EmployeeFirstName
,
int
?
HiastId
,
string
Email
,
string
DepartmentName
,
string
WorkType
,
int
?
PageNumber
,
...
...
PSManagement.Application/Employees/UseCases/Queries/GetEmployeesByFilter/GetEmployeesByFilterQueryHandler.cs
View file @
e12a00a8
...
...
@@ -34,6 +34,7 @@ namespace PSManagement.Application.Employees.UseCases.Queries.GetEmployeesByFilt
_specification
.
ApplyPaging
((
pageNumber
-
1
)
*
pageSize
,
pageSize
);
_specification
.
AddInclude
(
e
=>
e
.
Department
);
_specification
.
AddInclude
(
e
=>
e
.
User
);
IEnumerable
<
Employee
>
employees
=
await
_employeesRepository
.
ListAsync
(
_specification
);
if
(!
string
.
IsNullOrEmpty
(
request
.
DepartmentName
))
...
...
@@ -54,6 +55,10 @@ namespace PSManagement.Application.Employees.UseCases.Queries.GetEmployeesByFilt
{
employees
=
employees
.
Where
(
e
=>
e
.
WorkInfo
.
WorkType
.
ToLower
().
Contains
(
request
.
WorkType
.
ToLower
().
Trim
()));
}
if
(!
string
.
IsNullOrEmpty
(
request
.
Email
))
{
employees
=
employees
.
Where
(
e
=>
e
.
User
.
Email
.
ToLower
().
Contains
(
request
.
Email
.
ToLower
().
Trim
()));
}
return
Result
.
Success
(
_mapper
.
Map
<
IEnumerable
<
EmployeeDTO
>>(
employees
));
}
...
...
PSManagement.Application/Projects/UseCases/Commands/AddProjectStep/AddProjectStepCommandHandler.cs
View file @
e12a00a8
...
...
@@ -40,7 +40,7 @@ namespace PSManagement.Application.Projects.UseCases.Commands.AddProjectStep
}
else
{
Step
step
=
await
_stepsRepository
.
AddAsync
(
new
(
request
.
StepInfo
,
request
.
ProjectId
,
request
.
Weight
));
Step
step
=
await
_stepsRepository
.
AddAsync
(
new
(
request
.
StepInfo
,
request
.
ProjectId
,
request
.
CurrentCompletionRatio
,
request
.
Weight
));
await
_unitOfWork
.
SaveChangesAsync
();
...
...
PSManagement.Application/Projects/UseCases/Queries/GetProjectById/GetProjectByIdQueryHandler.cs
View file @
e12a00a8
...
...
@@ -31,9 +31,9 @@ namespace PSManagement.Application.Projects.UseCases.Queries.GetProject
{
_specification
.
Includes
.
Add
(
p
=>
p
.
EmployeeParticipates
);
_specification
.
Includes
.
Add
(
p
=>
p
.
FinancialSpending
);
_specification
.
Includes
.
Add
(
p
=>
p
.
ProjectManager
);
_specification
.
Includes
.
Add
(
p
=>
p
.
ProjectManager
.
Department
);
_specification
.
Includes
.
Add
(
p
=>
p
.
Attachments
);
_specification
.
Includes
.
Add
(
p
=>
p
.
TeamLeader
);
_specification
.
Includes
.
Add
(
p
=>
p
.
TeamLeader
.
Department
);
_specification
.
Includes
.
Add
(
p
=>
p
.
Executer
);
_specification
.
Includes
.
Add
(
p
=>
p
.
Proposer
);
...
...
PSManagement.Application/Tracks/Common/EmployeeTrackDTO.cs
View file @
e12a00a8
using
PSManagement.Domain.Tracking.ValueObjects
;
using
PSManagement.Domain.Employees.Entities
;
namespace
PSManagement.Application.Tracks.Common
{
...
...
@@ -6,6 +7,7 @@ namespace PSManagement.Application.Tracks.Common
{
public
int
Id
{
get
;
set
;
}
public
int
EmloyeeId
{
get
;
set
;
}
public
Employee
Emloyee
{
get
;
set
;
}
public
int
TrackId
{
get
;
set
;
}
public
TrackInfo
TrackInfo
{
get
;
set
;
}
public
EmployeeWorkInfo
EmployeeWorkInfo
{
get
;
set
;
}
...
...
PSManagement.Application/Tracks/Common/TrackDTO.cs
View file @
e12a00a8
using
PSManagement.Application.Employees.Common
;
using
PSManagement.Domain.Tracking.ValueObjects
;
using
PSManagement.Domain.Projects.ValueObjects
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
...
...
@@ -14,6 +15,6 @@ namespace PSManagement.Application.Tracks.Common
public
TrackInfo
TrackInfo
{
get
;
set
;
}
public
String
Notes
{
get
;
set
;
}
public
int
ProjectId
{
get
;
set
;
}
public
ProjectInfo
ProjectInfo
{
get
;
set
;}
}
}
PSManagement.Application/Tracks/UseCaes/Commands/AddEmployeeTrack/AddEmployeeTrackCommandHandler.cs
View file @
e12a00a8
...
...
@@ -11,6 +11,7 @@ using PSManagement.SharedKernel.Specification;
using
System.Threading
;
using
System.Threading.Tasks
;
using
System.Linq
;
using
System
;
namespace
PSManagement.Application.Tracks.UseCaes.Commands.AddEmployeeTrack
{
...
...
@@ -53,12 +54,13 @@ namespace PSManagement.Application.Tracks.UseCaes.Commands.AddEmployeeTrack
return
Result
.
Invalid
(
TracksErrors
.
TrackCompletedUpdateError
);
}
if
(
track
.
EmployeeTracks
.
Any
(
e
=>
e
.
EmloyeeId
==
request
.
EmployeeId
))
{
if
(
track
.
EmployeeTracks
.
Any
(
e
=>
e
.
Em
p
loyeeId
==
request
.
EmployeeId
))
{
return
Result
.
Invalid
(
TracksErrors
.
ParticipantTrackExistError
);
}
var
r
=
_mapper
.
Map
<
EmployeeTrack
>(
request
);
//Console.WriteLine(r.EmloyeeId);
EmployeeTrack
employeeTrack
=
await
_employeeTracksRepository
.
AddAsync
(
_mapper
.
Map
<
EmployeeTrack
>(
request
));
await
_unitOfWork
.
SaveChangesAsync
();
...
...
PSManagement.Application/Tracks/UseCaes/Commands/AddStepTrack/AddStepTrackCommand.cs
View file @
e12a00a8
...
...
@@ -8,7 +8,6 @@ namespace PSManagement.Application.Tracks.UseCaes.Commands.AddStepTrack
int
StepId
,
int
TrackId
,
string
ExecutionState
,
DateTime
TrackDate
,
int
TrackExecutionRatio
)
:
ICommand
<
Result
<
int
>>;
}
\ No newline at end of file
PSManagement.Application/Tracks/UseCaes/Commands/UpdateEmployeeWorkTrack/UpdateEmployeeWorkTrackCommandHandler.cs
View file @
e12a00a8
...
...
@@ -47,7 +47,7 @@ namespace PSManagement.Application.Tracks.UseCaes.Commands.UpdateEmployeeWorkTra
return
Result
.
Invalid
(
TracksErrors
.
InvalidEntryError
);
}
if
(
request
.
EmployeeId
!=
employeeTrack
.
EmloyeeId
)
if
(
request
.
EmployeeId
!=
employeeTrack
.
Em
p
loyeeId
)
{
return
Result
.
Invalid
(
TracksErrors
.
InvalidEntryError
);
...
...
PSManagement.Application/Tracks/UseCaes/Queries/GetTracksByProject/GetTracksByProjectQueryHandler.cs
View file @
e12a00a8
...
...
@@ -37,7 +37,8 @@ namespace PSManagement.Application.Tracks.UseCaes.Queries.GetTracksByProject
int
pageNumber
=
request
.
PageNumber
.
HasValue
&&
request
.
PageNumber
.
Value
>
0
?
request
.
PageNumber
.
Value
:
1
;
int
pageSize
=
request
.
PageSize
.
HasValue
&&
request
.
PageSize
.
Value
>
0
&&
request
.
PageSize
.
Value
<=
30
?
request
.
PageSize
.
Value
:
30
;
_specification
.
AddInclude
(
e
=>
e
.
Project
);
_specification
.
ApplyPaging
((
pageNumber
-
1
)
*
pageSize
,
pageSize
);
_specification
.
Criteria
=
t
=>
t
.
ProjectId
==
request
.
ProjectId
;
...
...
PSManagement.Contracts/Employees/Requests/GetEmployeesByFilterRequest.cs
View file @
e12a00a8
...
...
@@ -3,6 +3,7 @@
public
record
GetEmployeesByFilterRequest
(
string
EmployeeFirstName
,
int
?
HiastId
,
string
Email
,
string
DepartmentName
,
string
WorkType
,
int
?
PageSize
,
...
...
PSManagement.Contracts/Employees/Response/EmployeeParticipateResponse.cs
View file @
e12a00a8
using
PSManagement.Application.Employees.Common
;
using
PSManagement.Domain.Projects.ValueObjects
;
namespace
PSManagement.Contracts.Projects.Response
{
...
...
@@ -6,6 +7,8 @@ namespace PSManagement.Contracts.Projects.Response
{
public
int
EmployeeId
{
get
;
set
;
}
public
int
ProjectId
{
get
;
set
;
}
public
ProjectInfo
ProjectInfo
{
get
;
set
;
}
public
EmployeeResponse
Employee
{
get
;
set
;
}
public
int
PartialTimeRatio
{
get
;
set
;
}
public
string
Role
{
get
;
set
;
}
...
...
PSManagement.Contracts/Employees/Response/EmployeeResponse.cs
View file @
e12a00a8
...
...
@@ -7,6 +7,7 @@ namespace PSManagement.Contracts.Projects.Response
public
int
Id
{
get
;
set
;
}
public
int
HIASTId
{
get
;
set
;
}
public
int
UserId
{
get
;
set
;
}
public
string
Email
{
get
;
set
;
}
public
string
DepartmentName
{
get
;
set
;
}
public
PersonalInfo
PersonalInfo
{
get
;
set
;
}
public
Availability
Availability
{
get
;
set
;
}
...
...
PSManagement.Contracts/Projects/Requests/GetProjectsByProjectManagerRequest.cs
View file @
e12a00a8
namespace
PSManagement.Contracts.Projects.Requests
{
public
record
GetProjectsByProjectManagerRequest
(
int
ProjectManager
,
int
ProjectManager
Id
,
int
?
PageNumber
,
int
?
PageSize
);
...
...
PSManagement.Contracts/Projects/Response/ProjectDetailsResponse.cs
View file @
e12a00a8
...
...
@@ -12,6 +12,7 @@ namespace PSManagement.Contracts.Projects.Response
public
string
CurrentState
{
get
;
set
;
}
public
Aggreement
ProjectAggreement
{
get
;
set
;
}
public
ProjectClassification
ProjectClassification
{
get
;
set
;
}
public
EmployeeResponse
TeamLeader
{
get
;
set
;
}
public
EmployeeResponse
ProjectManager
{
get
;
set
;
}
public
Department
Executer
{
get
;
set
;
}
...
...
PSManagement.Contracts/Projects/Response/ProjectResponse.cs
View file @
e12a00a8
...
...
@@ -15,6 +15,7 @@ namespace PSManagement.Contracts.Projects.Response
public
Aggreement
ProjectAggreement
{
get
;
set
;
}
public
int
TeamLeaderId
{
get
;
set
;
}
public
ProjectClassification
ProjectClassification
{
get
;
set
;
}
public
EmployeeResponse
TeamLeader
{
get
;
set
;
}
public
int
ProjectManagerId
{
get
;
set
;
}
public
EmployeeResponse
ProjectManager
{
get
;
set
;
}
...
...
PSManagement.Contracts/Tracks/Requests/AddStepTrackRequest.cs
View file @
e12a00a8
...
...
@@ -10,7 +10,6 @@ namespace PSManagement.Contracts.Tracks.Requests
int
StepId
,
int
TrackId
,
string
ExecutionState
,
DateTime
TrackDate
,
int
TrackExecutionRatio
);
}
PSManagement.Contracts/Tracks/Response/EmployeeTrackResponse.cs
View file @
e12a00a8
using
PSManagement.Domain.Tracking.ValueObjects
;
using
PSManagement.Domain.Employees.Entities
;
namespace
PSManagement.Contracts.Tracks.Response
{
public
record
EmployeeTrackResponse
(
int
EmloyeeId
,
int
TrackId
,
Employee
Employee
,
TrackInfo
TrackInfo
,
EmployeeWorkInfo
EmployeeWorkInfo
,
EmployeeWork
EmployeeWork
,
...
...
PSManagement.Contracts/Tracks/Response/TrackResponse.cs
View file @
e12a00a8
using
PSManagement.Domain.Tracking.ValueObjects
;
using
PSManagement.Domain.Projects.ValueObjects
;
using
System
;
namespace
PSManagement.Contracts.Tracks.Response
...
...
@@ -7,6 +9,7 @@ namespace PSManagement.Contracts.Tracks.Response
int
Id
,
TrackInfo
TrackInfo
,
String
Notes
,
int
ProjectId
int
ProjectId
,
ProjectInfo
ProjectInfo
);
}
PSManagement.Domain/Projects/Entities/Step.cs
View file @
e12a00a8
...
...
@@ -28,8 +28,9 @@ namespace PSManagement.Domain.Projects.Entities
}
public
Step
(
StepInfo
stepInfo
,
int
projectId
,
int
weight
)
public
Step
(
StepInfo
stepInfo
,
int
projectId
,
int
currentCompletionRatio
,
int
weight
)
{
CurrentCompletionRatio
=
currentCompletionRatio
;
StepInfo
=
stepInfo
;
ProjectId
=
projectId
;
Weight
=
weight
;
...
...
PSManagement.Domain/Tracking/Entities/EmployeeTrack.cs
View file @
e12a00a8
...
...
@@ -6,7 +6,7 @@ namespace PSManagement.Domain.Tracking
{
public
class
EmployeeTrack
:
BaseEntity
{
public
int
EmloyeeId
{
get
;
set
;
}
public
int
Em
p
loyeeId
{
get
;
set
;
}
public
int
TrackId
{
get
;
set
;
}
public
Employee
Employee
{
get
;
set
;
}
public
Track
Track
{
get
;
set
;
}
...
...
PSManagement.Infrastructure.Persistence/EntitiesConfiguration/TrackEntityConfiguration.cs
View file @
e12a00a8
...
...
@@ -50,7 +50,7 @@ namespace PSManagement.Infrastructure.Persistence.EntitiesConfiguration
{
builder
.
HasOne
(
st
=>
st
.
Employee
)
.
WithMany
(
s
=>
s
.
EmployeeTracks
)
.
HasForeignKey
(
st
=>
st
.
EmloyeeId
)
.
HasForeignKey
(
st
=>
st
.
Em
p
loyeeId
)
;
builder
.
OwnsOne
(
e
=>
e
.
EmployeeWorkInfo
,
p
=>
...
...
PSManagement.Infrastructure.Persistence/Migrations/20240824174450_FixTrackNaming.Designer.cs
0 → 100644
View file @
e12a00a8
This diff is collapsed.
Click to expand it.
PSManagement.Infrastructure.Persistence/Migrations/20240824174450_FixTrackNaming.cs
0 → 100644
View file @
e12a00a8
using
Microsoft.EntityFrameworkCore.Migrations
;
namespace
PSManagement.Infrastructure.Persistence.Migrations
{
public
partial
class
FixTrackNaming
:
Migration
{
protected
override
void
Up
(
MigrationBuilder
migrationBuilder
)
{
migrationBuilder
.
DropForeignKey
(
name
:
"FK_EmployeeTrack_Employees_EmloyeeId"
,
table
:
"EmployeeTrack"
);
migrationBuilder
.
RenameColumn
(
name
:
"EmloyeeId"
,
table
:
"EmployeeTrack"
,
newName
:
"EmployeeId"
);
migrationBuilder
.
RenameIndex
(
name
:
"IX_EmployeeTrack_EmloyeeId"
,
table
:
"EmployeeTrack"
,
newName
:
"IX_EmployeeTrack_EmployeeId"
);
migrationBuilder
.
AddForeignKey
(
name
:
"FK_EmployeeTrack_Employees_EmployeeId"
,
table
:
"EmployeeTrack"
,
column
:
"EmployeeId"
,
principalTable
:
"Employees"
,
principalColumn
:
"Id"
,
onDelete
:
ReferentialAction
.
Cascade
);
}
protected
override
void
Down
(
MigrationBuilder
migrationBuilder
)
{
migrationBuilder
.
DropForeignKey
(
name
:
"FK_EmployeeTrack_Employees_EmployeeId"
,
table
:
"EmployeeTrack"
);
migrationBuilder
.
RenameColumn
(
name
:
"EmployeeId"
,
table
:
"EmployeeTrack"
,
newName
:
"EmloyeeId"
);
migrationBuilder
.
RenameIndex
(
name
:
"IX_EmployeeTrack_EmployeeId"
,
table
:
"EmployeeTrack"
,
newName
:
"IX_EmployeeTrack_EmloyeeId"
);
migrationBuilder
.
AddForeignKey
(
name
:
"FK_EmployeeTrack_Employees_EmloyeeId"
,
table
:
"EmployeeTrack"
,
column
:
"EmloyeeId"
,
principalTable
:
"Employees"
,
principalColumn
:
"Id"
,
onDelete
:
ReferentialAction
.
Cascade
);
}
}
}
PSManagement.Infrastructure.Persistence/Migrations/AppDbContextModelSnapshot.cs
View file @
e12a00a8
...
...
@@ -458,7 +458,7 @@ namespace PSManagement.Infrastructure.Persistence.Migrations
.
HasColumnType
(
"int"
)
.
HasAnnotation
(
"SqlServer:ValueGenerationStrategy"
,
SqlServerValueGenerationStrategy
.
IdentityColumn
);
b
.
Property
<
int
>(
"EmloyeeId"
)
b
.
Property
<
int
>(
"Em
p
loyeeId"
)
.
HasColumnType
(
"int"
);
b
.
Property
<
string
>(
"Notes"
)
...
...
@@ -469,7 +469,7 @@ namespace PSManagement.Infrastructure.Persistence.Migrations
b
.
HasKey
(
"Id"
);
b
.
HasIndex
(
"EmloyeeId"
);
b
.
HasIndex
(
"Em
p
loyeeId"
);
b
.
HasIndex
(
"TrackId"
);
...
...
@@ -1032,7 +1032,7 @@ namespace PSManagement.Infrastructure.Persistence.Migrations
{
b
.
HasOne
(
"PSManagement.Domain.Employees.Entities.Employee"
,
"Employee"
)
.
WithMany
(
"EmployeeTracks"
)
.
HasForeignKey
(
"EmloyeeId"
)
.
HasForeignKey
(
"Em
p
loyeeId"
)
.
OnDelete
(
DeleteBehavior
.
Cascade
)
.
IsRequired
();
...
...
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