octopian-apis 1.0.32 → 1.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "octopian-apis",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "description": "Transaction APIs SDK that implements Octopian Services which will be used for any node project typescript or javascript",
   "main": "./src/index.js",
   "scripts": {

package/src/darAlBerServices/requestsServices.js

@@ -66,7 +66,10 @@ import { TransactionsAPIConstants } from "../web-services/darAlBerConstants";
  *            BatchRequestAttributeList: BatchRequestAttributeList[]}
  *     }
  */
-export async function DABAgentGetCartDefinition(AuthToken = null, Timeout = 30000) {
+export async function DABAgentGetCartDefinition(
+  AuthToken = null,
+  Timeout = 30000
+) {
   let APIResponse = await apiHandler.GetMethod(
     RequestsAPIConstants.uriAgentGetCartDefinition(),
     AuthToken,
@@ -163,7 +166,7 @@ export async function DABAgentAddRequest(
  *    GroupCartParticipantDetailId?: number (Optional),
  *    GroupCartId?: number (Optional),
  *    GroupCartGuid?: guid string (Optional)
- * 
+ *
  * @param {string} AuthToken
  * Authentication token for authorization purposes.
  *
@@ -304,7 +307,7 @@ export async function DABAgentCancelRequest(
  *     IsByAgent: string (Optional),
  *     BatchId: string (Optional),
  *     SpecificRequestIdList: number[] (Optional)
- * 
+ *
  * @param {string} AuthToken
  * Authentication token for authorization purposes.
  *
@@ -663,7 +666,11 @@ export async function DABGetCartDefinition(AuthToken = null, Timeout = 30000) {
  * }
  * }
  */
-export async function DABAddRequest(AddRequestDTO, AuthToken = null, Timeout = 30000) {
+export async function DABAddRequest(
+  AddRequestDTO,
+  AuthToken = null,
+  Timeout = 30000
+) {
   let APIResponse = await apiHandler.PostMethod(
     RequestsAPIConstants.uriAddRequest(),
     AddRequestDTO,
@@ -682,7 +689,7 @@ export async function DABAddRequest(AddRequestDTO, AuthToken = null, Timeout = 3
  *    BillingAddressId: number
  *    PaymentMethod: string
  *    ... other fields as needed
- * 
+ *
  * @param {string} AuthToken
  * Authentication token for authorization purposes.
  *
@@ -698,7 +705,11 @@ export async function DABAddRequest(AddRequestDTO, AuthToken = null, Timeout = 3
  *   Result: number
  *  }
  */
-export async function DABSubmitCart(SubmitCartDTO, AuthToken = null, Timeout = 30000) {
+export async function DABSubmitCart(
+  SubmitCartDTO,
+  AuthToken = null,
+  Timeout = 30000
+) {
   let APIResponse = await apiHandler.PostMethod(
     RequestsAPIConstants.uriSubmitCart(),
     SubmitCartDTO,
@@ -763,7 +774,7 @@ export async function DABGetMyRequestList(
   GetMyRequestListDTO,
   AuthToken = null,
   Timeout = 30000,
-  RequiredHeaderValue=null
+  RequiredHeaderValue = null
 ) {
   let APIResponse = await apiHandler.PostMethod(
     RequestsAPIConstants.uriGetMyRequestList(),
@@ -779,18 +790,9 @@ export async function DABGetMyDonations(
   GetMyRequestListDTO,
   AuthToken = null,
   Timeout = 30000,
-  RequiredHeaderValue=null
+  RequiredHeaderValue = null
 ) {
-  const servicesList = await apiHandler.PostMethod(
-    TransactionsAPIConstants.uriGetServiceList(),
-    { PageSize: 1000, PageIndex: 0 },
-    AuthToken,
-    Timeout,
-    RequiredHeaderValue,
-    true
-  );
-  
-  GetMyRequestListDTO['WithRequestAttribute']=true;
+  GetMyRequestListDTO["WithRequestAttribute"] = true;
   let requestsList = await apiHandler.PostMethod(
     RequestsAPIConstants.uriGetMyRequestList(),
     GetMyRequestListDTO,
@@ -798,12 +800,54 @@ export async function DABGetMyDonations(
     Timeout,
     RequiredHeaderValue
   );
-if(requestsList.Result.length>0){
-  requestsList.Result.forEach(request => {
-    request['ServiceAlias']=servicesList.Result.find(service => service.ServiceId === request.ServiceId)?.Alias;
-    request['Amount']=request.RequestAttributeList.find(attribute => attribute.Alias=== 'Amount')?.Value;
-  });
-}
+  if (requestsList.Result.length > 0) {
+    const servicesList = await apiHandler.PostMethod(
+      TransactionsAPIConstants.uriGetServiceList(),
+      { PageSize: 1000, PageIndex: 0 },
+      AuthToken,
+      Timeout,
+      RequiredHeaderValue,
+      true
+    );
+   for(let request of requestsList.Result){
+     
+        let asset = null;
+        if (request.AssetId && request.AssetId > 0) {
+          try 
+          {
+
+          let assetList = await apiHandler.PostMethod(
+            TransactionsAPIConstants.uriGetServiceAssetList(),
+            { PageSize: 100, PageIndex: 0, ServiceId: request.ServiceId },
+            AuthToken,
+            Timeout,
+            RequiredHeaderValue,
+            true
+          )
+          if(assetList?.StatusCode==200){
+          for (let asset of assetList?.Result) {
+          asset = asset?.Assetlist?.find(
+            (asset) => asset.AssetId === request.AssetId
+          );
+          }
+        }
+      }
+      catch(error){
+        //console.log(error);
+      }
+      }
+      request["ServiceAlias"] = servicesList?.Result?.find(
+        (service) => service.ServiceId === request.ServiceId
+      )?.Alias;
+      request["Amount"] = request.RequestAttributeList.find(
+        (attribute) => attribute.Alias === "Amount"
+      )?.Value;
+      request["Description"] = request.RequestAttributeList.find(
+        (attribute) => attribute.Alias === "Description"
+      )?.Value;
+      request["AssetImagePath"] = asset?.FullImagePath || "";
+    }
+  }
   return requestsList;
 }
 /**
@@ -862,7 +906,7 @@ export async function DABGetServiceOwnerRequestList(
   ServiceOwnerRequestDTO,
   AuthToken = null,
   Timeout = 30000,
-  RequiredHeaderValue=null
+  RequiredHeaderValue = null
 ) {
   let APIResponse = await apiHandler.PostMethod(
     RequestsAPIConstants.uriGetServiceOwnerRequestList(),
@@ -1017,7 +1061,11 @@ export async function DABGetMyRequestCommentList(
  *   StatusCode: 200,
  *   Result: boolean
  */
-export async function DABPostComment(PostCommentDTO, AuthToken = null, Timeout = 30000) {
+export async function DABPostComment(
+  PostCommentDTO,
+  AuthToken = null,
+  Timeout = 30000
+) {
   let APIResponse = await apiHandler.PostMethod(
     RequestsAPIConstants.uriPostComment(),
     PostCommentDTO,
@@ -1144,10 +1192,7 @@ export async function DABGetLastOrderDetail(
  *   }
  * }
  */
-export async function DABDashboardWidget(
-  AuthToken = null,
-  Timeout = 30000
-) {
+export async function DABDashboardWidget(AuthToken = null, Timeout = 30000) {
   let APIResponse = await apiHandler.GetMethod(
     RequestsAPIConstants.uriDashboardWidget(),
     AuthToken,
@@ -1365,7 +1410,11 @@ export async function DABReorderTrackableBatch(
  *   Result: TrackableBatchRequestList[]
  * }
  */
-export async function DABTrackBatch(TrackBatchDTO, AuthToken = null, Timeout = 30000) {
+export async function DABTrackBatch(
+  TrackBatchDTO,
+  AuthToken = null,
+  Timeout = 30000
+) {
   let APIResponse = await apiHandler.PostMethod(
     RequestsAPIConstants.uriTrackBatch(),
     TrackBatchDTO,
@@ -1486,7 +1535,11 @@ export async function DABEditBatchHeaders(
  *   Result: orderList[]
  * }
  */
-export async function DABGetGroupOrder(GroupOrderDTO, AuthToken = null, Timeout = 30000) {
+export async function DABGetGroupOrder(
+  GroupOrderDTO,
+  AuthToken = null,
+  Timeout = 30000
+) {
   let APIResponse = await apiHandler.PostMethod(
     RequestsAPIConstants.uriGetGroupOrder(),
     GroupOrderDTO,
@@ -1623,7 +1676,10 @@ export async function DABLeaveGroupOrder(
  *   Result: ActiveGroupOrderDtoList[]
  * }
  */
-export async function DABGetMyActiveGroupOrderList(AuthToken = null, Timeout = 30000) {
+export async function DABGetMyActiveGroupOrderList(
+  AuthToken = null,
+  Timeout = 30000
+) {
   let APIResponse = await apiHandler.PostMethod(
     RequestsAPIConstants.uriGetMyActiveGroupOrderList(),
     null,

package/src/modals/output-modals/request-modals/GetMyRequestGroupedOutput.ts

@@ -80,6 +80,7 @@ export interface GetMyRequestOutput {
   InteractorId: number
   InteractorName: string
   Amount: string
+  Description: string
   UnitName: string
   IsByAgent: boolean
   RequestAgentId: number
@@ -101,6 +102,7 @@ export interface GetMyRequestOutput {
   AssetGroupName: string
   AssetSubGroupName: string
   AssetName: string
+  AssetImagePath: string
   RequestStatusId: number
   SubmitDate: string
   FinishDate: string