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

Dev to Prod #1207

Merged
merged 42 commits into from
Aug 7, 2023
Merged

Dev to Prod #1207

merged 42 commits into from
Aug 7, 2023

Conversation

ABbondar
Copy link
Contributor

@ABbondar ABbondar commented Aug 7, 2023

dev

JIRA

Code reviewers

  • @github_username

Second Level Review

  • @github_username

Summary of issue

ToDo

Summary of change

ToDo

Testing approach

ToDo

CHECK LIST

  • СI passed
  • Сode coverage >=95%
  • PR is reviewed manually again (to make sure you have 100% ready code)
  • All reviewers agreed to merge the PR
  • I've checked new feature as logged in and logged out user if needed
  • PR meets all conventions

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 12 commits July 14, 2023 15:29
* Changed to show only active locations

* fixed tests
#1196)

* OrderBagMapping created

* changed bag functionality logic

* added bag status active and deleted

* #5927 [UBS] endpoint that returns deactivated locations (#1133)

* add endpoint, update service and repo methods

* upd tests

* added formatting

* - changed redirect.green-city-client url (#1132)

* [UBS] - bug with manual payment #5940 (#1136)

* added bag status active and deleted

* changed tariff service crud methods and some order methods

* removed bagstatus
…age #6079 (#1198)

* order-address

* model-utils

* formatter

* code smells

* fix test

* formatter

* formatter

* imports

* vars names
… saved (#1202)

* added support for numeric characters and rejection of empty strings, added tests

* fixed code smell

* fixes
#1201)

* OrderBagMapping created

* changed bag functionality logic

* added bag status active and deleted

* #5927 [UBS] endpoint that returns deactivated locations (#1133)

* add endpoint, update service and repo methods

* - changed redirect.green-city-client url (#1132)

* [UBS] - bug with manual payment #5940 (#1136)

* added bag status active and deleted

* changed tariff service crud methods and some order methods

* Removed unnesesary methods from entity

* Added to tariff when delete status DEACTIVATED

* Separated sql from xml; changed to peek

* Bug delete tariff (#1200)
…ress themselves without using Google API #6139 (#1206)

* address request

* var name

* var name
@ABbondar ABbondar merged commit d01347d into prod Aug 7, 2023
ABbondar added a commit that referenced this pull request Aug 22, 2023
@ABbondar ABbondar mentioned this pull request Aug 22, 2023
ABbondar added a commit that referenced this pull request Aug 22, 2023
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.

6 participants