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
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
736f44d
addresses regexp (#1149)
ABbondar Jun 24, 2023
e28e931
Added UBS_EMPLOYEE to access notifications (#1148)
ospodaryk Jun 26, 2023
24c3917
- unnecessary check removed (#1150)
Markiro1 Jun 26, 2023
f87ba60
#5978 [UBS] update notification templates (#1151)
Maksym-Lenets Jun 27, 2023
e0b7006
update big_order_table (#1152)
Maksym-Lenets Jun 27, 2023
af9fd12
changed repetitive strings on constants (#1154)
Yurii-Midianyi Jun 30, 2023
ca4240d
Fix code smell in table column width for employee test (#1158)
Yurii-Midianyi Jul 3, 2023
3a3c514
[API. Save order address] The API documentation includes an incorrect…
ABbondar Jul 3, 2023
e84a157
[API] [User Bonuses] Mistake in Swagger documentation #6027 Open (#1167)
ABbondar Jul 3, 2023
63c2f2d
[Admin. Orders] Missing of the option "Без менеджера/логіста/штурмана…
ABbondar Jul 4, 2023
bffd6d6
[Admin cabinet] Fixed nameEN in Position (#1166)
ospodaryk Jul 4, 2023
b69e08e
refactored method getPriceDetails in order to decrease its cognitive …
Yurii-Midianyi Jul 4, 2023
02d2305
added table params (#1170)
ABbondar Jul 4, 2023
cf1aad8
update GetEmployeeDto (#1171)
Maksym-Lenets Jul 5, 2023
1d4e95e
delete location endpoint (#1172)
ABbondar Jul 5, 2023
90c59d4
Fix minor code smell in files (#1169)
Yurii-Midianyi Jul 5, 2023
95cd5ad
refactored updateOrderAdminPageInfo to decrease its cognitive complex…
Yurii-Midianyi Jul 6, 2023
799da3a
[UBS Address] User can choose districts on own (#1161)
ospodaryk Jul 6, 2023
ee0f657
updated changelog with new titles for notifications (#1174)
Maksym-Lenets Jul 7, 2023
a25748a
Resolved codeSmells in ViolationServiceImpl and UBSManagementEmployee…
Yurii-Midianyi Jul 9, 2023
98291d7
[Pick up city UBS.Admin Cabinet] “Return money” button in the "Order …
ABbondar Jul 10, 2023
e9f66a6
[Admin cabinet] Fix districts field (#1175)
ospodaryk Jul 11, 2023
614673e
[UBS user] Fix bug location (#1178)
ospodaryk Jul 11, 2023
dbb3464
[UBS user] Fixed bugs with location (#1179)
ospodaryk Jul 12, 2023
63262f9
delete unused endpoint (#1180)
ABbondar Jul 12, 2023
32ae1ef
[UBS user] Fix controller (#1183)
ospodaryk Jul 13, 2023
b1ad430
Revert "[UBS user] Fix controller (#1183)" (#1185)
ospodaryk Jul 13, 2023
2622da0
[UBS User] Fix update user endpoint (#1186)
ospodaryk Jul 14, 2023
b14fb9c
fix bug with receivingStation empty (#1184)
2or5 Jul 14, 2023
2121323
sender info in order (#1189)
ABbondar Jul 14, 2023
0dec700
[UBS_Prod. Tariff page] Changed to show only active locations (#1188)
ospodaryk Jul 14, 2023
62bffe9
used bonuses (#1190)
ABbondar Jul 18, 2023
c046bbb
regions (#1191)
ABbondar Jul 18, 2023
526cca7
Revert "regions (#1191)" (#1192)
ABbondar Jul 19, 2023
c020a53
[Orders] After changing tariff the price of paid order is not changin…
ospodaryk Jul 25, 2023
d1dc1a4
Revert "[Orders] After changing tariff the price of paid order is not…
ospodaryk Jul 26, 2023
2097a33
[UBS] Change region name when we save order address on user profile p…
ABbondar Jul 27, 2023
2da2493
#6125 Numeric data entered in the Name and Surname text fields is not…
Maksym-Lenets Jul 31, 2023
4decde5
[Orders] After changing tariff the price of paid order is not changin…
ospodaryk Jul 31, 2023
d11d585
Revert "[Orders] After changing tariff the price of paid order is not…
ospodaryk Jul 31, 2023
0903928
addresses in order (#1205)
ABbondar Aug 7, 2023
fc17bc4
[UBS] - Add an option for the user to save the garbage collection add…
ABbondar Aug 7, 2023
0b7c954
Commit with change of max characters for Tariff Service Name from 30 …
HelenSotnik Aug 7, 2023
cee8928
5579 bug change tariff service name from30 to255 char (#1210)
HelenSotnik Aug 7, 2023
1f1058a
Commit with changes columns length to 255 and validation max length i…
HelenSotnik Aug 9, 2023
aa9ecbf
[UBS] - Exception occurs when we try to update order page admin info …
ABbondar Aug 11, 2023
ac2d69b
[UBS] - Exception occurs when we try to update order page admin info …
ABbondar Aug 14, 2023
c2db044
Revert "[UBS] - Exception occurs when we try to update order page adm…
ABbondar Aug 14, 2023
1c35404
update order params (#1216)
ABbondar Aug 15, 2023
54f14e6
[Orders] After changing tariff the price of paid order is not changin…
ospodaryk Aug 16, 2023
f4abcaf
[UBS Address] Fixed edit district (#1218)
ospodaryk Aug 18, 2023
15d5ee4
Changed authorities (#1217)
ospodaryk Aug 18, 2023
879b6d4
Deleted concatenation <employee.getFirstName() + employee.getLastName…
ospodaryk Aug 21, 2023
ceb4294
[Employee (Admin cabinet)] Add activate employee (#1220)
ospodaryk Aug 22, 2023
3b6e9f9
[UBS User] The user can't make changes in user profile #6152 (#1225)
ABbondar Aug 28, 2023
538999b
Added caching to LocationServiceApi (#1226)
ospodaryk Aug 30, 2023
b1f9d6c
Delete ru (#1228)
ospodaryk Sep 8, 2023
b927735
[UBS Admin History] Fixed edit order (#1229)
ospodaryk Sep 8, 2023
6a05e6f
delete unused endpoint (#1230)
ABbondar Sep 11, 2023
290131d
Bug-employee-pagination-after-filtering (#1227)
HelenSotnik Sep 12, 2023
00134b0
Change in method initializeGetEmployeeDtoCollections (#1232)
HelenSotnik Sep 13, 2023
b36f072
Bug employee positions get all mapping (#1233)
HelenSotnik Sep 13, 2023
e42b5a8
Deleted unlogic method (#1235)
ospodaryk Oct 5, 2023
900fa66
Added new user to system (#1234)
ospodaryk Oct 5, 2023
d2f8368
Revert "Added new user to system (#1234)" (#1238)
ospodaryk Oct 6, 2023
d711114
Create greencity admin (#1237)
ospodaryk Oct 6, 2023
5986433
#6521 Exception when updating unpaid order (#1236)
Maksym-Lenets Oct 9, 2023
4fd8219
Commit with change regex for additionalOrders in OrderResponseDto (#1…
HelenSotnik Oct 13, 2023
cdcd88c
#4675 the issue of changing the status of an order from "Confirmed" t…
Maksym-Lenets Oct 17, 2023
e315cab
Commit with Orders sort and order cancelation (#1241)
HelenSotnik Oct 17, 2023
74209e3
fixed time zone (#1242)
Maksym-Lenets Oct 17, 2023
37a4933
fixed time zone (#1244)
Maksym-Lenets Oct 19, 2023
f9cc0e6
Commit with change value validation regex (#1243)
HelenSotnik Oct 20, 2023
0faae69
Added setting of status (#1246)
ospodaryk Oct 24, 2023
0e2c6e2
#5920 notofication for brought by himself orders (#1245)
Maksym-Lenets Oct 24, 2023
67b0dc4
changed admin email (#1249)
Yurii-Midianyi Nov 13, 2023
efe5c21
create method save eng event to db (#1248)
2or5 Nov 15, 2023
d52b548
create method save eng event to db (#1248)
2or5 Nov 15, 2023
7cc72a9
Update liqpay library
Skyere Nov 24, 2023
0ef928f
fix bug with translate events (#1259)
2or5 Nov 27, 2023
26292fc
resolved merge conflicts
Yurii-Midianyi Nov 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Changed authorities (#1217)
ospodaryk authored Aug 18, 2023
commit 15d5ee4a593fc4f0541e1c4feb6ff4151be7ca71
22 changes: 11 additions & 11 deletions core/src/main/java/greencity/controller/SuperAdminController.java
Original file line number Diff line number Diff line change
@@ -125,7 +125,7 @@ public ResponseEntity<List<GetTariffServiceDto>> getTariffService(
@ApiResponse(code = 403, message = HttpStatuses.FORBIDDEN),
@ApiResponse(code = 404, message = HttpStatuses.NOT_FOUND)
})
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_PRICE_CARD', authentication)")
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_DEACTIVATE_PRICING_CARD', authentication)")
@DeleteMapping("/deleteTariffService/{id}")
public ResponseEntity<HttpStatus> deleteTariffService(
@Valid @PathVariable Integer id) {
@@ -151,7 +151,7 @@ public ResponseEntity<HttpStatus> deleteTariffService(
@ApiResponse(code = 403, message = HttpStatuses.FORBIDDEN),
@ApiResponse(code = 404, message = HttpStatuses.NOT_FOUND)
})
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_PRICE_CARD', authentication)")
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_DEACTIVATE_PRICING_CARD', authentication)")
@PutMapping("/editTariffService/{id}")
public ResponseEntity<GetTariffServiceDto> editTariffService(
@Valid @RequestBody TariffServiceDto dto,
@@ -357,7 +357,7 @@ public ResponseEntity<HttpStatus> addLocation(
@ApiResponse(code = 403, message = HttpStatuses.FORBIDDEN),
@ApiResponse(code = 404, message = HttpStatuses.NOT_FOUND)
})
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_LOCATION_CARD', authentication)")
@PreAuthorize("@preAuthorizer.hasAuthority('DELETE_LOCATION', authentication)")
@DeleteMapping("/deleteLocation/{id}")
public ResponseEntity<HttpStatus> deleteLocation(@PathVariable Long id) {
superAdminService.deleteLocation(id);
@@ -377,7 +377,7 @@ public ResponseEntity<HttpStatus> deleteLocation(@PathVariable Long id) {
@ApiResponse(code = 401, message = HttpStatuses.UNAUTHORIZED),
@ApiResponse(code = 403, message = HttpStatuses.FORBIDDEN)
})
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_LOCATION_CARD', authentication)")
@PreAuthorize("@preAuthorizer.hasAuthority('DELETE_LOCATION', authentication)")
@PatchMapping("/activeLocations/{id}")
public ResponseEntity<HttpStatus> activeLocation(
@PathVariable Long id) {
@@ -496,7 +496,7 @@ public ResponseEntity<ReceivingStationDto> createReceivingStation(@Valid AddingR
@ApiResponse(code = 404, message = HttpStatuses.NOT_FOUND),
@ApiResponse(code = 422, message = HttpStatuses.UNPROCESSABLE_ENTITY)
})
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DESTINATION_NAME', authentication)")
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_STATION', authentication)")
@PutMapping("/update-receiving-station")
public ResponseEntity<ReceivingStationDto> updateReceivingStation(@RequestBody @Valid ReceivingStationDto dto) {
return ResponseEntity.status(HttpStatus.OK).body(superAdminService.updateReceivingStation(dto));
@@ -530,7 +530,7 @@ public ResponseEntity<List<ReceivingStationDto>> getAllReceivingStation() {
@ApiResponse(code = 403, message = HttpStatuses.FORBIDDEN),
@ApiResponse(code = 404, message = HttpStatuses.NOT_FOUND)
})
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DESTINATION_NAME', authentication)")
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_STATION', authentication)")
@DeleteMapping("/delete-receiving-station/{id}")
public ResponseEntity<HttpStatus> deleteReceivingStation(@PathVariable Long id) {
superAdminService.deleteReceivingStation(id);
@@ -614,7 +614,7 @@ public ResponseEntity<Boolean> checkIfTariffExists(
@ApiResponse(code = 404, message = HttpStatuses.NOT_FOUND),
@ApiResponse(code = 409, message = HttpStatuses.CONFLICT)
})
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_PRICE_CARD', authentication)")
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_DEACTIVATE_PRICING_CARD', authentication)")
@PutMapping("/editTariffInfo/{id}")
public ResponseEntity<HttpStatus> editTariff(
@Valid @PathVariable Long id, @Valid @RequestBody EditTariffDto dto) {
@@ -632,7 +632,7 @@ public ResponseEntity<HttpStatus> editTariff(
* @author Julia Seti
*/
@ApiOperation(value = "Set tariff limits")
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_PRICE_CARD', authentication)")
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_DEACTIVATE_PRICING_CARD', authentication)")
@ApiResponses(value = {
@ApiResponse(code = 200, message = HttpStatuses.OK),
@ApiResponse(code = 400, message = HttpStatuses.BAD_REQUEST),
@@ -679,7 +679,7 @@ public ResponseEntity<GetTariffLimitsDto> getTariffLimits(
* @author Julia Seti
*/
@ApiOperation(value = "Switch tariff activation status by tariff id")
@PreAuthorize("@preAuthorizer.hasAuthority('DEACTIVATE_PRICING_CARD', authentication)")
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_DEACTIVATE_PRICING_CARD', authentication)")
@ApiResponses(value = {
@ApiResponse(code = 200, message = HttpStatuses.OK),
@ApiResponse(code = 400, message = HttpStatuses.BAD_REQUEST),
@@ -709,7 +709,7 @@ public ResponseEntity<HttpStatus> switchTariffStatus(
@ApiResponse(code = 401, message = HttpStatuses.UNAUTHORIZED),
@ApiResponse(code = 403, message = HttpStatuses.FORBIDDEN)
})
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_LOCATION_CARD', authentication)")
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_LOCATION', authentication)")
@PutMapping("tariffs/{id}/locations/change-status")
public ResponseEntity<HttpStatus> changeLocationsInTariffStatus(@PathVariable Long id,
@Valid @RequestBody ChangeTariffLocationStatusDto dto, @RequestParam String status) {
@@ -735,7 +735,7 @@ public ResponseEntity<HttpStatus> changeLocationsInTariffStatus(@PathVariable Lo
@ApiResponse(code = 403, message = HttpStatuses.FORBIDDEN),
@ApiResponse(code = 404, message = HttpStatuses.NOT_FOUND)
})
@PreAuthorize("@preAuthorizer.hasAuthority('DEACTIVATE_PRICING_CARD', authentication)")
@PreAuthorize("@preAuthorizer.hasAuthority('EDIT_DELETE_DEACTIVATE_PRICING_CARD', authentication)")
@PostMapping("/deactivate")
public ResponseEntity<HttpStatus> switchActivationStatusByChosenParams(
@RequestParam(name = "regionsIds", required = false) Optional<List<Long>> regionsIds,