Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/727 zep rest #62

Merged
merged 283 commits into from
Jun 7, 2024
Merged

Feature/727 zep rest #62

merged 283 commits into from
Jun 7, 2024

Conversation

sgartner03
Copy link
Contributor

Prerequisites: Always create two feature branches (frontend + backend) even if your feature only affects one of them

DEV:

Development

  • Acceptance tests by dev [OpenShift feature environment]
    • Moved to "Ready for review"

Review

  • Pull-request reviewed + approved (including Code Coverage) by reviewer [GitHub]
  • Inform dev after review through MEGA-PR (by reviewer) [Chat Space]
  • Version upgrade by dev [GitHub Issue Milestone + maven revision]
  • Merge to main by dev [GitHub]
    • Re-add SNAPSHOT to version and push on main [maven revision]
    • Make sure all feature branches are deleted [frontend + backend]
    • Moved to "Ready for deployment"

Deployment

  • Integration and Unit tests on main environment passed [Workflow]
  • Deployed to the test environment [GitOps Workflow triggered]
    • Moved to "Ready for testing"

PO:

Testing

  • Acceptance tests on the test enviroment passed
  • Inspected and approved
    • Moved to "Ready for release"

sgartner03 and others added 30 commits January 23, 2024 10:37
@sgartner03
[Gepardec/mega#727] EmployeeService getall with pagination
d7ca306
@sgartner03
Merge remote-tracking branch 'origin/feature/727-zep-rest' into featu…
a00316d 
…re/727-zep-rest
@sgartner03
[Gepardec/mega#727] Fixed broken import
5b8ddd3
@sgartner03
[Gepardec/mega#727] Added Tests for EmployeeService
9fcf6a1
@sgartner03
[Gepardec/mega#727] Fixed Unit Tests
3b07bca
@sgartner03
[Gepardec/mega#727] Added Projects
8ae16cb
@sgartner03
[Gepardec/mega#727] Fixed semicolon
bfcd40f
@sgartner03
[Gepardec/mega#727] Added ProjectService
d5115d8
@sgartner03
[Gepardec/mega#727] Added get project by name
f3e9d6e
@sgartner03
[Gepardec/mega#727] Added EmployeeType
b14a8ea
@sgartner03
[Gepardec/mega#727] Added get billable from employee
cb491ed
@sgartner03
[Gepardec/mega#727] Restructured client auth
57c08d5
@sgartner03
[Gepardec/mega#727] Mapper iface
41b9465
@tomeindl
[Gepardec/mega#727] implement a very basic paginator and the Attendan…
8face2e 
…ceService
@sgartner03
[Gepardec/mega#727] Deleted lombok from entities
faa7792
@sgartner03
Merge remote-tracking branch 'origin/feature/727-zep-rest' into featu…
f46c2eb 
…re/727-zep-rest
@sgartner03
[Gepardec/mega#727] Merge commit
06e7035
@sgartner03
[Gepardec/mega#727] Paginated services
4c488bd
@sgartner03
[Gepardec/mega#727] project by name in paginator
1a2f3e7
@sgartner03
[Gepardec/mega#727] Added pagination to EmploymentPeriodService
58f831c
@sgartner03
[Gepardec/mega#727] Implemented working methods in ZepRestService
b0aa1cf
@tomeindl
[Gepardec/mega#727] add an exception to the paginator
fe50f34 
implement a test for the getAttendanceForUserAndMonth function in the AttendanceService.
@sgartner03
[Gepardec/mega#727] Refactoring additional data structures and optionals
038da53
@sgartner03
Merge remote-tracking branch 'origin/feature/727-zep-rest' into featu…
8db0c91 
…re/727-zep-rest
@tomeindl
[Gepardec/mega#727] implement ProjectTimeMapper and tests
ba20d66 
rename test classes
@sgartner03
[Gepardec/mega#727] Fixed paginator empty condition
2225995
@tomeindl
[Gepardec/mega#727] close the mocked static paginator after test
69d7760
@sgartner03
[Gepardec/mega#727] Refined paginator and parseJson
8214e79
@sgartner03
Merge remote-tracking branch 'origin/feature/727-zep-rest' into featu…
6f7abcc 
…re/727-zep-rest
@tomeindl
[Gepardec/mega#727] ProjectEntryMapperTest
4f3cc4e
Ruhsi and others added 15 commits May 31, 2024 08:15
@Ruhsi
Merge pull request #67 from Gepardec/feature/747
de682e9 
Feature/747
@gattrCh
Merge branch 'feature/727-zep-rest' of https://github.com/Gepardec/me…
ee24f60 
…ga-backend into feature/748

# Conflicts:
#	src/test/java/com/gepardec/mega/rest/WorkerResourceTest.java
@gattrCh
[Gepardec/mega#748] merge 727-zep-rest and delete unused imports
f97a11d
@Ruhsi
Merge pull request #68 from Gepardec/feature/748
22502f5 
Feature/748
@tomeindl
fix a bug where total working times always returned total billable hours
67447cd
@gattrCh
[Gepardec/mega#750] add empty endpoint for all warnings of an employe…
79c2534 
…e and create object as well as dto
@gattrCh
[Gepardec/mega#750] add object mapper for warning objects
9ca0d57
@tomeindl
implement Query for Attendance with parameters userID AND projectID
2fec8ff
@tomeindl
Reminder to take a look at getProjectTimesForEmployeePerProject in th…
e67671b 
…e future
@sgartner03
[Gepardec/mega#727] Used enum instead of constant
ea7361a
@sgartner03
[Gepardec/mega#727] Fixed extractCorrectMonthFromGivenDate_thenCallPa…
8287f6e 
…ginator
@gattrCh
[Gepardec/mega#750] change WarningTypes due to new frontend and imple…
1b31b0d 
…ment time warning service
@gattrCh
[Gepardec/mega#750] change model, dto and mapper of time warning
f3827cf
@gattrCh
[Gepardec/mega#750] change model, dto and mapper of time warning
20b9a06
@gattrCh
[Gepardec/mega#750] add comment for clarification
7d2ae4f
tomeindl
tomeindl approved these changes Jun 5, 2024
View reviewed changes
Copy link
Contributor

@tomeindl tomeindl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

schaut soweit ich es beurteilen kann okay aus

@sgartner03 sgartner03 requested a review from Ruhsi June 5, 2024 08:39
gattrCh and others added 11 commits June 5, 2024 11:02
@gattrCh
[Gepardec/mega#750] add first test for time warning service
1112029
@gattrCh
[Gepardec/mega#750] rm unused imports
c74a3c8
@gattrCh
Merge branch 'main' into feature/727-zep-rest
78355f3 
# Conflicts:
#	src/main/java/com/gepardec/mega/zep/impl/ZepSoapServiceImpl.java
@gattrCh
[Gepardec/mega#727] change injectmocks to injectmock
5d5a4f0
@gattrCh
[Gepardec/mega#750] add further test method
eb6bf41
@gattrCh
[Gepardec/mega#750] rm unused imports
1371cc8
@gattrCh
[Gepardec/mega#750] add tests for workerresource - warningendpoint
0bdcc79
@gattrCh
[Gepardec/mega#750] small refactorings
2a27dd0
@gattrCh
[Gepardec/mega#750] small refactorings due to feedback in PR
98d1a3e
@gattrCh
Merge pull request #69 from Gepardec/feature/750
3bc1953
@tomeindl
Disable a AttendanceService test to make the rest pass again
d7931cb 
add todo to mock the ResponseParser in the AttendanceServiceTest in the future
@Ollitod Ollitod merged commit 81c8169 into main Jun 7, 2024
1 check passed
@Ollitod Ollitod deleted the feature/727-zep-rest branch June 7, 2024 10:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gattrCh gattrCh gattrCh left review comments

@tomeindl tomeindl tomeindl approved these changes

@Ollitod Ollitod Awaiting requested review from Ollitod

@Ruhsi Ruhsi Awaiting requested review from Ruhsi

Assignees

@sgartner03 sgartner03

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sgartner03 @Ruhsi @tomeindl @gattrCh @Ollitod