Skip to content
Snippets Groups Projects
Commit 8136fdc9 authored by OZGCloud's avatar OZGCloud
Browse files

E2E enable user-manager initialisation and change email addresses

parent ea74437e
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"firstName": "Ariane", "firstName": "Ariane",
"fullName": "Ariane Admin", "fullName": "Ariane Admin",
"lastName": "Admin", "lastName": "Admin",
"email": "ariane-admin@ozg-sh.de", "email": "ariane-admin@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687, "lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [], "organisationsEinheitIds": [],
"roles": ["ADMIN_ADMIN", "VERWALTUNG_USER"], "roles": ["ADMIN_ADMIN", "VERWALTUNG_USER"],
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"firstName": "Dorothea", "firstName": "Dorothea",
"fullName": "Dorothea Doe", "fullName": "Dorothea Doe",
"lastName": "Doe", "lastName": "Doe",
"email": "dorothea.doe@ozg-sh.de", "email": "dorothea.doe@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687, "lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["9030229", "10363455", "248240886"], "organisationsEinheitIds": ["9030229", "10363455", "248240886"],
"roles": ["VERWALTUNG_USER"], "roles": ["VERWALTUNG_USER"],
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"firstName": "Emil", "firstName": "Emil",
"fullName": "Emil Ansprechpartner", "fullName": "Emil Ansprechpartner",
"lastName": "Ansprechpartner", "lastName": "Ansprechpartner",
"email": "emil.ansprechpartner@ozg-sh.de", "email": "emil.ansprechpartner@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687, "lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [], "organisationsEinheitIds": [],
"roles": ["EINHEITLICHER_ANSPRECHPARTNER"], "roles": ["EINHEITLICHER_ANSPRECHPARTNER"],
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"firstName": "Peter", "firstName": "Peter",
"fullName": "Peter von der Post", "fullName": "Peter von der Post",
"lastName": "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, "lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [], "organisationsEinheitIds": [],
"roles": ["VERWALTUNG_POSTSTELLE"], "roles": ["VERWALTUNG_POSTSTELLE"],
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"firstName": "Sabine", "firstName": "Sabine",
"fullName": "Sabine Sach", "fullName": "Sabine Sach",
"lastName": "Sach", "lastName": "Sach",
"email": "sabine.sach@ozg-sh.de", "email": "sabine.sach@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687, "lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["248240886"], "organisationsEinheitIds": ["248240886"],
"roles": ["VERWALTUNG_USER"], "roles": ["VERWALTUNG_USER"],
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"firstName": "Zelda", "firstName": "Zelda",
"fullName": "Zelda Zusammen", "fullName": "Zelda Zusammen",
"lastName": "Zusammen", "lastName": "Zusammen",
"email": "zelda-z@ozg-sh.de", "email": "zelda-z@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687, "lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["9797773", "9093371"], "organisationsEinheitIds": ["9797773", "9093371"],
"roles": ["VERWALTUNG_USER"], "roles": ["VERWALTUNG_USER"],
......
import { readdir, remove } from 'fs-extra'; import { readdir, remove } from 'fs-extra';
import { Db, Long, MongoClient, ObjectId } from 'mongodb'; import { Db, Long, MongoClient, ObjectId } from 'mongodb';
const fs = require('fs'); const fs = require('fs');
const decompress = require('decompress'); const decompress = require('decompress');
...@@ -212,9 +213,7 @@ function createDate(field) { ...@@ -212,9 +213,7 @@ function createDate(field) {
} }
function parseVorgangAttachedItemData(vorgangAttachedItems) { function parseVorgangAttachedItemData(vorgangAttachedItems) {
vorgangAttachedItems.forEach((vorgangAttachedItem) => vorgangAttachedItems.forEach((vorgangAttachedItem) => parseVorgangAttachedItem(vorgangAttachedItem));
parseVorgangAttachedItem(vorgangAttachedItem),
);
return vorgangAttachedItems; return vorgangAttachedItems;
} }
...@@ -247,7 +246,21 @@ function insertIntoDatabase(config, collection, data) { ...@@ -247,7 +246,21 @@ function insertIntoDatabase(config, collection, data) {
} }
function insertIntoUserManagerDatabase(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) { function insert(databaseUrl, databaseName, collection, data) {
...@@ -258,9 +271,7 @@ function insert(databaseUrl, databaseName, collection, data) { ...@@ -258,9 +271,7 @@ function insert(databaseUrl, databaseName, collection, data) {
const db: Db = connection.db(databaseName); const db: Db = connection.db(databaseName);
db.collection(collection).drop(() => { db.collection(collection).drop(() => {
db.createCollection(collection, (error) => db.createCollection(collection, (error) => handleCreateCollection(db, connection, collection, data, error));
handleCreateCollection(db, connection, collection, data, error),
);
}); });
} else { } else {
console.error('Error: ', error); console.error('Error: ', error);
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
*/ */
import { UserE2E } from '../model/user'; import { UserE2E } from '../model/user';
import { UsermanagerUserE2E } from '../model/usermanager'; 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 sabineFixture: UserE2E = require('../fixtures/user-main/user_sabine.json');
const dorotheaFixture: UserE2E = require('../fixtures/user-main/user_dorothea.json'); const dorotheaFixture: UserE2E = require('../fixtures/user-main/user_dorothea.json');
...@@ -38,14 +38,14 @@ const userManagerZeldaFixture: UsermanagerUserE2E = require('../fixtures/userman ...@@ -38,14 +38,14 @@ const userManagerZeldaFixture: UsermanagerUserE2E = require('../fixtures/userman
const userManagerArianeFixture: UsermanagerUserE2E = require('../fixtures/usermanager/usermanager_user_ariane.json'); const userManagerArianeFixture: UsermanagerUserE2E = require('../fixtures/usermanager/usermanager_user_ariane.json');
export function initUsermanagerUsers() { export function initUsermanagerUsers() {
// initUsermanagerData([ initUsermanagerData([
// getUserManagerUserSabine(), getUserManagerUserSabine(),
// getUserManagerUserPeter(), getUserManagerUserPeter(),
// getUserManagerUserEmil(), getUserManagerUserEmil(),
// getUserManagerUserDorothea(), getUserManagerUserDorothea(),
// getUserManagerUserZelda(), getUserManagerUserZelda(),
// getUserManagerUserAriane(), getUserManagerUserAriane(),
// ]); ]);
} }
export function getUserSabine(): UserE2E { export function getUserSabine(): UserE2E {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment