update config

Go-Marketplace · Dec 15, 2023 · ee1cf92 · ee1cf92
1 parent b83dc48
commit ee1cf92
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/cart/internal/usecase/cart.go b/cart/internal/usecase/cart.go
@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	cartTTL = 5 * time.Minute
+	cartTTL = 24 * time.Hour
 )
 
 type ICartUsecase interface {

diff --git a/config/cart.yml b/config/cart.yml
@@ -15,7 +15,7 @@ postgres:
   pg_url: 'postgres://postgres:root@cart_postgres:5432/postgres?sslmode=disable'
 
 worker:
-  cart_ttl: 5m
+  cart_ttl: 24h
   cart_task_worker_interval: 1s
 
 logger:

diff --git a/config/rbac/roles.json b/config/rbac/roles.json
@@ -40,16 +40,14 @@
     "ADMIN": [
         "ModerateProduct",
 
-        "GetCart",
-        "DeleteCart",
         "DeleteCartCartlines",
 
         "GetUserByEmail",
-        "GetUsers",
 
         "GetOrders"
     ],
     "SUPERADMIN": [
+        "GetUsers",
         "ChangeUserRole"
     ]
 }
diff --git a/order/internal/api/grpc/controller/order.go b/order/internal/api/grpc/controller/order.go
@@ -19,6 +19,8 @@ import (
 	"google.golang.org/grpc/status"
 )
 
+const maxCancellationTime = 24 * time.Hour
+
 func checkOrderAccessPermission(
 	ctx context.Context,
 	orderUsecase usecase.IOrderUsecase,
@@ -311,6 +313,10 @@ func DeleteOrder(
 		return status.Errorf(codes.NotFound, "Order not found")
 	}
 
+	if time.Since(order.CreatedAt) > maxCancellationTime {
+		return status.Errorf(codes.Canceled, "Maximum order cancellation time has been exceeded")
+	}
+
 	if err = orderUsecase.DeleteOrder(ctx, orderID); err != nil {
 		return status.Errorf(codes.Internal, "Failed to delete order: %s", err)
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ import ( @@
     )
     const (
-    	cartTTL = 5 * time.Minute
+    	cartTTL = 24 * time.Hour
     )
     type ICartUsecase interface {
@@ Expand Down @@