Rewrite load generator with personas - addresses #213

Introduce creating projects when none was found instead of returning undefined.

ui/libs/generator/src/lib/key.ts

@@ -1,6 +1,13 @@
 import { Injector } from '@angular/core';
 import { AccessToken, Key, PagedList, Project, Scope } from '@dev/translatr-model';
-import { AccessTokenService, KeyService, ProjectService } from '@dev/translatr-sdk';
+import {
+  AccessTokenService,
+  KeyService,
+  LocaleService,
+  MessageService,
+  ProjectService,
+  UserService
+} from '@dev/translatr-sdk';
 import { pickRandomly } from '@translatr/utils';
 import { Observable, of } from 'rxjs';
 import { concatMap, filter, map } from 'rxjs/operators';
@@ -67,12 +74,21 @@ export const createRandomKeyForProject = (
 
 export const createRandomKey = (
   accessTokenService: AccessTokenService,
+  userService: UserService,
   projectService: ProjectService,
+  localeService: LocaleService,
   keyService: KeyService,
+  messageService: MessageService,
   defaultAccessToken: string
 ): Observable<Key> => {
-  return selectRandomProjectAccessToken(accessTokenService, projectService).pipe(
-    filter(({ project }) => project !== undefined),
+  return selectRandomProjectAccessToken(
+    accessTokenService,
+    userService,
+    projectService,
+    localeService,
+    keyService,
+    messageService
+  ).pipe(
     concatMap(({ project, accessToken }) =>
       createRandomKeyForProject(keyService, project, accessToken, defaultAccessToken)
     )
@@ -110,12 +126,21 @@ export const selectRandomKeyForProject = (
 
 export const deleteRandomKey = (
   accessTokenService: AccessTokenService,
+  userService: UserService,
   projectService: ProjectService,
+  localeService: LocaleService,
   keyService: KeyService,
+  messageService: MessageService,
   defaultAccessToken: string
 ): Observable<Key> => {
-  return selectRandomProjectAccessToken(accessTokenService, projectService).pipe(
-    filter(({ project }) => Boolean(project)),
+  return selectRandomProjectAccessToken(
+    accessTokenService,
+    userService,
+    projectService,
+    localeService,
+    keyService,
+    messageService
+  ).pipe(
     concatMap(({ accessToken, project }) =>
       keyService
         .find({

ui/libs/generator/src/lib/locale.ts

@@ -1,5 +1,12 @@
 import { AccessToken, Locale, PagedList, Project, Scope } from '@dev/translatr-model';
-import { AccessTokenService, LocaleService, ProjectService } from '@dev/translatr-sdk';
+import {
+  AccessTokenService,
+  KeyService,
+  LocaleService,
+  MessageService,
+  ProjectService,
+  UserService
+} from '@dev/translatr-sdk';
 import { pickRandomly } from '@translatr/utils';
 import { Observable, of } from 'rxjs';
 import { concatMap, filter, map } from 'rxjs/operators';
@@ -56,14 +63,26 @@ export const createRandomLocaleForProject = (
       )
     );
 
+/**
+ * Always returns a locale
+ */
 export const createRandomLocale = (
   accessTokenService: AccessTokenService,
+  userService: UserService,
   projectService: ProjectService,
   localeService: LocaleService,
+  keyService: KeyService,
+  messageService: MessageService,
   defaultAccessToken: string
 ): Observable<Locale> => {
-  return selectRandomProjectAccessToken(accessTokenService, projectService).pipe(
-    filter(({ project }) => project !== undefined),
+  return selectRandomProjectAccessToken(
+    accessTokenService,
+    userService,
+    projectService,
+    localeService,
+    keyService,
+    messageService
+  ).pipe(
     concatMap(({ accessToken, project }) =>
       createRandomLocaleForProject(localeService, project, accessToken, defaultAccessToken)
     )
@@ -141,12 +160,21 @@ export const selectLocaleForProject = (
 
 export const deleteRandomLocale = (
   accessTokenService: AccessTokenService,
+  userService: UserService,
   projectService: ProjectService,
   localeService: LocaleService,
+  keyService: KeyService,
+  messageService: MessageService,
   defaultAccessToken: string
 ): Observable<Locale> => {
-  return selectRandomProjectAccessToken(accessTokenService, projectService).pipe(
-    filter(({ project }) => Boolean(project)),
+  return selectRandomProjectAccessToken(
+    accessTokenService,
+    userService,
+    projectService,
+    localeService,
+    keyService,
+    messageService
+  ).pipe(
     concatMap(({ accessToken, project }) =>
       localeService
         .find({

ui/libs/generator/src/lib/message.ts

@@ -1,5 +1,12 @@
 import { AccessToken, Key, Locale, Message, PagedList, Project, Scope } from '@dev/translatr-model';
-import { AccessTokenService, MessageService, ProjectService } from '@dev/translatr-sdk';
+import {
+  AccessTokenService,
+  KeyService,
+  LocaleService,
+  MessageService,
+  ProjectService,
+  UserService
+} from '@dev/translatr-sdk';
 import { pickRandomly } from '@translatr/utils';
 import { Observable } from 'rxjs';
 import { concatMap, filter, map } from 'rxjs/operators';
@@ -66,12 +73,21 @@ export const updateMessage = (
 
 export const deleteRandomMessage = (
   accessTokenService: AccessTokenService,
+  userService: UserService,
   projectService: ProjectService,
+  localeService: LocaleService,
+  keyService: KeyService,
   messageService: MessageService,
   defaultAccessToken: string
 ): Observable<Message> => {
-  return selectRandomProjectAccessToken(accessTokenService, projectService).pipe(
-    filter(({ project }) => Boolean(project)),
+  return selectRandomProjectAccessToken(
+    accessTokenService,
+    userService,
+    projectService,
+    localeService,
+    keyService,
+    messageService
+  ).pipe(
     concatMap(({ accessToken, project }) =>
       messageService
         .find({

ui/libs/generator/src/lib/personas/abraham.persona.ts

@@ -3,11 +3,14 @@ import { Injector } from '@angular/core';
 import {
   AccessTokenService,
   errorMessage,
+  KeyService,
   LocaleService,
-  ProjectService
+  MessageService,
+  ProjectService,
+  UserService
 } from '@dev/translatr-sdk';
 import { Observable, of } from 'rxjs';
-import { catchError, filter, map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs/operators';
 import { LoadGeneratorConfig } from '../load-generator-config';
 import { createRandomLocale } from '../locale';
 import { WeightedPersona } from '../weighted-persona';
@@ -23,26 +26,34 @@ const info: WeightedPersona = {
 };
 
 export class AbrahamPersona extends Persona {
+  private readonly accessTokenService: AccessTokenService;
+  private readonly userService: UserService;
   private readonly projectService: ProjectService;
   private readonly localeService: LocaleService;
-  private readonly accessTokenService: AccessTokenService;
+  private readonly keyService: KeyService;
+  private readonly messageService: MessageService;
 
   constructor(config: LoadGeneratorConfig, injector: Injector) {
     super(info.name, config, injector);
 
     this.accessTokenService = injector.get(AccessTokenService);
+    this.userService = injector.get(UserService);
     this.projectService = injector.get(ProjectService);
     this.localeService = injector.get(LocaleService);
+    this.keyService = injector.get(KeyService);
+    this.messageService = injector.get(MessageService);
   }
 
   execute(): Observable<string> {
     return createRandomLocale(
       this.accessTokenService,
+      this.userService,
       this.projectService,
       this.localeService,
+      this.keyService,
+      this.messageService,
       this.config.accessToken
     ).pipe(
-      filter(locale => Boolean(locale)),
       map(
         locale =>
           `locale ${locale.name} for project ${locale.projectOwnerUsername}/${locale.projectName} created`

ui/libs/generator/src/lib/personas/anna.persona.ts

@@ -3,11 +3,14 @@ import { Injector } from '@angular/core';
 import {
   AccessTokenService,
   errorMessage,
+  KeyService,
   LocaleService,
-  ProjectService
+  MessageService,
+  ProjectService,
+  UserService
 } from '@dev/translatr-sdk';
 import { Observable, of } from 'rxjs';
-import { catchError, filter, map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs/operators';
 import { LoadGeneratorConfig } from '../load-generator-config';
 import { deleteRandomLocale } from '../locale';
 import { WeightedPersona } from '../weighted-persona';
@@ -24,25 +27,33 @@ const info: WeightedPersona = {
 
 export class AnnaPersona extends Persona {
   private readonly accessTokenService: AccessTokenService;
+  private readonly userService: UserService;
   private readonly projectService: ProjectService;
   private readonly localeService: LocaleService;
+  private readonly keyService: KeyService;
+  private readonly messageService: MessageService;
 
   constructor(config: LoadGeneratorConfig, injector: Injector) {
     super(info.name, config, injector);
 
     this.accessTokenService = injector.get(AccessTokenService);
+    this.userService = injector.get(UserService);
     this.projectService = injector.get(ProjectService);
     this.localeService = injector.get(LocaleService);
+    this.keyService = injector.get(KeyService);
+    this.messageService = injector.get(MessageService);
   }
 
   execute(): Observable<string> {
     return deleteRandomLocale(
       this.accessTokenService,
+      this.userService,
       this.projectService,
       this.localeService,
+      this.keyService,
+      this.messageService,
       this.config.accessToken
     ).pipe(
-      filter(locale => Boolean(locale)),
       map(
         locale =>
           `locale ${locale.name} of project ${locale.projectOwnerUsername}/${locale.projectName} removed`