Migrate to latest Play version - addresses #92

- cleans up load generator - fixes issues discovered by load test
resamsel · Nov 9, 2020 · 5142533 · 5142533
1 parent 00c0892
commit 5142533
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 29 deletions.
diff --git a/ui/libs/generator/src/lib/key.ts b/ui/libs/generator/src/lib/key.ts
@@ -25,28 +25,29 @@ export const featureNames = [
   'dashboard',
   'admin'
 ];
+export const parts = ['list', 'detail', 'find', 'search', 'main', 'header', 'footer'];
 export const keySuffixes = [
   'title',
-  'header',
   'description',
-  'list',
+  'text',
+  'comment',
   'get',
   'create',
   'update',
   'delete',
   'permission',
-  'find',
-  'search',
   'sell',
   'confirm',
   'allow',
   'restricted',
   'filter',
   'clear'
 ];
-export const keyNames = cartesianProduct([featureNames, keySuffixes]).map((values: string[]) =>
-  values.join('.')
-);
+export const keyNames = cartesianProduct([
+  featureNames,
+  parts,
+  keySuffixes
+]).map((values: string[]) => values.join('.'));
 
 export const createKey = (
   injector: Injector,

diff --git a/ui/libs/generator/src/lib/locale.ts b/ui/libs/generator/src/lib/locale.ts
@@ -130,6 +130,10 @@ export const deleteRandomLocale = (injector: Injector): Observable<Partial<State
           }))
         )
     ),
+    filter(
+      (payload: { user: User; accessToken: AccessToken; project: Project; locales: Locale[] }) =>
+        payload.locales.length > 0
+    ),
     concatMap(
       (payload: { user: User; accessToken: AccessToken; project: Project; locales: Locale[] }) =>
         deleteLocale(

diff --git a/ui/libs/generator/src/lib/project/project.ts b/ui/libs/generator/src/lib/project/project.ts
@@ -66,30 +66,32 @@ export const createRandomProject = (injector: Injector): Observable<Partial<Stat
     ),
     concatMap((payload: { user: User; project: Project; accessToken: AccessToken }) => {
       return combineLatest(
-        _.sample(localeNames, Math.ceil(Math.random() * 12)).map((localeName: string) =>
-          createLocale(
-            injector,
-            {
-              name: localeName,
-              projectId: payload.project.id
-            },
-            payload.accessToken
-          )
-        )
-      ).pipe(map((locales: Locale[]) => ({ ...payload, locales })));
-    }),
-    concatMap(
-      (payload: { user: User; project: Project; locales: Locale[]; accessToken: AccessToken }) => {
-        return combineLatest(
-          _.sample(keyNames, Math.ceil(Math.random() * 50)).map((keyName: string) =>
-            createKey(
+        _.sample(localeNames, Math.ceil(Math.random() * localeNames.length)).map(
+          (localeName: string) =>
+            createLocale(
               injector,
               {
-                name: keyName,
+                name: localeName,
                 projectId: payload.project.id
               },
               payload.accessToken
             )
+        )
+      ).pipe(map((locales: Locale[]) => ({ ...payload, locales })));
+    }),
+    concatMap(
+      (payload: { user: User; project: Project; locales: Locale[]; accessToken: AccessToken }) => {
+        return combineLatest(
+          _.sample(keyNames, Math.ceil((Math.random() * keyNames.length) / 10)).map(
+            (keyName: string) =>
+              createKey(
+                injector,
+                {
+                  name: keyName,
+                  projectId: payload.project.id
+                },
+                payload.accessToken
+              )
           )
         ).pipe(map((keys: Key[]) => ({ ...payload, keys })));
       }
@@ -122,7 +124,9 @@ export const createRandomProject = (injector: Injector): Observable<Partial<Stat
       message: `${payload.user.name} created project ${payload.project.name} with \
         ${payload.locales.length} languages and ${payload.keys.length} keys`
     })),
-    catchError((err: HttpErrorResponse) => of({ message: errorMessage(err) }))
+    catchError((err: HttpErrorResponse) =>
+      of({ message: `createRandomProject: ${errorMessage(err)}` })
+    )
   );
 };
 
@@ -176,7 +180,9 @@ export const updateRandomProject = (injector: Injector): Observable<Partial<Stat
     map((payload: { user: User; project: Project }) => ({
       message: `${payload.user.name} updated project ${payload.project.name}`
     })),
-    catchError((err: HttpErrorResponse) => of({ message: errorMessage(err) }))
+    catchError((err: HttpErrorResponse) =>
+      of({ message: `updateRandomProject: ${errorMessage(err)}` })
+    )
   );
 };
 

diff --git a/ui/libs/generator/src/lib/user.ts b/ui/libs/generator/src/lib/user.ts
@@ -86,7 +86,7 @@ export const createRandomUser = (userService: UserService): Observable<Partial<S
   const firstName = randomName.first();
   const lastName = randomName.last();
   const name = `${firstName} ${lastName}`;
-  const username = name.replace(' ', '').toLowerCase();
+  const username = name.replace(/[^a-zA-Z0-9]/, '').toLowerCase();
   const email = `${firstName}.${lastName}@repanzar.com`;
   return userService
     .create({

diff --git a/ui/libs/translatr-sdk/src/lib/services/error-handler.ts b/ui/libs/translatr-sdk/src/lib/services/error-handler.ts
@@ -21,7 +21,12 @@ Error: ${JSON.stringify(error, null, 2)}
 
 export class ErrorHandler {
   handleError(error: HttpErrorResponse, request?: RestRequest): Observable<never> {
-    console.warn(errorTemplate(error, request));
+    if (
+      error.error?.error?.violations[0]?.message !== 'error.nameunique' &&
+      error.error?.error?.violations[0]?.message !== 'Entry already exists (duplicate key)'
+    ) {
+      console.warn(errorTemplate(error, request));
+    }
     return throwError(error);
   }
 }