Skip to content

Commit 0710e83

Browse files
lanhlungboiz045lanhlungboiz045
committed
Merge branch 'inventory' into dev
2 parents 4377c5f + a4df80a commit 0710e83

File tree

71 files changed

+168
-163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+168
-163
lines changed

‎backend/src/main/java/com/smalltrend/controller/CRM/TicketController.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ public class TicketController {
2626
private final UserRepository userRepository;
2727

2828
@GetMapping("/tickets")
29-
@PreAuthorize("hasAnyRole('ADMIN', 'MANAGER', 'CASHIER')")
29+
@PreAuthorize("hasAnyAuthority('ADMIN','ROLE_ADMIN','MANAGER','ROLE_MANAGER','CASHIER','ROLE_CASHIER','INVENTORY_STAFF','ROLE_INVENTORY_STAFF','SALES_STAFF','ROLE_SALES_STAFF')")
3030
public ResponseEntity<List<TicketResponse>> getAllTickets() {
3131
List<TicketResponse> tickets = ticketService.getAllTickets();
3232
return ResponseEntity.ok(tickets);
3333
}
3434

3535
@GetMapping("/tickets/{id}")
36-
@PreAuthorize("hasAnyRole('ADMIN', 'MANAGER', 'CASHIER')")
36+
@PreAuthorize("hasAnyAuthority('ADMIN','ROLE_ADMIN','MANAGER','ROLE_MANAGER','CASHIER','ROLE_CASHIER','INVENTORY_STAFF','ROLE_INVENTORY_STAFF','SALES_STAFF','ROLE_SALES_STAFF')")
3737
public ResponseEntity<TicketResponse> getTicketById(@PathVariable("id") Long id) {
3838
TicketResponse ticket = ticketService.getTicketById(id);
3939
return ResponseEntity.ok(ticket);
4040
}
4141

4242
@PostMapping("/tickets")
43-
@PreAuthorize("hasAnyRole('ADMIN', 'CASHIER')")
43+
@PreAuthorize("hasAnyAuthority('ADMIN','ROLE_ADMIN','MANAGER','ROLE_MANAGER','CASHIER','ROLE_CASHIER','INVENTORY_STAFF','ROLE_INVENTORY_STAFF','SALES_STAFF','ROLE_SALES_STAFF')")
4444
public ResponseEntity<?> createTicket(@RequestBody CreateTicketRequest request) {
4545
try {
4646
TicketResponse ticket = ticketService.createTicket(request);
@@ -53,7 +53,7 @@ public ResponseEntity<?> createTicket(@RequestBody CreateTicketRequest request)
5353
}
5454

5555
@PutMapping("/tickets/{id}")
56-
@PreAuthorize("hasAnyRole('ADMIN', 'CASHIER')")
56+
@PreAuthorize("hasAnyAuthority('ADMIN','ROLE_ADMIN','MANAGER','ROLE_MANAGER','CASHIER','ROLE_CASHIER','INVENTORY_STAFF','ROLE_INVENTORY_STAFF','SALES_STAFF','ROLE_SALES_STAFF')")
5757
public ResponseEntity<TicketResponse> updateTicket(
5858
@PathVariable("id") Long id,
5959
@RequestBody UpdateTicketRequest request) {
@@ -88,8 +88,8 @@ public ResponseEntity<List<Map<String, Object>>> getUsersByRole(@PathVariable("r
8888
}
8989

9090
/**
91-
* Lookup product variant by SKU — for refund restock.
92-
* Delegates to service to keep transaction open for lazy-loaded collections.
91+
* Lookup product variant by SKU — for refund restock. Delegates to service
92+
* to keep transaction open for lazy-loaded collections.
9393
*/
9494
@GetMapping("/tickets/lookup/variant-by-sku")
9595
@PreAuthorize("hasAnyRole('ADMIN', 'CASHIER', 'MANAGER', 'SALES_STAFF')")

backend/src/main/java/com/smalltrend/controller/inventory/InventoryCountController.java renamed to backend/src/main/java/com/smalltrend/controller/inventory/count/InventoryCountController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.smalltrend.controller.inventory;
1+
package com.smalltrend.controller.inventory.count;
22

3-
import com.smalltrend.dto.inventory.inventorycount.InventoryCountRequest;
4-
import com.smalltrend.dto.inventory.inventorycount.InventoryCountResponse;
5-
import com.smalltrend.service.inventory.InventoryCountService;
3+
import com.smalltrend.dto.inventory.count.InventoryCountRequest;
4+
import com.smalltrend.dto.inventory.count.InventoryCountResponse;
5+
import com.smalltrend.service.inventory.count.InventoryCountService;
66
import jakarta.validation.Valid;
77
import lombok.RequiredArgsConstructor;
88
import org.springframework.http.ResponseEntity;

backend/src/main/java/com/smalltrend/controller/inventory/InventoryDashboardController.java renamed to backend/src/main/java/com/smalltrend/controller/inventory/dashboard/InventoryDashboardController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.smalltrend.controller.inventory;
1+
package com.smalltrend.controller.inventory.dashboard;
22

33
import com.smalltrend.dto.inventory.dashboard.*;
4-
import com.smalltrend.service.inventory.InventoryDashboardService;
4+
import com.smalltrend.service.inventory.dashboard.InventoryDashboardService;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.http.ResponseEntity;
77
import org.springframework.jdbc.core.JdbcTemplate;

backend/src/main/java/com/smalltrend/controller/inventory/DisposalVoucherController.java renamed to backend/src/main/java/com/smalltrend/controller/inventory/disposal/DisposalVoucherController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.smalltrend.controller.inventory;
1+
package com.smalltrend.controller.inventory.disposal;
22

33
import com.smalltrend.dto.inventory.disposal.*;
4-
import com.smalltrend.service.inventory.DisposalVoucherService;
4+
import com.smalltrend.service.inventory.disposal.DisposalVoucherService;
55
import jakarta.validation.Valid;
66
import lombok.RequiredArgsConstructor;
77
import org.springframework.http.ResponseEntity;

backend/src/main/java/com/smalltrend/controller/inventory/LocationController.java renamed to backend/src/main/java/com/smalltrend/controller/inventory/location/LocationController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.smalltrend.controller.inventory;
1+
package com.smalltrend.controller.inventory.location;
22

33
import com.smalltrend.dto.inventory.location.FullLocationResponse;
44
import com.smalltrend.dto.inventory.location.LocationRequest;
55
import com.smalltrend.dto.inventory.location.LocationStockItemResponse;
66
import com.smalltrend.dto.inventory.location.LocationTransferRequest;
7-
import com.smalltrend.service.inventory.LocationService;
7+
import com.smalltrend.service.inventory.location.LocationService;
88
import jakarta.validation.Valid;
99
import org.springframework.http.HttpStatus;
1010
import org.springframework.http.ResponseEntity;

backend/src/main/java/com/smalltrend/controller/inventory/PurchaseOrderController.java renamed to backend/src/main/java/com/smalltrend/controller/inventory/purchase/PurchaseOrderController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.smalltrend.controller.inventory;
1+
package com.smalltrend.controller.inventory.purchase;
22

33
import com.smalltrend.dto.common.MessageResponse;
4-
import com.smalltrend.dto.inventory.purchaseorder.*;
4+
import com.smalltrend.dto.inventory.purchase.*;
55
import com.smalltrend.dto.inventory.dashboard.*;
6-
import com.smalltrend.service.inventory.PurchaseOrderService;
6+
import com.smalltrend.service.inventory.purchase.PurchaseOrderService;
77
import jakarta.validation.Valid;
88
import lombok.RequiredArgsConstructor;
99
import org.springframework.security.access.prepost.PreAuthorize;

backend/src/main/java/com/smalltrend/controller/inventory/SupplierContractController.java renamed to backend/src/main/java/com/smalltrend/controller/inventory/purchase/SupplierContractController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smalltrend.controller.inventory;
1+
package com.smalltrend.controller.inventory.purchase;
22

33
import com.smalltrend.entity.SupplierContract;
44
import com.smalltrend.entity.enums.ContractStatus;

backend/src/main/java/com/smalltrend/controller/inventory/SupplierController.java renamed to backend/src/main/java/com/smalltrend/controller/inventory/purchase/SupplierController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smalltrend.controller.inventory;
1+
package com.smalltrend.controller.inventory.purchase;
22

33
import com.smalltrend.dto.supplier.SupplierDTO;
44
import com.smalltrend.service.SupplierService;

backend/src/main/java/com/smalltrend/controller/inventory/InventoryStockController.java renamed to backend/src/main/java/com/smalltrend/controller/inventory/shared/InventoryStockController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.smalltrend.controller.inventory;
1+
package com.smalltrend.controller.inventory.shared;
22

33
import com.smalltrend.dto.inventory.StockAdjustRequest;
44
import com.smalltrend.dto.inventory.StockImportRequest;
5-
import com.smalltrend.service.inventory.InventoryStockService;
5+
import com.smalltrend.service.inventory.shared.InventoryStockService;
66
import jakarta.validation.Valid;
77
import lombok.RequiredArgsConstructor;
88
import org.springframework.http.ResponseEntity;

backend/src/main/java/com/smalltrend/dto/inventory/inventorycount/InventoryCountItemRequest.java renamed to backend/src/main/java/com/smalltrend/dto/inventory/count/InventoryCountItemRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.smalltrend.dto.inventory.inventorycount;
1+
package com.smalltrend.dto.inventory.count;
22

33
import jakarta.validation.constraints.Min;
44
import jakarta.validation.constraints.NotNull;

0 commit comments

Comments
 (0)