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.

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

Raise the prod #1261

Merged
merged 81 commits into from
Nov 28, 2023
Merged

Raise the prod #1261

merged 81 commits into from
Nov 28, 2023

Conversation

Yurii-Midianyi
Copy link
Contributor

@Yurii-Midianyi Yurii-Midianyi commented Nov 28, 2023

resolve merge conflicts

ABbondar and others added 30 commits June 24, 2023 11:58
- extra test removed
added new sql methods:
deleteIfConfirmedQuantityIsZero() and deleteIfExportedQuantityIsZero()
* updated notification templates

* updated service and tests

* fix test
* changed repetitive strings on constants

* used maven formatter

* created tests for OrderStatus

* removed public modifier from the class name

* changed format of the file
* refactored test to fix code smell and added coverage

* refactored issues with code styling

* deleted unused library

* changed name for constants according to the code conventions

* fixed method imports from library
… 200 status code, causing confusion and issues with data processing. #5461 (#1165)

* remove default 200 OK response

* imports
…/водія" in the relevant filters #4239 (#1162)

* filters for null ids

* order page size
* Replaced PositionWithTranslateDto with PositionDto

* Fixed bug with errors and sign in
* deleted unused libraries

* deleted unused variable authorities and used immediate return instead

* added testing for FeignClientCallAsync

* added test coverage for JwtTool

* deleted public access modifier from class and test methods
…ity (#1168)

* refactored updateOrderAdminPageInfo to decrease its cognitive complexity
* Added dto to work with data

* Added methods to get Districts from City

* Added necessary error messages

* Added tests to all function

* Added endpoint to method

* Added javadoc to method
…ServiceImplTest (#1173)

* Removed the unnecessary boolean literal and deleted one lambda in assertThrow

* added more tests

* added more test coverage
…payment" section is disabled when admin cancels the order and selects the "Return money" option #5803 (#1176)

* payment refund

* fix bug
* Created Dto to Districts to return just name

* Added mapper to map LocationDto to DistrictDto

* Adedd new field to AddressExportDetailsDto

* Added mapper and tests to it

* Fixed all bugs+added mapper to get districts
* Added remover for word область

* Added remover for word область and region

* Removed code smell
* Fixed bug with default address

* Added new method and changed tests
* Remove from AddressDto list of all districts in that adress

* Fixed OrderWithAddressesResponseDto to return list with districts

* changed in UserProfileDto field from AddressDto To AddressWIthDIstrcitsDto

* deleted unused lines
* Fixed bug with update

* Fixed bug in location

* Fixed tests
ospodaryk and others added 26 commits August 30, 2023 13:24
* added caching and splitted service to interface and implementations

* Moved method to private from service
* Deleted all ru mentioning

* Fixed changelog
* Fixed method to work correct

* Fixed tests to work correctly
* Commit with change in method initializeGetEmployeeDtoCollections

* Update service/src/main/java/greencity/service/ubs/UBSManagementEmployeeServiceImpl.java

Co-authored-by: VadymMakitra <[email protected]>

* Commit with added import to UBSManagementEmployeeServiceImpl class

---------

Co-authored-by: Lena Sotnik <[email protected]>
Co-authored-by: VadymMakitra <[email protected]>
* Commit with change in method initializeGetEmployeeDtoCollections

* Update service/src/main/java/greencity/service/ubs/UBSManagementEmployeeServiceImpl.java

Co-authored-by: VadymMakitra <[email protected]>

* Commit with added import to UBSManagementEmployeeServiceImpl class

* Commit with change to ArrayList

---------

Co-authored-by: Lena Sotnik <[email protected]>
Co-authored-by: VadymMakitra <[email protected]>
* Added new user to system

* Added precondition to user
* Added new user to system
* updated order entity added tests

* added new check to controller updated tests

* fixes

* formatter

* update javadoc added check to Order

* updated tests

* removed useless code

* updated test

* fixed test

* fixed test

* updated issues
…o "On the route" (#1240)

* specified ZoneId

* updated test

* removed unused imports
* added notification sending

* added tests
* create method save eng event to db

* create tests

* change log

* test

* test2

* fix code smells

* add doc

* ref code

* ref code2

* ref code3

* ref code4
* create method save eng event to db

* create tests

* change log

* test

* test2

* fix code smells

* add doc

* ref code

* ref code2

* ref code3

* ref code4
@Yurii-Midianyi Yurii-Midianyi merged commit 1e553e3 into prod Nov 28, 2023
@Yurii-Midianyi Yurii-Midianyi deleted the raise_the_prod branch November 28, 2023 13:52
@Yurii-Midianyi Yurii-Midianyi restored the raise_the_prod branch November 28, 2023 14:32
@Yurii-Midianyi Yurii-Midianyi deleted the raise_the_prod branch November 28, 2023 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants