chore: Add additional e2e tests (#679)

## Description

This adds e2e for "org"-filtering and add ExtendedStatus to the test
data. This also fixes some clean up issues, making sure a test run
purges all data it inserts.

## Related Issue(s)

N/A

## Verification

- [x] **Your** code builds clean without any errors or warnings
- [x] Manual testing done (required)

Author: elsand

tests/k6/common/token.js

@@ -58,7 +58,7 @@ function fetchToken(url, tokenOptions, type) {
 export function getServiceOwnerTokenFromGenerator(tokenOptions = null) {
   let fullTokenOptions = extend({}, defaultTokenOptions, tokenOptions);
   const url = `http://altinn-testtools-token-generator.azurewebsites.net/api/GetEnterpriseToken?env=tt02&scopes=${encodeURIComponent(fullTokenOptions.scopes)}&org=${fullTokenOptions.orgName}&orgNo=${fullTokenOptions.orgNo}&ttl=${tokenTtl}`;
-  return fetchToken(url, fullTokenOptions, `service owner (orgno:${fullTokenOptions.orgNo})`);
+  return fetchToken(url, fullTokenOptions, `service owner (orgno:${fullTokenOptions.orgNo} orgName:${fullTokenOptions.orgName})`);
 }
 
 export function getEnduserTokenFromGenerator(tokenOptions = null) {

tests/k6/tests/enduser/dialogSearch.js

@@ -37,8 +37,10 @@ export default function () {
     let titleForExpiresAtItem = "expires_" + uuidv4();
     let titleForUpdatedItem = "updated_" + uuidv4();
     let titleForLastItem = "last_" + uuidv4();
+    let idForCustomOrg = uuidv4();
     let createdAfter = (new Date()).toISOString(); // We use this on all tests to hopefully avoid clashing with unrelated dialogs
     let defaultFilter = "?CreatedAfter=" + createdAfter + "&Party=" + defaultParty;
+    let auxOrg = "digdir";
 
     describe('Arrange: Create some dialogs to test against', () => {
 
@@ -69,10 +71,14 @@ export default function () {
         setTitle(dialogs[++d], titleForExpiresAtItem);
         setExpiresAt(dialogs[d], new Date("2034-03-07T10:13:00Z"));
 
+        dialogs[++d].id = idForCustomOrg;
+
         setTitle(dialogs[dialogs.length-1], titleForLastItem);
 
+        let tokenOptions = {};
         dialogs.forEach((d) => {
-            let r = postSO("dialogs", d);
+            tokenOptions = (d.id == idForCustomOrg) ? { orgName: auxOrg } : {};
+            let r = postSO("dialogs", d, null, tokenOptions);            
             expectStatusFor(r).to.equal(201);
             dialogIds.push(r.json());
         });
@@ -163,6 +169,14 @@ export default function () {
         expect(r.json().items[0], 'party').to.have.property("serviceResource").that.equals(auxResource);
     });
 
+    describe('List with org filter', () => {
+        let r = getEU('dialogs/' + defaultFilter + '&Org=' + auxOrg);
+        expectStatusFor(r).to.equal(200);
+        expect(r, 'response').to.have.validJsonBody();
+        expect(r.json(), 'response json').to.have.property("items").with.lengthOf(1);
+        expect(r.json().items[0], 'org').to.have.property("org").that.equals(auxOrg);
+    });
+
     describe("Cleanup", () => {
         dialogIds.forEach((d) => {
             let r = purgeSO("dialogs/" + d);

tests/k6/tests/serviceowner/authorization.js

@@ -1,4 +1,4 @@
-import { describe, expect, expectStatusFor, getSO, postSO, putSO, patchSO, deleteSO } from '../../common/testimports.js'
+import { describe, expect, expectStatusFor, getSO, postSO, putSO, patchSO, deleteSO, purgeSO } from '../../common/testimports.js'
 import { default as dialogToInsert } from './testdata/01-create-dialog.js';
 
 export default function () {
@@ -115,8 +115,8 @@ export default function () {
     });
 
     // Finally, cleanup by deleting the dialog
-    describe('Allow deleting dialog as valid serviceowner', () => {
-        let r = deleteSO('dialogs/' + dialogId);
+    describe('Allow purging dialog as valid serviceowner', () => {
+        let r = purgeSO('dialogs/' + dialogId);
         expect(r.status, 'response status').to.equal(204);
     });
 

tests/k6/tests/serviceowner/concurrency.js

@@ -1,4 +1,4 @@
-import { describe, expect, expectStatusFor, postSO, postSOAsync, deleteSO } from '../../common/testimports.js'
+import { describe, expect, expectStatusFor, postSO, postSOAsync, purgeSO } from '../../common/testimports.js'
 import { default as dialogToInsert } from './testdata/01-create-dialog.js';
 
 export default function () {
@@ -26,7 +26,7 @@ export default function () {
         const results = await Promise.all(promises);
 
         // Cleanup here, as we're in another thread
-        deleteSO('dialogs/' + dialogId);
+        purgeSO('dialogs/' + dialogId);
 
         results.forEach((r) => {
             expect(r.status, 'status code for concurrently added child entity').to.equal(201);

tests/k6/tests/serviceowner/dialogCreatePatchDelete.js

@@ -1,4 +1,4 @@
-import { describe, expect, expectStatusFor, getSO, postSO, deleteSO, patchSO, uuidv4 } from '../../common/testimports.js'
+import { describe, expect, expectStatusFor, getSO, postSO, purgeSO, patchSO, uuidv4 } from '../../common/testimports.js'
 import { default as dialogToInsert } from './testdata/01-create-dialog.js';
 
 export default function () {
@@ -69,8 +69,8 @@ export default function () {
         expect(r.json(), 'dialog').to.have.nested.property("apiActions[0].endpoints[1].url").to.equal(newApiActionEndpointUrl);
     });
 
-    describe('Perform dialog delete', () => {
-        let r = deleteSO('dialogs/' + dialogId);
+    describe('Perform dialog purge', () => {
+        let r = purgeSO('dialogs/' + dialogId);
         expectStatusFor(r).to.equal(204);
     });
 }

tests/k6/tests/serviceowner/testdata/01-create-dialog.js

@@ -20,7 +20,8 @@ export default function () {
             { "type": "Title", "value": [ { "cultureCode": "nb_NO", "value": "Skjema for rapportering av et eller annet" } ] },
             { "type": "SenderName", "value": [ { "cultureCode": "nb_NO", "value": "Avsendernavn" } ] },
             { "type": "Summary", "value": [ { "cultureCode": "nb_NO", "value": "Et sammendrag her. Maks 200 tegn, ingen HTML-støtte. Påkrevd. Vises i liste." } ] },
-            { "type": "AdditionalInfo", "value": [ { "cultureCode": "nb_NO", "value": "Utvidet forklaring (enkel HTML-støtte, inntil 1023 tegn). Ikke påkrevd. Vises kun i detaljvisning." } ] }
+            { "type": "AdditionalInfo", "value": [ { "cultureCode": "nb_NO", "value": "Utvidet forklaring (enkel HTML-støtte, inntil 1023 tegn). Ikke påkrevd. Vises kun i detaljvisning." } ] },
+            { "type": "ExtendedStatus", "value": [ { "cultureCode": "nb_NO", "value": "Utvidet Status" } ] },
         ],
         "guiActions": [
             {