From 968542d80ee5b9fcca8b25b20591d86bda3cb73a Mon Sep 17 00:00:00 2001
From: Redm4x <2829180+Redm4x@users.noreply.github.com>
Date: Fri, 8 Dec 2023 11:04:45 -0500
Subject: [PATCH] Remove try/catch

---
 api/src/db/deploymentProvider.ts | 137 +++++++++++++++----------------
 1 file changed, 66 insertions(+), 71 deletions(-)

diff --git a/api/src/db/deploymentProvider.ts b/api/src/db/deploymentProvider.ts
index 6d763e5e2..c36a12a7a 100644
--- a/api/src/db/deploymentProvider.ts
+++ b/api/src/db/deploymentProvider.ts
@@ -71,81 +71,76 @@ export async function getDeploymentRelatedMessages(owner: string, dseq: string)
 }
 
 export async function getProviderDeployments(provider: string, skip: number, limit: number, status?: "active" | "closed") {
-  try {
-    let leaseFilter = { providerAddress: provider };
+  let leaseFilter = { providerAddress: provider };
 
-    if (status) {
-      leaseFilter["closedHeight"] = status === "active" ? null : { [Op.ne]: null };
-    }
+  if (status) {
+    leaseFilter["closedHeight"] = status === "active" ? null : { [Op.ne]: null };
+  }
 
-    const deploymentDseqs = await Deployment.findAll({
-      attributes: ["dseq"],
-      include: [{ model: Lease, required: true, where: leaseFilter }],
-      order: [["createdHeight", "DESC"]],
-      offset: skip,
-      limit: limit,
-      subQuery: false
-    });
+  const deploymentDseqs = await Deployment.findAll({
+    attributes: ["dseq"],
+    include: [{ model: Lease, required: true, where: leaseFilter }],
+    order: [["createdHeight", "DESC"]],
+    offset: skip,
+    limit: limit,
+    subQuery: false
+  });
 
-    const deployments = await Deployment.findAll({
-      where: {
-        dseq: { [Op.in]: deploymentDseqs.map((d) => d.dseq) }
+  const deployments = await Deployment.findAll({
+    where: {
+      dseq: { [Op.in]: deploymentDseqs.map((d) => d.dseq) }
+    },
+    include: [
+      {
+        model: Lease,
+        required: true,
+        where: { providerAddress: provider },
+        include: [
+          { model: Block, required: true, as: "createdBlock" },
+          { model: Block, required: false, as: "closedBlock" }
+        ]
       },
-      include: [
-        {
-          model: Lease,
-          required: true,
-          where: { providerAddress: provider },
-          include: [
-            { model: Block, required: true, as: "createdBlock" },
-            { model: Block, required: false, as: "closedBlock" }
-          ]
-        },
-        { model: Block, required: true, as: "createdBlock" },
-        { model: Block, required: false, as: "closedBlock" }
-      ]
-    });
+      { model: Block, required: true, as: "createdBlock" },
+      { model: Block, required: false, as: "closedBlock" }
+    ]
+  });
 
-    return deployments.map((d) => ({
-      owner: d.owner,
-      dseq: d.dseq,
-      denom: d.denom,
-      createdHeight: d.createdHeight,
-      createdDate: d.createdBlock.datetime,
-      closedHeight: d.closedHeight,
-      closedDate: d.closedHeight ? d.closedBlock.datetime : null,
-      status: d.closedHeight ? "closed" : "active",
-      balance: d.balance,
-      transferred: d.withdrawnAmount,
-      settledAt: d.lastWithdrawHeight,
+  return deployments.map((d) => ({
+    owner: d.owner,
+    dseq: d.dseq,
+    denom: d.denom,
+    createdHeight: d.createdHeight,
+    createdDate: d.createdBlock.datetime,
+    closedHeight: d.closedHeight,
+    closedDate: d.closedHeight ? d.closedBlock.datetime : null,
+    status: d.closedHeight ? "closed" : "active",
+    balance: d.balance,
+    transferred: d.withdrawnAmount,
+    settledAt: d.lastWithdrawHeight,
+    resources: {
+      cpu: d.leases.reduce((acc, l) => acc + l.cpuUnits, 0),
+      memory: d.leases.reduce((acc, l) => acc + l.memoryQuantity, 0),
+      gpu: d.leases.reduce((acc, l) => acc + l.gpuUnits, 0),
+      ephemeralStorage: d.leases.reduce((acc, l) => acc + l.ephemeralStorageQuantity, 0),
+      persistentStorage: d.leases.reduce((acc, l) => acc + l.persistentStorageQuantity, 0)
+    },
+    leases: d.leases.map((l) => ({
+      provider: l.providerAddress,
+      gseq: l.gseq,
+      oseq: l.oseq,
+      price: l.price,
+      createdHeight: l.createdHeight,
+      createdDate: l.createdBlock.datetime,
+      closedHeight: l.closedHeight,
+      closedDate: l.closedHeight ? l.closedBlock.datetime : null,
+      status: l.closedHeight ? "closed" : "active",
       resources: {
-        cpu: d.leases.reduce((acc, l) => acc + l.cpuUnits, 0),
-        memory: d.leases.reduce((acc, l) => acc + l.memoryQuantity, 0),
-        gpu: d.leases.reduce((acc, l) => acc + l.gpuUnits, 0),
-        ephemeralStorage: d.leases.reduce((acc, l) => acc + l.ephemeralStorageQuantity, 0),
-        persistentStorage: d.leases.reduce((acc, l) => acc + l.persistentStorageQuantity, 0)
-      },
-      leases: d.leases.map((l) => ({
-        provider: l.providerAddress,
-        gseq: l.gseq,
-        oseq: l.oseq,
-        price: l.price,
-        createdHeight: l.createdHeight,
-        createdDate: l.createdBlock.datetime,
-        closedHeight: l.closedHeight,
-        closedDate: l.closedHeight ? l.closedBlock.datetime : null,
-        status: l.closedHeight ? "closed" : "active",
-        resources: {
-          cpu: l.cpuUnits,
-          memory: l.memoryQuantity,
-          gpu: l.gpuUnits,
-          ephemeralStorage: l.ephemeralStorageQuantity,
-          persistentStorage: l.persistentStorageQuantity
-        }
-      }))
-    }));
-  } catch (e) {
-    console.error(e);
-    throw e;
-  }
+        cpu: l.cpuUnits,
+        memory: l.memoryQuantity,
+        gpu: l.gpuUnits,
+        ephemeralStorage: l.ephemeralStorageQuantity,
+        persistentStorage: l.persistentStorageQuantity
+      }
+    }))
+  }));
 }