Merge pull request #31 from input-output-hk/NPG-9147

feat: Round budget requirements.
input-output-hk · Jul 15, 2024 · 8fd9f16 · 8fd9f16
2 parents d0a24a6 + dbaf22e
commit 8fd9f16
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/milestone-tracker-frontend/src/components/forms/NewSom.vue b/milestone-tracker-frontend/src/components/forms/NewSom.vue
@@ -93,7 +93,7 @@ const otherSomsBudget = computed(() => {
   const missingMilestones = milestonesIndex.filter(m => !otherSoms.value.map(o => o.milestone).includes(m))
   missingMilestones.forEach((m) => {
     if (m !== props.milestone) {
-      const cost = (m === lastMilestone) ? props.proposal.budget * 0.15 : props.proposal.budget * 0.05
+      const cost = (m === lastMilestone) ? Math.floor(props.proposal.budget * 0.15) : Math.floor(props.proposal.budget * 0.05)
       definedCost = definedCost + cost
     }
   })

diff --git a/milestone-tracker-frontend/src/utils/milestones.js b/milestone-tracker-frontend/src/utils/milestones.js
@@ -218,12 +218,19 @@ const canAllSomsBeSignedOffByReviews = (soms, fundId) => {
 }
 
 const isPreviousSomSignedOff = (soms, currentSom) => {
-  if (currentSom.milestone === 1) {
-    return true
-  }
-  const previousMl = soms.find((s) => s.milestone === currentSom.milestone - 1)
-  if (previousMl) {
-    return previousMl.signoffs.length > 0
+  if (currentSom) {
+    if (currentSom.milestone === 1) {
+      return true
+    }
+    const previousMl = soms.find((s) => {
+      if (s) {
+        return s.milestone === currentSom.milestone - 1
+      }
+      return false
+    })
+    if (previousMl) {
+      return previousMl.signoffs.length > 0
+    }
   }
   return false
 }
@@ -237,7 +244,7 @@ const maxCostF9 = (proposal, otherSomsBudget, isLastMilestone) => {
     const availableBudget = proposal.budget - otherSomsBudget
     const maxMilestoneBudget = parseFloat(env.VITE_MAX_MILESTONE_BUDGET)
     const budgetRule = Math.min(
-      (proposal.budget * maxMilestoneBudget), availableBudget
+      Math.ceil(proposal.budget * maxMilestoneBudget), availableBudget
     )
     if (!isLastMilestone && proposal.budget > 0) {
       return budgetRule
@@ -258,12 +265,12 @@ const maxMonthF9 = () => 24
 
 const minCostF10 = (proposal, milestone, isLastMilestone) => {
   return () => {
-    let _min = proposal.budget * 0.05
+    let _min = Math.floor(proposal.budget * 0.05)
     if (milestone === 1) {
       _min = Math.min(_min, 75000)
     }
     if (isLastMilestone) {
-      _min = proposal.budget * 0.15
+      _min = Math.floor(proposal.budget * 0.15)
     }
     return _min
   }
@@ -274,7 +281,7 @@ const maxCostF10 = (proposal, otherSomsBudget, isLastMilestone, milestone) => {
     const availableBudget = proposal.budget - otherSomsBudget
     const maxMilestoneBudget = 0.30
     const budgetRule = Math.min(
-      (proposal.budget * maxMilestoneBudget), availableBudget
+      Math.ceil(proposal.budget * maxMilestoneBudget), availableBudget
     )
     const _max = (!isLastMilestone && proposal.budget > 0) ? budgetRule : availableBudget
     if (milestone === 1) {