diff --git a/goofy-client/apps/goofy-e2e/src/integration/einheitlicher-ansprechpartner/vorgang-list/vorgang-list-ea.search.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/einheitlicher-ansprechpartner/vorgang-list/vorgang-list-ea.search.e2e-spec.ts index f883346b68b13208de815768db5915a07186c443..445732dcb64927c9a50a7ec43bf3b4d31cb05ab7 100644 --- a/goofy-client/apps/goofy-e2e/src/integration/einheitlicher-ansprechpartner/vorgang-list/vorgang-list-ea.search.e2e-spec.ts +++ b/goofy-client/apps/goofy-e2e/src/integration/einheitlicher-ansprechpartner/vorgang-list/vorgang-list-ea.search.e2e-spec.ts @@ -6,7 +6,7 @@ import { VorgangPage } from '../../../page-objects/vorgang.po'; import { dropCollections, reload } from '../../../support/cypress-helper'; import { CypressKeyboardActions, exist, notExist } from '../../../support/cypress.util'; import { loginAsEmil, UserRoleE2E } from '../../../support/user-util'; -import { buildVorgang, createVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util'; +import { buildVorgang, createVorgang, initElasticsearch, initVorgaenge, objectIds } from '../../../support/vorgang-util'; describe('VorgangList Suche for EA User', () => { const mainPage: MainPage = new MainPage(); @@ -29,6 +29,8 @@ describe('VorgangList Suche for EA User', () => { before(() => { initVorgaenge([vorgangToStay, vorgangToDisappear]) + initElasticsearch([vorgangToStay, vorgangToDisappear]) + loginAsEmil(); waitForSpinnerToDisappear(); @@ -72,7 +74,7 @@ describe('VorgangList Suche for EA User', () => { }) function doSearch(): void { - mainPage.getVorgangSearch().getInput().clear().type(requestId + CypressKeyboardActions.ENTER); + mainPage.getVorgangSearch().getInput().clear().type(vorgangToStay.name + CypressKeyboardActions.ENTER); } }) }); \ No newline at end of file diff --git a/goofy-client/apps/goofy-e2e/src/support/commands.ts b/goofy-client/apps/goofy-e2e/src/support/commands.ts index 31f9b14d9873178666b04b9e826652df6aa8c926..3d4589b8821f61eb474aec2e3403e137d79445fd 100644 --- a/goofy-client/apps/goofy-e2e/src/support/commands.ts +++ b/goofy-client/apps/goofy-e2e/src/support/commands.ts @@ -7,6 +7,7 @@ declare namespace Cypress { login(user, password); logout(); getUserInfo(); + addVorgangToElasticsearchIndex(vorgang); } } @@ -85,6 +86,30 @@ Cypress.Commands.add('logout', () => { }); }) +Cypress.Commands.add('addVorgangToElasticsearchIndex', (vorgang) => { + const elasticsearchEnv = Cypress.env("elasticsearch") + const token = btoa(`${elasticsearchEnv["user"]}:${elasticsearchEnv["password"]}`) + + cy.request({ + method: 'POST', + url: `${elasticsearchEnv["url"]}/${elasticsearchEnv["index"]}/_doc/${vorgang._id.$oid}`, + headers: { + 'Authorization': `Basic ${token}` + }, + body: { + "_class" : "de.itvsh.ozg.pluto.common.search.IndexedVorgang", + "vorgangId" : vorgang._id.$oid, + "vorgangName" : vorgang.name, + "vorgangNummer" : vorgang.nummer, + "createdAt" : vorgang.createdAt.$date, + "antragstellerName" : "Testermann", + "antragstellerVorname" : "Max", + "status" : vorgang.status, + "organisationseinheitenId" : "12345678" + } + }); +}) + function getKeycloakBaseRealmUrl(): string { return `${Cypress.env("keycloakUrl")}auth/realms/${Cypress.env("keycloakRealm")}/protocol/openid-connect`; } \ No newline at end of file diff --git a/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts b/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts index 35b8d6945b621660158f7654ada058c5fbd3f132..c29bb7aeca7192d1fc575d9ef4eeae58e5c24f12 100644 --- a/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts +++ b/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts @@ -65,6 +65,12 @@ export function initVorgangData(data: VorgangE2E[]): void { cy.task(CypressTasks.INIT_VORGANG_DATA, { collection: MongoCollections.VORGANG, data }); } +export function initElasticsearchData(vorgaenge: VorgangE2E[]): void { + vorgaenge.forEach(vorgang => { + cy.addVorgangToElasticsearchIndex(vorgang) + }) +} + export function dropCollections() { cy.task(CypressTasks.DROP_COLLECTIONS, [MongoCollections.COMMAND, MongoCollections.VORGANG, MongoCollections.VORGANG_ATTACHED_ITEM, MongoCollections.FS_FILES, MongoCollections.FS_CHUNKS]); } diff --git a/goofy-client/apps/goofy-e2e/src/support/vorgang-util.ts b/goofy-client/apps/goofy-e2e/src/support/vorgang-util.ts index 70d55586d657239e5e32013c7f9bce7019d6ef5a..fa4c922ac78967d51d2adb40753d41e192c50556 100644 --- a/goofy-client/apps/goofy-e2e/src/support/vorgang-util.ts +++ b/goofy-client/apps/goofy-e2e/src/support/vorgang-util.ts @@ -1,6 +1,6 @@ import { AccessPermissionE2E, AntragstellerE2E, ClientAttributeE2E, ClientAttributesE2E, EingangE2E, EingangHeaderE2E, VorgangE2E } from '../model/vorgang'; import { VorgangAttachedItemClientE2E } from '../model/vorgang-attached-item'; -import { initVorgangData } from './cypress-helper'; +import { initVorgangData, initElasticsearchData } from './cypress-helper'; import { buildUrl, encodeUrl } from './tech.util'; export const objectIds: string[] = require('../fixtures/util/object_id_collection.json'); @@ -18,6 +18,10 @@ export function buildVorgang($oid: string, uiIdentifier: string): VorgangE2E { }; } +export function initElasticsearch(vorgaenge: VorgangE2E[]): void { + initElasticsearchData(vorgaenge); +} + export function initVorgang(vorgang: VorgangE2E): void { initVorgaenge([vorgang]); }