refactor: serviceName

ainize-team · Sep 19, 2023 · c1f46c4 · c1f46c4
1 parent 264877c
commit c1f46c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/modules/admin.ts b/src/modules/admin.ts
@@ -52,13 +52,13 @@ export default class Admin extends ModuleBase {
    * @returns RequestData type.
    */
   getDataFromServiceRequest(req: Request) {
-    if(!req.body.valuePath[1] || !req.body.valuePath[3] || !req.body.valuePath[5] || !req.body.value.prompt) {
+    if(!req.body.valuePath[1] || !req.body.valuePath[3] || !req.body.valuePath[4] || !req.body.value.prompt) {
       throw new Error("Not from service request");
     }
     const requestData: request = {
       appName: req.body.valuePath[1],
       requesterAddress: req.body.auth.addr,
-      requestKey: req.body.valuePath[5],
+      requestKey: req.body.valuePath[4],
       requestData: req.body.value.prompt,
     }
     return requestData;

diff --git a/src/modules/app.ts b/src/modules/app.ts
@@ -237,8 +237,7 @@ export default class App extends ModuleBase {
           ".rule": {
             write: 
               "auth.addr === $userAddress && getValue(`/apps/" + `${appName}` + "/balance/` + $userAddress + `/balance`) !== null && " +
-              "(!util.isEmpty(getValue(`/apps/" + `${appName}` + "/billingConfig/minCost`))) && (getValue(`/apps/" + `${appName}` + "/balance/` + $userAddress + `/balance`)  >= getValue(`/apps/" + `${appName}` + "/billingConfig/minCost`)) || " +
-              "getValue(`/apps/" + `${appName}` + "/balance/` + $userAddress + `/balance`) >= getValue(`/apps/" + `${appName}` + "/billingConfig/service/default/minCost`)" 
+              "(!util.isEmpty(getValue(`/apps/" + `${appName}` + "/billingConfig/minCost`))) && (getValue(`/apps/" + `${appName}` + "/balance/` + $userAddress + `/balance`)  >= getValue(`/apps/" + `${appName}` + "/billingConfig/minCost`))"
           }
         }
       },