fixing claim tests

nomad-nmr · Jul 29, 2024 · 50ace20 · 50ace20
1 parent 912b309
commit 50ace20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/nomad-rest-api/controllers/claim.js b/nomad-rest-api/controllers/claim.js
@@ -144,12 +144,17 @@ export const approveClaims = async (req, res) => {
       req.body.map(async id => {
         const claim = await Claim.findById(id)
         const instrument = await Instrument.findById(claim.instrument, 'cost')
-        const { grantId, multiplier } = await getGrantInfo(claim.user, claim.group)
 
         claim.status = 'Approved'
-        claim.grantCosting = {
-          grantId,
-          cost: +claim.expTime * instrument.cost * multiplier
+
+        const grant = await getGrantInfo(claim.user, claim.group)
+        if (grant) {
+          const { grantId, multiplier } = grant
+
+          claim.grantCosting = {
+            grantId,
+            cost: +claim.expTime * instrument.cost * multiplier
+          }
         }
 
         await claim.save()

diff --git a/nomad-rest-api/tests/claim.test.js b/nomad-rest-api/tests/claim.test.js
@@ -220,7 +220,7 @@ describe('PATCH /', () => {
 })
 
 describe('PUT /approve', () => {
-  it('should change status of testClaimRwo to "approve"', async () => {
+  it('should change status of testClaimTwo to "approve"', async () => {
     const { body } = await request(app)
       .put('/claims/approve')
       .set('Authorization', `Bearer ${testUserAdmin.tokens[0].token}`)