clean up + updates

dBildungsplattform · Nov 19, 2024 · eb7649c · eb7649c
1 parent 2343f33
commit eb7649c
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 4,508 deletions.
diff --git a/loadtest/api-client/openapispec.json b/loadtest/api-client/openapispec.json
diff --git a/loadtest/pages/user-list.ts b/loadtest/pages/user-list.ts
@@ -1,7 +1,7 @@
 import {
   DBiamPersonenuebersichtResponse,
+  FindRollenResponse,
   OrganisationResponse,
-  RolleWithServiceProvidersResponse,
 } from "../api-client/generated/index.ts";
 import {
   getLoginInfo,
@@ -17,7 +17,7 @@ import { PageObject } from "./index.ts";
 type FetchedData = {
   organisationen: OrganisationResponse[];
   personenuebersichten: DBiamPersonenuebersichtResponse[];
-  rollen: RolleWithServiceProvidersResponse[];
+  rollen: FindRollenResponse;
 };
 class UserListPage implements PageObject {
   name = "UserList";

diff --git a/loadtest/usecases/1_login.ts b/loadtest/usecases/1_login.ts
@@ -5,11 +5,11 @@ import { loginPage } from "../pages/login.ts";
 import { defaultHttpCheck, defaultTimingCheck } from "../util/checks.ts";
 import { getDefaultOptions } from "../util/config.ts";
 import { wrapTestFunction } from "../util/usecase-wrapper.ts";
-import { getDefaultUserMix } from "../util/users.ts";
+import { getDefaultAdminMix } from "../util/users.ts";
 
 const successfulLoginCounter = new Counter("successful_logins_counter");
 const successfulLoginDuration = new Trend("successful_logins_duration", true);
-const users = getDefaultUserMix();
+const users = getDefaultAdminMix();
 
 export const options = {
   ...getDefaultOptions(),

diff --git a/loadtest/usecases/1_show-start.ts b/loadtest/usecases/1_show-start.ts
@@ -2,12 +2,12 @@ import { group, sleep } from "k6";
 import { getDefaultOptions } from "../util/config.ts";
 import { login } from "../util/page.ts";
 import { wrapTestFunction } from "../util/usecase-wrapper.ts";
-import { getDefaultUserMix } from "../util/users.ts";
+import { getDefaultAdminMix } from "../util/users.ts";
 
-const users = getDefaultUserMix();
+const users = getDefaultAdminMix();
 
 export const options = {
-  ...getDefaultOptions(users),
+  ...getDefaultOptions(),
 };
 
 export default wrapTestFunction(main);

diff --git a/loadtest/usecases/1_show-user-list.ts b/loadtest/usecases/1_show-user-list.ts
@@ -1,4 +1,4 @@
-import { group, sleep } from "k6";
+import { group } from "k6";
 import { DBiamPersonenuebersichtResponse } from "../api-client/generated/index.ts";
 import { userListPage } from "../pages/user-list.ts";
 import {
@@ -34,7 +34,7 @@ function main(users = getDefaultAdminMix()) {
     getLoginInfo();
     orgId = pickRandomItem(organisationen).id;
     personenuebersicht = pickRandomItem(personenuebersichten);
-    rolleId = pickRandomItem(rollen).id;
+    rolleId = pickRandomItem(rollen.moeglicheRollen).id;
   });
 
   group("hit pages", () => {

diff --git a/loadtest/util/api.ts b/loadtest/util/api.ts
@@ -192,7 +192,7 @@ export function deleteKlasse(id: string) {
 export function getPersonenIds(
   personen?: PersonFrontendControllerFindPersons200Response,
 ): Set<string> {
-  if (!personen) personen = getPersonen();
+  if (!personen) personen = getPersonen(["limit=30"]);
   return new Set(personen.items.map(({ person }) => person.id));
 }
 
@@ -322,7 +322,6 @@ export function getResetPassword(query: Array<string>) {
 }
 
 export function putPersonLock(personId: string, lock: boolean) {
-  // TODO: befristung
   const lockUserBodyParams: LockUserBodyParams = {
     lock,
     //@ts-expect-error openapi generator converts this to camelcase

diff --git a/loadtest/util/config.ts b/loadtest/util/config.ts
@@ -43,7 +43,7 @@ export function getDefaultOptions() {
       };
     case CONFIG.BREAKPOINT:
       return {
-        stages: [{ duration: "10m", target: 10 * maxVUs }],
+        stages: [{ duration: "10m", target: maxVUs }],
         thresholds: {
           http_req_failed: [{ threshold: "rate<0.10", abortOnFail: true }],
           http_req_duration: [{ threshold: "p(95)<5000", abortOnFail: true }],

diff --git a/loadtest/util/users.ts b/loadtest/util/users.ts
@@ -111,12 +111,12 @@ export class UserMix {
 
   getUser(): User {
     const currentRole = this.getCurrentRole();
-    const user = groupedUsers.get(currentRole);
+    const user = groupedUsers.get(currentRole)?.next();
     if (!user)
       throw new Error(
         `user with requested role ${currentRole} is not present in ${DATAPATH}`,
       );
-    return user.next();
+    return user;
   }
 
   getCurrentRole(): ROLE {