Merge pull request #361 from icefoganalytics/test

Blocking delete of funding request if it has disbursements

Author: datajohnson

src/api/routes/admin/application-router.ts

@@ -905,13 +905,20 @@ applicationRouter.delete(
         return res.status(404).send({ messages: [{ variant: "error", text: "The record does not exits" }] });
       }
 
-      await db("sfa.disbursement").where({ funding_request_id: id }).del();
-      await db("sfa.assessment").where({ funding_request_id: id }).del();
-      const deleteRecord: any = await db("sfa.funding_request").where({ id: id }).del();
+      const disbursements = await db("sfa.disbursement").where({ funding_request_id: id })
 
-      return deleteRecord > 0
-        ? res.status(202).send({ messages: [{ variant: "success", text: "Removed" }] })
-        : res.status(404).send({ messages: [{ variant: "error", text: "Record does not exits" }] });
+      if (disbursements.length > 0) {
+        return res.status(400).json({
+          messages: [{ variant: "error", text: "This funding request has disbursements and cannot be deleted" }],
+        });
+      }
+
+      await db.transaction(async (trx) => {
+        //await trx("sfa.disbursement").where({ funding_request_id: id }).delete();
+        await trx("sfa.assessment").where({ funding_request_id: id }).delete();
+        await trx("sfa.funding_request").where({ id }).delete();
+        return res.status(202).send({ messages: [{ variant: "success", text: "Removed" }] });
+      });
     } catch (error: any) {
       console.log(error);
 

src/web/src/components/application/sfa-funding-requests/student-training-allowance/StudentTrainingAllowance.vue

@@ -303,7 +303,7 @@ export default {
           this.$emit("showError", message.text);
         }
       } catch (error) {
-        this.$emit("showError", "Error to delete");
+        this.$emit("showError", error.response?.data?.messages[0]?.text || "Error deleting funding request");
       } finally {
         store.dispatch("loadApplication", this.application.id);
       }