From 8136fdc9a361bd30ea672e54b4885ae56bc7778b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 18 Nov 2024 09:19:37 +0100
Subject: [PATCH] E2E enable user-manager initialisation and change email
addresses
---
.../usermanager/usermanager_user_ariane.json | 2 +-
.../usermanager_user_dorothea.json | 2 +-
.../usermanager/usermanager_user_emil.json | 2 +-
.../usermanager/usermanager_user_peter.json | 2 +-
.../usermanager/usermanager_user_sabine.json | 2 +-
.../usermanager/usermanager_user_zelda.json | 2 +-
.../alfa-e2e/src/support/cypress-tasks.ts | 25 +++++++++++++------
.../apps/alfa-e2e/src/support/user-util.ts | 18 ++++++-------
8 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json
index 814e061ad7..7e02474fe5 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json
@@ -10,7 +10,7 @@
"firstName": "Ariane",
"fullName": "Ariane Admin",
"lastName": "Admin",
- "email": "ariane-admin@ozg-sh.de",
+ "email": "ariane-admin@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [],
"roles": ["ADMIN_ADMIN", "VERWALTUNG_USER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json
index 8c8a317b75..2c87f7fdac 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json
@@ -10,7 +10,7 @@
"firstName": "Dorothea",
"fullName": "Dorothea Doe",
"lastName": "Doe",
- "email": "dorothea.doe@ozg-sh.de",
+ "email": "dorothea.doe@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["9030229", "10363455", "248240886"],
"roles": ["VERWALTUNG_USER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json
index 2919f1b736..f84b1f7bd7 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json
@@ -10,7 +10,7 @@
"firstName": "Emil",
"fullName": "Emil Ansprechpartner",
"lastName": "Ansprechpartner",
- "email": "emil.ansprechpartner@ozg-sh.de",
+ "email": "emil.ansprechpartner@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [],
"roles": ["EINHEITLICHER_ANSPRECHPARTNER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json
index 9bc95422fb..6c0d961bd9 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json
@@ -10,7 +10,7 @@
"firstName": "Peter",
"fullName": "Peter von der Post",
"lastName": "von der Post",
- "email": "peter.von.der.post@ozg-sh.de",
+ "email": "peter.von.der.post@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [],
"roles": ["VERWALTUNG_POSTSTELLE"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json
index afc4c87496..f6be06faa2 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json
@@ -10,7 +10,7 @@
"firstName": "Sabine",
"fullName": "Sabine Sach",
"lastName": "Sach",
- "email": "sabine.sach@ozg-sh.de",
+ "email": "sabine.sach@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["248240886"],
"roles": ["VERWALTUNG_USER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json
index 013cd251b1..466f127e1c 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json
@@ -10,7 +10,7 @@
"firstName": "Zelda",
"fullName": "Zelda Zusammen",
"lastName": "Zusammen",
- "email": "zelda-z@ozg-sh.de",
+ "email": "zelda-z@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["9797773", "9093371"],
"roles": ["VERWALTUNG_USER"],
diff --git a/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts b/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts
index 827b7b3d31..a1926d26e2 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts
@@ -1,5 +1,6 @@
import { readdir, remove } from 'fs-extra';
import { Db, Long, MongoClient, ObjectId } from 'mongodb';
+
const fs = require('fs');
const decompress = require('decompress');
@@ -212,9 +213,7 @@ function createDate(field) {
}
function parseVorgangAttachedItemData(vorgangAttachedItems) {
- vorgangAttachedItems.forEach((vorgangAttachedItem) =>
- parseVorgangAttachedItem(vorgangAttachedItem),
- );
+ vorgangAttachedItems.forEach((vorgangAttachedItem) => parseVorgangAttachedItem(vorgangAttachedItem));
return vorgangAttachedItems;
}
@@ -247,7 +246,21 @@ function insertIntoDatabase(config, collection, data) {
}
function insertIntoUserManagerDatabase(config, collection, data) {
- insert(getUserManagerDatabaseUrl(config), getUserManagerDatabase(config), collection, data);
+ insertWithoutDrop(getUserManagerDatabaseUrl(config), getUserManagerDatabase(config), collection, data);
+}
+
+function insertWithoutDrop(databaseUrl, databaseName, collection, data) {
+ MongoClient.connect(databaseUrl, (error, connection) => {
+ console.log(`connect to ${databaseName} database with ${databaseUrl}`);
+ if (!error) {
+ console.log('success');
+ const db: Db = connection.db(databaseName);
+
+ db.createCollection(collection, (error) => handleCreateCollection(db, connection, collection, data, error));
+ } else {
+ console.error('Error: ', error);
+ }
+ });
}
function insert(databaseUrl, databaseName, collection, data) {
@@ -258,9 +271,7 @@ function insert(databaseUrl, databaseName, collection, data) {
const db: Db = connection.db(databaseName);
db.collection(collection).drop(() => {
- db.createCollection(collection, (error) =>
- handleCreateCollection(db, connection, collection, data, error),
- );
+ db.createCollection(collection, (error) => handleCreateCollection(db, connection, collection, data, error));
});
} else {
console.error('Error: ', error);
diff --git a/alfa-client/apps/alfa-e2e/src/support/user-util.ts b/alfa-client/apps/alfa-e2e/src/support/user-util.ts
index 2a1ea8cf43..34d06a712b 100644
--- a/alfa-client/apps/alfa-e2e/src/support/user-util.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/user-util.ts
@@ -23,7 +23,7 @@
*/
import { UserE2E } from '../model/user';
import { UsermanagerUserE2E } from '../model/usermanager';
-import { login } from './cypress-helper';
+import { initUsermanagerData, login } from './cypress-helper';
const sabineFixture: UserE2E = require('../fixtures/user-main/user_sabine.json');
const dorotheaFixture: UserE2E = require('../fixtures/user-main/user_dorothea.json');
@@ -38,14 +38,14 @@ const userManagerZeldaFixture: UsermanagerUserE2E = require('../fixtures/userman
const userManagerArianeFixture: UsermanagerUserE2E = require('../fixtures/usermanager/usermanager_user_ariane.json');
export function initUsermanagerUsers() {
- // initUsermanagerData([
- // getUserManagerUserSabine(),
- // getUserManagerUserPeter(),
- // getUserManagerUserEmil(),
- // getUserManagerUserDorothea(),
- // getUserManagerUserZelda(),
- // getUserManagerUserAriane(),
- // ]);
+ initUsermanagerData([
+ getUserManagerUserSabine(),
+ getUserManagerUserPeter(),
+ getUserManagerUserEmil(),
+ getUserManagerUserDorothea(),
+ getUserManagerUserZelda(),
+ getUserManagerUserAriane(),
+ ]);
}
export function getUserSabine(): UserE2E {
--
GitLab