api test for entry edition

Author: mluukkai

src/server/routes/entry.ts

@@ -116,12 +116,10 @@ entryRouter.put('/:entryId', async (req: RequestWithUser, res: any) => {
     return res.status(500).send('Error when calculating risks')
   }
 
-  // Preserve history - store current version in updatedData array
   const currentData = entry.data
   const updatedDataArray = currentData.updatedData ?? []
 
   // Store the current state with the timestamp showing when this version was last active
-  // Use the current updatedAt (or createdAt if never updated) to show when this version was last modified
   const previousVersionTimestamp = entry.updatedAt?.toISOString() ?? entry.createdAt.toISOString()
 
   updatedDataArray.push({
@@ -132,7 +130,6 @@ entryRouter.put('/:entryId', async (req: RequestWithUser, res: any) => {
     createdAt: previousVersionTimestamp,
   })
 
-  // Update entry with new data (updatedAt will be automatically set by Sequelize to current time)
   await entry.update({
     data: {
       ...riskData,

tests/api.spec.ts

@@ -1,6 +1,8 @@
 import { test, expect } from '@playwright/test'
 import { testUser, riskResponse, compareUnordered, compareOrdered } from './helpers'
 
+const baseUrl = 'http://localhost:8000'
+
 test.describe.configure({ mode: 'serial' })
 
 test.describe('api', () => {
@@ -32,7 +34,7 @@ test.describe('api', () => {
       tuhatData: {},
     }
 
-    const response = await fetch('http://localhost:8000/api/entries/1/dryrun', {
+    const response = await fetch(`${baseUrl}/api/entries/1/dryrun`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify(payload),
@@ -85,7 +87,7 @@ test.describe('api', () => {
       tuhatData: {},
     }
 
-    const response = await fetch('http://localhost:8000/api/entries/1/dryrun', {
+    const response = await fetch(`${baseUrl}/api/entries/1/dryrun`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify(payload),
@@ -148,4 +150,151 @@ test.describe('api', () => {
     expect(data.country[0].code).toStrictEqual('AF')
     compareOrdered(data.multilateralCountries, expectedCountries)
   })
+
+  test('editing an entry', async () => {
+    const initialPayload = {
+      data: {
+        '1': 'Testi Kayttaja',
+        '2': testUser,
+        '3': 'Initial Project',
+        '4': 'bilateral',
+        '6': 'university',
+        '8': 'Afghanistan',
+        '9': 'partner',
+        '10': 'agreementNotDone',
+        '11': ['education'],
+        '12': 'mediumDuration',
+        '13': 'noExternalFunding',
+        '16': 'mediumBudget',
+        '17': 'noTransferPersonalData',
+        '20': 'Kardan University',
+        '23': 'noTransferMilitaryKnowledge',
+        '24': 'noSuccessfulCollaboration',
+        '25': 'likelyNoEthicalIssues',
+        faculty: 'H40',
+        unit: 'H528',
+        tuhatProjectExists: 'tuhatOptionNegative',
+      },
+      sessionToken: 'e1e841e1-1368-4deb-b9f9-227ab1261e64',
+      tuhatData: {},
+    }
+
+    const createResponse = await fetch(`${baseUrl}/api/entries/1`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(initialPayload),
+    })
+
+    expect(createResponse.status).toBe(201)
+    const createdEntry = await createResponse.json()
+
+    let updatedPayload = {
+      data: {
+        '1': 'Testi Kayttaja',
+        '2': testUser,
+        '3': 'Updated Project Name',
+        '4': 'bilateral',
+        '6': 'university',
+        '8': 'Sweden',
+        '9': 'coordinator',
+        '10': 'agreementDone',
+        '11': ['education', 'research'],
+        '12': 'longDuration',
+        '13': 'externalFunding',
+        '16': 'largeBudget',
+        '17': 'noTransferPersonalData',
+        '20': 'Ahlobait University',
+        '23': 'noTransferMilitaryKnowledge',
+        '24': 'successfulCollaboration',
+        '25': 'likelyNoEthicalIssues',
+        faculty: 'H40',
+        unit: 'H528',
+        tuhatProjectExists: 'tuhatOptionNegative',
+      },
+      tuhatData: {},
+    }
+
+    let updateResponse = await fetch(`${baseUrl}/api/entries/${createdEntry.id}`, {
+      method: 'PUT',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(updatedPayload),
+    })
+
+    expect(updateResponse.status).toBe(200)
+
+    let updatedEntry = await updateResponse.json()
+
+    let expectedRisks = riskResponse([
+      { id: 'country', level: 1 },
+      { id: 'dualUseEU', level: 1 },
+      { id: 'economic', level: 3 },
+      { id: 'economicScope', level: 3 },
+      { id: 'ethical', level: 1 },
+      { id: 'total', level: 2 },
+      { id: 'university', level: 1 },
+    ])
+
+    compareUnordered(updatedEntry.data.risks, expectedRisks)
+
+    expect(updatedEntry.data.country[0].code).toBe('SE')
+
+    expect(updatedEntry.data.updatedData).toBeDefined()
+    expect(updatedEntry.data.updatedData.length).toBe(1)
+    expect(updatedEntry.data.updatedData[0].country[0].code).toBe('AF')
+
+    updatedPayload = {
+      data: {
+        '1': 'Testi Kayttaja',
+        '2': testUser,
+        '3': 'Updated Project Name',
+        '4': 'bilateral',
+        '6': 'university',
+        '8': 'Denmark',
+        '9': 'coordinator',
+        '10': 'agreementDone',
+        '11': ['education', 'research'],
+        '12': 'shortDuration',
+        '13': 'noExternalFunding',
+        '16': 'smallBudget',
+        '17': 'noTransferPersonalData',
+        '20': 'Ahlobait University',
+        '23': 'noTransferMilitaryKnowledge',
+        '24': 'successfulCollaboration',
+        '25': 'likelyNoEthicalIssues',
+        faculty: 'H40',
+        unit: 'H528',
+        tuhatProjectExists: 'tuhatOptionNegative',
+      },
+      tuhatData: {},
+    }
+
+    updateResponse = await fetch(`${baseUrl}/api/entries/${createdEntry.id}`, {
+      method: 'PUT',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(updatedPayload),
+    })
+
+    expect(updateResponse.status).toBe(200)
+
+    updatedEntry = await updateResponse.json()
+
+    expectedRisks = riskResponse([
+      { id: 'country', level: 1 },
+      { id: 'dualUseEU', level: 1 },
+      { id: 'economic', level: 1 },
+      { id: 'economicScope', level: 1 },
+      { id: 'ethical', level: 1 },
+      { id: 'total', level: 1 },
+      { id: 'university', level: 1 },
+    ])
+
+    compareUnordered(updatedEntry.data.risks, expectedRisks)
+
+    expect(updatedEntry.data.country[0].code).toBe('DK')
+
+    expect(updatedEntry.data.updatedData).toBeDefined()
+    expect(updatedEntry.data.updatedData.length).toBe(2)
+    expect(updatedEntry.data.updatedData[0].country[0].code).toBe('AF')
+    expect(updatedEntry.data.updatedData[1].country[0].code).toBe('SE')
+  })
 })