refactor: add req,res type

src/modules/admin.ts

@@ -3,7 +3,7 @@ import { Request } from "express";
 import ModuleBase from "./moduleBase";
 import DepositService from "./service/depositService";
 import UseService from "./service/useService";
-import { RESPONSE_STATUS } from "../types/type";
+import { RESPONSE_STATUS, request, response } from "../types/type";
 
 export default class Admin extends ModuleBase {
   private depositService: DepositService;
@@ -50,27 +50,31 @@ export default class Admin extends ModuleBase {
    * @returns Result of transaction.
    */
   async writeResponse(req:Request, amount: number, responseData: string, status: RESPONSE_STATUS ) {
-    const appName = req.body.valuePath[1];
-    const serviceName = req.body.valuePath[3];
-    const requesterAddress = req.body.auth.addr;
-    const requestKey = req.body.valuePath[5];
-    return await this.useService.writeResponse(status , appName, serviceName, requesterAddress, requestKey, responseData, amount);
+    const requestData = this.getDataFromServiceRequest(req);
+    const response: response = {
+      status: status,
+      amount: amount,
+      responseData: responseData,
+      ...requestData,
+    }
+    return await this.useService.writeResponse(response);
   }
     /**
    * Get data from service request. You should use it only with service trigger.
    * @param {Request} request - Request data from request trigger. If req data is not from trigger function, it will throw error.
-   * @returns Object with appName, serviceName, requesterAddress, requestKey, responseData.
+   * @returns RequestData type.
    */
   getDataFromServiceRequest(req: Request) {
     if(!req.body.valuePath[1] || !req.body.valuePath[3] || !req.body.valuePath[5] || !req.body.value.prompt) {
       throw new Error("Not from service request");
     }
-    return {
+    const requestData: request = {
       appName: req.body.valuePath[1],
       serviceName: req.body.valuePath[3],
       requesterAddress: req.body.auth.addr,
       requestKey: req.body.valuePath[5],
-      responseData: req.body.value.prompt,
+      requestData: req.body.value.prompt,
     }
+    return requestData;
   }
-}
+}

src/modules/service/useService.ts

@@ -1,6 +1,6 @@
 import { SetOperation } from "@ainblockchain/ain-js/lib/types";
 import { Path } from "../../constants";
-import { HISTORY_TYPE, RESPONSE_STATUS } from "../../types/type";
+import { HISTORY_TYPE, RESPONSE_STATUS, response } from "../../types/type";
 import { buildSetOperation } from "../../utils/builder";
 import ServiceBase from "./serviceBase";
 
@@ -40,7 +40,8 @@ export default class UseService extends ServiceBase{
     return amount;
   }
 
-  async writeResponse(status: RESPONSE_STATUS, appName: string, serviceName: string, requesterAddress: string, requestKey: string, responseData: string, amount: number) {
+  async writeResponse(response: response) {
+    const { responseData, status, requesterAddress, requestKey, appName, serviceName, amount } = response;
     const responsePath = Path.app(appName).response(serviceName, requesterAddress, requestKey);
     const responseValue = {
       status,

src/types/type.ts

@@ -17,10 +17,10 @@ export type setRuleParam = {
 } & writeRuleConfig;
 
 export type serviceBillingConfig = {
-    costPerToken: number;
-    minCost: number;
-    maxCost?: number;
-    responseTimeout?: number;
+  costPerToken: number;
+  minCost: number;
+  maxCost?: number;
+  responseTimeout?: number;
 }
 
 export type appBillingConfig = {
@@ -54,3 +54,22 @@ export enum RESPONSE_STATUS {
   SUCCESS = "SUCCESS",
   FAIL = "FAIL",
 }
+
+export type request = {
+  requestData: string,
+  requesterAddress: string,
+  requestKey: string,
+  serviceName: string,
+  appName: string,
+};
+
+export type response = {
+  responseData: string,
+  amount: number,
+  status: RESPONSE_STATUS,
+  requestData: string,
+  requesterAddress: string,
+  requestKey: string,
+  appName: string,
+  serviceName: string,
+}