#5920 notofication for brought by himself orders #1245
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Maksym-Lenets
requested review from
Yurii-Midianyi,
ABbondar,
HelenSotnik,
ospodaryk,
LiliaMokhnatska and
2or5
|
Kudos, SonarCloud Quality Gate passed!
|
RomaMocherniuk
approved these changes
Oct 24, 2023
ABbondar
approved these changes
Oct 24, 2023
ospodaryk
approved these changes
Oct 24, 2023
2or5
approved these changes
Oct 24, 2023
Maksym-Lenets
deleted the
#5920-notofication-for-brought-by-himself-orders
branch
Yurii-Midianyi
added a commit
that referenced
this pull request
Nov 28, 2023
* addresses regexp (#1149) * Added UBS_EMPLOYEE to access notifications (#1148) * - unnecessary check removed (#1150) - extra test removed added new sql methods: deleteIfConfirmedQuantityIsZero() and deleteIfExportedQuantityIsZero() * #5978 [UBS] update notification templates (#1151) * updated notification templates * updated service and tests * fix test * update big_order_table (#1152) * changed repetitive strings on constants (#1154) * changed repetitive strings on constants * used maven formatter * created tests for OrderStatus * removed public modifier from the class name * changed format of the file * Fix code smell in table column width for employee test (#1158) * 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 * [API. Save order address] The API documentation includes an incorrect 200 status code, causing confusion and issues with data processing. #5461 (#1165) * remove default 200 OK response * imports * [API] [User Bonuses] Mistake in Swagger documentation #6027 Open (#1167) * remove default 403 response * formatter * [Admin. Orders] Missing of the option "Без менеджера/логіста/штурмана/водія" in the relevant filters #4239 (#1162) * filters for null ids * order page size * [Admin cabinet] Fixed nameEN in Position (#1166) * Replaced PositionWithTranslateDto with PositionDto * Fixed bug with errors and sign in * refactored method getPriceDetails in order to decrease its cognitive complexity (#1164) * added table params (#1170) * update GetEmployeeDto (#1171) * delete location endpoint (#1172) * Fix minor code smell in files (#1169) * 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 * refactored updateOrderAdminPageInfo to decrease its cognitive complexity (#1168) * refactored updateOrderAdminPageInfo to decrease its cognitive complexity * [UBS Address] User can choose districts on own (#1161) * 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 * updated changelog with new titles for notifications (#1174) * Resolved codeSmells in ViolationServiceImpl and UBSManagementEmployeeServiceImplTest (#1173) * Removed the unnecessary boolean literal and deleted one lambda in assertThrow * added more tests * added more test coverage * [Pick up city UBS.Admin Cabinet] “Return money” button in the "Order payment" section is disabled when admin cancels the order and selects the "Return money" option #5803 (#1176) * payment refund * fix bug * [Admin cabinet] Fix districts field (#1175) * 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 * [UBS user] Fix bug location (#1178) * Added remover for word область * Added remover for word область and region * Removed code smell * [UBS user] Fixed bugs with location (#1179) * Fixed bug with default address * Added new method and changed tests * delete unused endpoint (#1180) * [UBS user] Fix controller (#1183) * 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 * Revert "[UBS user] Fix controller (#1183)" (#1185) This reverts commit 32ae1ef. * [UBS User] Fix update user endpoint (#1186) * Fixed bug with update * Fixed bug in location * Fixed tests * fix bug with receivingStation empty (#1184) Co-authored-by: Nazar <[email protected]> * sender info in order (#1189) * [UBS_Prod. Tariff page] Changed to show only active locations (#1188) * Changed to show only active locations * fixed tests * used bonuses (#1190) * regions (#1191) * Revert "regions (#1191)" (#1192) This reverts commit c046bbb. * [Orders] After changing tariff the price of paid order is not changing (#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 * Revert "[Orders] After changing tariff the price of paid order is not changing (#1196)" (#1199) This reverts commit c020a53. * [UBS] Change region name when we save order address on user profile page #6079 (#1198) * order-address * model-utils * formatter * code smells * fix test * formatter * formatter * imports * vars names * #6125 Numeric data entered in the Name and Surname text fields is not saved (#1202) * added support for numeric characters and rejection of empty strings, added tests * fixed code smell * fixes * [Orders] After changing tariff the price of paid order is not changing (#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) * Revert "[Orders] After changing tariff the price of paid order is not changing (#1201)" (#1204) This reverts commit 4decde5. * addresses in order (#1205) * [UBS] - Add an option for the user to save the garbage collection address themselves without using Google API #6139 (#1206) * address request * var name * var name * Commit with change of max characters for Tariff Service Name from 30 to 255 (#1209) Co-authored-by: Helen Sotnik <[email protected]> * 5579 bug change tariff service name from30 to255 char (#1210) * Commit with change of max characters for Tariff Service Name from 30 to 255 * Commit with changes in db table service columns from 30 to 255 --------- Co-authored-by: Helen Sotnik <[email protected]> * Commit with changes columns length to 255 and validation max length in dto and entity (#1212) Co-authored-by: Helen Sotnik <[email protected]> * [UBS] - Exception occurs when we try to update order page admin info #6128 (#1203) * update order * update order and save reason * formatter * tests * formatting * code refactoring * code smells * suggested changes * required fields * [UBS] - Exception occurs when we try to update order page admin info #6128 (#1213) * update order * update order and save reason * formatter * tests * formatting * code refactoring * code smells * suggested changes * required fields * changed required fields for updating order * desc * formatter * tests * formatter * tests * desc * Revert "[UBS] - Exception occurs when we try to update order page admin info #6128 (#1213)" (#1215) This reverts commit ac2d69b. * update order params (#1216) * [Orders] After changing tariff the price of paid order is not changing (#1214) * 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 * Added to tariff when delete status DEACTIVATED * Separated sql from xml; changed to peek * Added tests to cover Bagstatus * Removed codesmell in BagStatusTest * added anotations not * deleted unnesessary anotations not * Fixed code in xml, replaced file in sql folder * Fixed merge conflicts and replaced files * Moved my import to end * Numerated correctly changeset+added ne file in changelog * [UBS Address] Fixed edit district (#1218) * Setted disctrict which come from dto * Formatted * Added tests to cover * Removed import * * Changed authorities (#1217) * Deleted concatenation <employee.getFirstName() + employee.getLastName()> (#1219) * Deleted concat <employee.getFirstName() + employee.getLastName()> * [Employee (Admin cabinet)] Add activate employee (#1220) * Added method to activate employee * Added error message * Added tests to cover new lines of code * fixed exception * Added tests to cover new lines of code * Added new methods to activate * Removed duplicate * fixed error messages * removed bug duplicates * used == for enums * formatted * added security config * added 404 ApiResponse possible * removed never used link * fixed javadoc * used EMPLOYEE_WITH_UUID_NOT_FOUND * Cnahged endpoint * [UBS User] The user can't make changes in user profile #6152 (#1225) * addresses * imports * code smells * address status * Added caching to LocationServiceApi (#1226) * added caching and splitted service to interface and implementations * Moved method to private from service * Delete ru (#1228) * Deleted all ru mentioning * Fixed changelog * [UBS Admin History] Fixed edit order (#1229) * Fixed method to work correct * Fixed tests to work correctly * delete unused endpoint (#1230) * Bug-employee-pagination-after-filtering (#1227) * Change in method initializeGetEmployeeDtoCollections (#1232) * 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]> * Bug employee positions get all mapping (#1233) * 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]> * Deleted unlogic method (#1235) * Added new user to system (#1234) * Added new user to system * Added precondition to user * Revert "Added new user to system (#1234)" (#1238) This reverts commit 900fa66. * Create greencity admin (#1237) * Added new user to system * #6521 Exception when updating unpaid order (#1236) * 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 * Commit with change regex for additionalOrders in OrderResponseDto (#1239) Co-authored-by: Lena Sotnik <[email protected]> * #4675 the issue of changing the status of an order from "Confirmed" to "On the route" (#1240) * specified ZoneId * updated test * removed unused imports * Commit with Orders sort and order cancelation (#1241) Co-authored-by: Lena Sotnik <[email protected]> * fixed time zone (#1242) * fixed time zone (#1244) * Commit with change value validation regex (#1243) Co-authored-by: Lena Sotnik <[email protected]> * Added setting of status (#1246) * #5920 notofication for brought by himself orders (#1245) * added notification sending * added tests * changed admin email (#1249) * create method save eng event to db (#1248) * 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 (#1248) * 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 * Update liqpay library * fix bug with translate events (#1259) --------- Co-authored-by: Anton Bondar <[email protected]> Co-authored-by: Oksana Spodaryk <[email protected]> Co-authored-by: Anatolii <[email protected]> Co-authored-by: Maksym <[email protected]> Co-authored-by: 2or5 <[email protected]> Co-authored-by: Nazar <[email protected]> Co-authored-by: HelenSotnik <[email protected]> Co-authored-by: Helen Sotnik <[email protected]> Co-authored-by: Lena Sotnik <[email protected]> Co-authored-by: VadymMakitra <[email protected]> Co-authored-by: Skyere <[email protected]>
Yurii-Midianyi
added a commit
that referenced
this pull request
Nov 28, 2023
* addresses regexp (#1149) * Added UBS_EMPLOYEE to access notifications (#1148) * - unnecessary check removed (#1150) - extra test removed added new sql methods: deleteIfConfirmedQuantityIsZero() and deleteIfExportedQuantityIsZero() * #5978 [UBS] update notification templates (#1151) * updated notification templates * updated service and tests * fix test * update big_order_table (#1152) * changed repetitive strings on constants (#1154) * changed repetitive strings on constants * used maven formatter * created tests for OrderStatus * removed public modifier from the class name * changed format of the file * Fix code smell in table column width for employee test (#1158) * 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 * [API. Save order address] The API documentation includes an incorrect 200 status code, causing confusion and issues with data processing. #5461 (#1165) * remove default 200 OK response * imports * [API] [User Bonuses] Mistake in Swagger documentation #6027 Open (#1167) * remove default 403 response * formatter * [Admin. Orders] Missing of the option "Без менеджера/логіста/штурмана/водія" in the relevant filters #4239 (#1162) * filters for null ids * order page size * [Admin cabinet] Fixed nameEN in Position (#1166) * Replaced PositionWithTranslateDto with PositionDto * Fixed bug with errors and sign in * refactored method getPriceDetails in order to decrease its cognitive complexity (#1164) * added table params (#1170) * update GetEmployeeDto (#1171) * delete location endpoint (#1172) * Fix minor code smell in files (#1169) * 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 * refactored updateOrderAdminPageInfo to decrease its cognitive complexity (#1168) * refactored updateOrderAdminPageInfo to decrease its cognitive complexity * [UBS Address] User can choose districts on own (#1161) * 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 * updated changelog with new titles for notifications (#1174) * Resolved codeSmells in ViolationServiceImpl and UBSManagementEmployeeServiceImplTest (#1173) * Removed the unnecessary boolean literal and deleted one lambda in assertThrow * added more tests * added more test coverage * [Pick up city UBS.Admin Cabinet] “Return money” button in the "Order payment" section is disabled when admin cancels the order and selects the "Return money" option #5803 (#1176) * payment refund * fix bug * [Admin cabinet] Fix districts field (#1175) * 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 * [UBS user] Fix bug location (#1178) * Added remover for word область * Added remover for word область and region * Removed code smell * [UBS user] Fixed bugs with location (#1179) * Fixed bug with default address * Added new method and changed tests * delete unused endpoint (#1180) * [UBS user] Fix controller (#1183) * 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 * Revert "[UBS user] Fix controller (#1183)" (#1185) This reverts commit 32ae1ef. * [UBS User] Fix update user endpoint (#1186) * Fixed bug with update * Fixed bug in location * Fixed tests * fix bug with receivingStation empty (#1184) Co-authored-by: Nazar <[email protected]> * sender info in order (#1189) * [UBS_Prod. Tariff page] Changed to show only active locations (#1188) * Changed to show only active locations * fixed tests * used bonuses (#1190) * regions (#1191) * Revert "regions (#1191)" (#1192) This reverts commit c046bbb. * [Orders] After changing tariff the price of paid order is not changing (#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 * Revert "[Orders] After changing tariff the price of paid order is not changing (#1196)" (#1199) This reverts commit c020a53. * [UBS] Change region name when we save order address on user profile page #6079 (#1198) * order-address * model-utils * formatter * code smells * fix test * formatter * formatter * imports * vars names * #6125 Numeric data entered in the Name and Surname text fields is not saved (#1202) * added support for numeric characters and rejection of empty strings, added tests * fixed code smell * fixes * [Orders] After changing tariff the price of paid order is not changing (#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) * Revert "[Orders] After changing tariff the price of paid order is not changing (#1201)" (#1204) This reverts commit 4decde5. * addresses in order (#1205) * [UBS] - Add an option for the user to save the garbage collection address themselves without using Google API #6139 (#1206) * address request * var name * var name * Commit with change of max characters for Tariff Service Name from 30 to 255 (#1209) Co-authored-by: Helen Sotnik <[email protected]> * 5579 bug change tariff service name from30 to255 char (#1210) * Commit with change of max characters for Tariff Service Name from 30 to 255 * Commit with changes in db table service columns from 30 to 255 --------- Co-authored-by: Helen Sotnik <[email protected]> * Commit with changes columns length to 255 and validation max length in dto and entity (#1212) Co-authored-by: Helen Sotnik <[email protected]> * [UBS] - Exception occurs when we try to update order page admin info #6128 (#1203) * update order * update order and save reason * formatter * tests * formatting * code refactoring * code smells * suggested changes * required fields * [UBS] - Exception occurs when we try to update order page admin info #6128 (#1213) * update order * update order and save reason * formatter * tests * formatting * code refactoring * code smells * suggested changes * required fields * changed required fields for updating order * desc * formatter * tests * formatter * tests * desc * Revert "[UBS] - Exception occurs when we try to update order page admin info #6128 (#1213)" (#1215) This reverts commit ac2d69b. * update order params (#1216) * [Orders] After changing tariff the price of paid order is not changing (#1214) * 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 * Added to tariff when delete status DEACTIVATED * Separated sql from xml; changed to peek * Added tests to cover Bagstatus * Removed codesmell in BagStatusTest * added anotations not * deleted unnesessary anotations not * Fixed code in xml, replaced file in sql folder * Fixed merge conflicts and replaced files * Moved my import to end * Numerated correctly changeset+added ne file in changelog * [UBS Address] Fixed edit district (#1218) * Setted disctrict which come from dto * Formatted * Added tests to cover * Removed import * * Changed authorities (#1217) * Deleted concatenation <employee.getFirstName() + employee.getLastName()> (#1219) * Deleted concat <employee.getFirstName() + employee.getLastName()> * [Employee (Admin cabinet)] Add activate employee (#1220) * Added method to activate employee * Added error message * Added tests to cover new lines of code * fixed exception * Added tests to cover new lines of code * Added new methods to activate * Removed duplicate * fixed error messages * removed bug duplicates * used == for enums * formatted * added security config * added 404 ApiResponse possible * removed never used link * fixed javadoc * used EMPLOYEE_WITH_UUID_NOT_FOUND * Cnahged endpoint * [UBS User] The user can't make changes in user profile #6152 (#1225) * addresses * imports * code smells * address status * Added caching to LocationServiceApi (#1226) * added caching and splitted service to interface and implementations * Moved method to private from service * Delete ru (#1228) * Deleted all ru mentioning * Fixed changelog * [UBS Admin History] Fixed edit order (#1229) * Fixed method to work correct * Fixed tests to work correctly * delete unused endpoint (#1230) * Bug-employee-pagination-after-filtering (#1227) * Change in method initializeGetEmployeeDtoCollections (#1232) * 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]> * Bug employee positions get all mapping (#1233) * 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]> * Deleted unlogic method (#1235) * Added new user to system (#1234) * Added new user to system * Added precondition to user * Revert "Added new user to system (#1234)" (#1238) This reverts commit 900fa66. * Create greencity admin (#1237) * Added new user to system * #6521 Exception when updating unpaid order (#1236) * 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 * Commit with change regex for additionalOrders in OrderResponseDto (#1239) Co-authored-by: Lena Sotnik <[email protected]> * #4675 the issue of changing the status of an order from "Confirmed" to "On the route" (#1240) * specified ZoneId * updated test * removed unused imports * Commit with Orders sort and order cancelation (#1241) Co-authored-by: Lena Sotnik <[email protected]> * fixed time zone (#1242) * fixed time zone (#1244) * Commit with change value validation regex (#1243) Co-authored-by: Lena Sotnik <[email protected]> * Added setting of status (#1246) * #5920 notofication for brought by himself orders (#1245) * added notification sending * added tests * changed admin email (#1249) * create method save eng event to db (#1248) * 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 (#1248) * 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 * Update liqpay library * fix bug with translate events (#1259) --------- Co-authored-by: Anton Bondar <[email protected]> Co-authored-by: Oksana Spodaryk <[email protected]> Co-authored-by: Anatolii <[email protected]> Co-authored-by: Maksym <[email protected]> Co-authored-by: 2or5 <[email protected]> Co-authored-by: Nazar <[email protected]> Co-authored-by: HelenSotnik <[email protected]> Co-authored-by: Helen Sotnik <[email protected]> Co-authored-by: Lena Sotnik <[email protected]> Co-authored-by: VadymMakitra <[email protected]> Co-authored-by: Skyere <[email protected]>
Yurii-Midianyi
added a commit
that referenced
this pull request
Nov 28, 2023
* addresses regexp (#1149) * Added UBS_EMPLOYEE to access notifications (#1148) * - unnecessary check removed (#1150) - extra test removed added new sql methods: deleteIfConfirmedQuantityIsZero() and deleteIfExportedQuantityIsZero() * #5978 [UBS] update notification templates (#1151) * updated notification templates * updated service and tests * fix test * update big_order_table (#1152) * changed repetitive strings on constants (#1154) * changed repetitive strings on constants * used maven formatter * created tests for OrderStatus * removed public modifier from the class name * changed format of the file * Fix code smell in table column width for employee test (#1158) * 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 * [API. Save order address] The API documentation includes an incorrect 200 status code, causing confusion and issues with data processing. #5461 (#1165) * remove default 200 OK response * imports * [API] [User Bonuses] Mistake in Swagger documentation #6027 Open (#1167) * remove default 403 response * formatter * [Admin. Orders] Missing of the option "Без менеджера/логіста/штурмана/водія" in the relevant filters #4239 (#1162) * filters for null ids * order page size * [Admin cabinet] Fixed nameEN in Position (#1166) * Replaced PositionWithTranslateDto with PositionDto * Fixed bug with errors and sign in * refactored method getPriceDetails in order to decrease its cognitive complexity (#1164) * added table params (#1170) * update GetEmployeeDto (#1171) * delete location endpoint (#1172) * Fix minor code smell in files (#1169) * 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 * refactored updateOrderAdminPageInfo to decrease its cognitive complexity (#1168) * refactored updateOrderAdminPageInfo to decrease its cognitive complexity * [UBS Address] User can choose districts on own (#1161) * 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 * updated changelog with new titles for notifications (#1174) * Resolved codeSmells in ViolationServiceImpl and UBSManagementEmployeeServiceImplTest (#1173) * Removed the unnecessary boolean literal and deleted one lambda in assertThrow * added more tests * added more test coverage * [Pick up city UBS.Admin Cabinet] “Return money” button in the "Order payment" section is disabled when admin cancels the order and selects the "Return money" option #5803 (#1176) * payment refund * fix bug * [Admin cabinet] Fix districts field (#1175) * 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 * [UBS user] Fix bug location (#1178) * Added remover for word область * Added remover for word область and region * Removed code smell * [UBS user] Fixed bugs with location (#1179) * Fixed bug with default address * Added new method and changed tests * delete unused endpoint (#1180) * [UBS user] Fix controller (#1183) * 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 * Revert "[UBS user] Fix controller (#1183)" (#1185) This reverts commit 32ae1ef. * [UBS User] Fix update user endpoint (#1186) * Fixed bug with update * Fixed bug in location * Fixed tests * fix bug with receivingStation empty (#1184) Co-authored-by: Nazar <[email protected]> * sender info in order (#1189) * [UBS_Prod. Tariff page] Changed to show only active locations (#1188) * Changed to show only active locations * fixed tests * used bonuses (#1190) * regions (#1191) * Revert "regions (#1191)" (#1192) This reverts commit c046bbb. * [Orders] After changing tariff the price of paid order is not changing (#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 * Revert "[Orders] After changing tariff the price of paid order is not changing (#1196)" (#1199) This reverts commit c020a53. * [UBS] Change region name when we save order address on user profile page #6079 (#1198) * order-address * model-utils * formatter * code smells * fix test * formatter * formatter * imports * vars names * #6125 Numeric data entered in the Name and Surname text fields is not saved (#1202) * added support for numeric characters and rejection of empty strings, added tests * fixed code smell * fixes * [Orders] After changing tariff the price of paid order is not changing (#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) * Revert "[Orders] After changing tariff the price of paid order is not changing (#1201)" (#1204) This reverts commit 4decde5. * addresses in order (#1205) * [UBS] - Add an option for the user to save the garbage collection address themselves without using Google API #6139 (#1206) * address request * var name * var name * Commit with change of max characters for Tariff Service Name from 30 to 255 (#1209) Co-authored-by: Helen Sotnik <[email protected]> * 5579 bug change tariff service name from30 to255 char (#1210) * Commit with change of max characters for Tariff Service Name from 30 to 255 * Commit with changes in db table service columns from 30 to 255 --------- Co-authored-by: Helen Sotnik <[email protected]> * Commit with changes columns length to 255 and validation max length in dto and entity (#1212) Co-authored-by: Helen Sotnik <[email protected]> * [UBS] - Exception occurs when we try to update order page admin info #6128 (#1203) * update order * update order and save reason * formatter * tests * formatting * code refactoring * code smells * suggested changes * required fields * [UBS] - Exception occurs when we try to update order page admin info #6128 (#1213) * update order * update order and save reason * formatter * tests * formatting * code refactoring * code smells * suggested changes * required fields * changed required fields for updating order * desc * formatter * tests * formatter * tests * desc * Revert "[UBS] - Exception occurs when we try to update order page admin info #6128 (#1213)" (#1215) This reverts commit ac2d69b. * update order params (#1216) * [Orders] After changing tariff the price of paid order is not changing (#1214) * 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 * Added to tariff when delete status DEACTIVATED * Separated sql from xml; changed to peek * Added tests to cover Bagstatus * Removed codesmell in BagStatusTest * added anotations not * deleted unnesessary anotations not * Fixed code in xml, replaced file in sql folder * Fixed merge conflicts and replaced files * Moved my import to end * Numerated correctly changeset+added ne file in changelog * [UBS Address] Fixed edit district (#1218) * Setted disctrict which come from dto * Formatted * Added tests to cover * Removed import * * Changed authorities (#1217) * Deleted concatenation <employee.getFirstName() + employee.getLastName()> (#1219) * Deleted concat <employee.getFirstName() + employee.getLastName()> * [Employee (Admin cabinet)] Add activate employee (#1220) * Added method to activate employee * Added error message * Added tests to cover new lines of code * fixed exception * Added tests to cover new lines of code * Added new methods to activate * Removed duplicate * fixed error messages * removed bug duplicates * used == for enums * formatted * added security config * added 404 ApiResponse possible * removed never used link * fixed javadoc * used EMPLOYEE_WITH_UUID_NOT_FOUND * Cnahged endpoint * [UBS User] The user can't make changes in user profile #6152 (#1225) * addresses * imports * code smells * address status * Added caching to LocationServiceApi (#1226) * added caching and splitted service to interface and implementations * Moved method to private from service * Delete ru (#1228) * Deleted all ru mentioning * Fixed changelog * [UBS Admin History] Fixed edit order (#1229) * Fixed method to work correct * Fixed tests to work correctly * delete unused endpoint (#1230) * Bug-employee-pagination-after-filtering (#1227) * Change in method initializeGetEmployeeDtoCollections (#1232) * 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]> * Bug employee positions get all mapping (#1233) * 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]> * Deleted unlogic method (#1235) * Added new user to system (#1234) * Added new user to system * Added precondition to user * Revert "Added new user to system (#1234)" (#1238) This reverts commit 900fa66. * Create greencity admin (#1237) * Added new user to system * #6521 Exception when updating unpaid order (#1236) * 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 * Commit with change regex for additionalOrders in OrderResponseDto (#1239) Co-authored-by: Lena Sotnik <[email protected]> * #4675 the issue of changing the status of an order from "Confirmed" to "On the route" (#1240) * specified ZoneId * updated test * removed unused imports * Commit with Orders sort and order cancelation (#1241) Co-authored-by: Lena Sotnik <[email protected]> * fixed time zone (#1242) * fixed time zone (#1244) * Commit with change value validation regex (#1243) Co-authored-by: Lena Sotnik <[email protected]> * Added setting of status (#1246) * #5920 notofication for brought by himself orders (#1245) * added notification sending * added tests * changed admin email (#1249) * create method save eng event to db (#1248) * 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 (#1248) * 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 * Update liqpay library * fix bug with translate events (#1259) * deleted clone tests and used checkstyle * deleted coloned tests --------- Co-authored-by: Anton Bondar <[email protected]> Co-authored-by: Oksana Spodaryk <[email protected]> Co-authored-by: Anatolii <[email protected]> Co-authored-by: Maksym <[email protected]> Co-authored-by: 2or5 <[email protected]> Co-authored-by: Nazar <[email protected]> Co-authored-by: HelenSotnik <[email protected]> Co-authored-by: Helen Sotnik <[email protected]> Co-authored-by: Lena Sotnik <[email protected]> Co-authored-by: VadymMakitra <[email protected]> Co-authored-by: Skyere <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary Of Issue :
Notification is not sent to the user after the order status is changed to 'Brought by himself'
Issue Link
ita-social-projects/GreenCity#5920
Summary Of Changes :
CHECK LIST
devbranch.