Merge pull request #198 from dadosfera/feature/mixpanel-first-name

feature/mixpanel-first-name

docsfera.json

@@ -3339,7 +3339,7 @@
       }
     },
     "info": {
-      "title": "Maestro - fix/customer-schedule-limit",
+      "title": "Maestro - main",
       "description": "Documentation for Maestro gateway",
       "version": "1.0.0",
       "contact": {}

src/modules/auth/auth.controller.ts

@@ -29,7 +29,6 @@ import { AuthClientService } from './auth.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter';
 import { RequestUser, User } from 'src/authentication/user.decorator';
-import { Metadata } from '@grpc/grpc-js';
 import {
   AuthRefreshAccessTokenReq,
   AuthSignInReq,
@@ -58,8 +57,7 @@ export class AuthController {
     @Headers('Dadosfera-Lang') language: string,
   ): Promise<AuthSignInRes> {
     this.logger.info('/auth - SignIn');
-    const metadata = new Metadata();
-    metadata.add('language', language || 'pt-br');
+    const metadata = PackTheMetadata({ language: language || 'pt-br' });
     return this.authClient.signIn({ username, password, totp }, metadata);
   }
 
@@ -115,12 +113,18 @@ export class AuthController {
 
   @Post('reset-password')
   @HttpCode(HttpStatus.OK)
-  async resetPassword(@Body() body: AuthResetPasswordRequest) {
+  async resetPassword(
+    @Body() body: AuthResetPasswordRequest,
+    @Headers('dadosfera-lang') language,
+  ) {
     this.logger.info('/auth - reset-password');
+    const metadata = PackTheMetadata({
+      language: language,
+    });
 
     const { username } = body;
 
-    return this.authClient.resetPassword({ username });
+    return this.authClient.resetPassword({ username }, metadata);
   }
 
   @Post('verify-reset-password-code')

src/modules/auth/auth.service.ts

@@ -90,10 +90,15 @@ export class AuthClientService implements OnModuleInit {
     );
   }
 
-  async resetPassword({ username }: AuthResetPasswordRequest) {
+  async resetPassword(
+    { username }: AuthResetPasswordRequest,
+    metadata: Metadata,
+  ) {
     this.logger.info('resetPassword');
 
-    return lastValueFrom(this.authService.AuthResetPassword({ username }));
+    return lastValueFrom(
+      this.authService.AuthResetPassword({ username }, metadata),
+    );
   }
 
   async verifyResetPasswordCode({

src/modules/mixpanel/mixpanel.controller.ts

@@ -15,9 +15,55 @@ export class MixpanelController {
     delete body.info;
     const mixpanel = init(this.mixpanelToken);
 
+    const separator = user.username.includes('-') ? '-' : '.';
+    const removeValues = [
+      '.dadosferatech.dadosfera',
+      '.demo.dadosfera',
+      '.dadosferademo',
+      '.dadosferarh.dadosfera',
+      '.dadosferatech.dadosfera2',
+      '.dadosferatech.dadosfera',
+      '.dadosfera.fin',
+      '.dadosferafin.dadosfera',
+      '.praxio.dadosfera',
+      '.dadosfera.tech',
+      '.treinamentos@dadosfera.ai',
+      '.dadosfera2',
+      '.treinamentosfera',
+      '.dadosfera',
+    ];
+
+    let username = user.username;
+
+    removeValues.forEach((value) => {
+      username = username.replace(value, '');
+    });
+
+    username = username.split('@')?.[0];
+    username = username.split('+')?.[0];
+
+    let firstName = username
+      .substring(0, username.indexOf(separator))
+      .replace('dadosfera', '');
+    let lastName = username
+      .substring(username.lastIndexOf(separator) + 1)
+      .replace('dadosfera', '');
+
+    if (!firstName) {
+      firstName = lastName;
+      lastName = '';
+    }
+
+    firstName = this.capitalize(firstName);
+    lastName = this.capitalize(lastName);
+
     await mixpanel.people.set(user.username, {
-      $name: user.username,
-      $email: user.username,
+      $first_name: firstName,
+      $last_name: lastName,
+      $name: this.getFullName(firstName, lastName),
+      $email: user.username.includes('@')
+        ? user.username
+        : user.username + '@dadosfera.ai',
       customer_name: user.customer_name,
     });
 
@@ -30,4 +76,16 @@ export class MixpanelController {
 
     return { id, body, user: user.username };
   }
+
+  capitalize(sentence: string): string {
+    if (!sentence) {
+      return '';
+    }
+
+    return sentence[0].toUpperCase() + sentence.substring(1);
+  }
+
+  getFullName(firstName: string, lastName: string) {
+    return `${firstName}${lastName ? ' ' + lastName : ''}`;
+  }
 }

src/modules/users/users.controller.ts

@@ -48,9 +48,9 @@ import {
   IUserByCustomer,
 } from './dtos/entities';
 import { UsersService } from './users.service';
-import { Metadata } from '@grpc/grpc-js';
 import ErrorBuilder from 'src/utils/ErrorBuilder';
 import ErrorCodes from 'src/utils/errorCodes';
+import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 
 @ApiTags('Users')
 @Controller('users')
@@ -149,12 +149,14 @@ export class UsersController {
     @Body() body: CreateUserReq,
     @Headers('dadosfera-lang') language,
   ) {
-    const meta = new Metadata();
-    meta.add('access_token', user.access_token);
+    const metadata = PackTheMetadata({
+      access_token: user.access_token,
+      language,
+    });
     this.logger.info('createUser', { user });
     this.userService.setLanguage(language);
 
-    return await this.userService.createUser(body, meta);
+    return await this.userService.createUser(body, metadata);
   }
 
   @Post('batch')
@@ -165,11 +167,15 @@ export class UsersController {
     @Body() body: BatchCreateUserReq,
     @Headers('dadosfera-lang') language,
   ) {
-    const meta = new Metadata();
-    meta.add('access_token', user.access_token);
     this.logger.info('batchCreateUser', { user });
     this.userService.setLanguage(language);
-    return await this.userService.batchCreateUser(body, meta);
+
+    const metadata = PackTheMetadata({
+      access_token: user.access_token,
+      language,
+    });
+
+    return await this.userService.batchCreateUser(body, metadata);
   }
 
   @Post(':id/resend-invite')
@@ -182,7 +188,11 @@ export class UsersController {
   ) {
     this.logger.info('resendInvite', { user });
     this.userService.setLanguage(language);
-    return this.userService.resendInvite({ id });
+
+    const metadata = PackTheMetadata({
+      language,
+    });
+    return this.userService.resendInvite({ id }, metadata);
   }
 
   @Delete('role')

src/modules/users/users.service.ts

@@ -185,8 +185,10 @@ export class UsersService implements OnModuleInit {
     };
   }
 
-  async resendInvite(body: IdRequest) {
-    return lastValueFrom(this.usersClientService.UserResendInvite(body));
+  async resendInvite(body: IdRequest, metadata: Metadata) {
+    return lastValueFrom(
+      this.usersClientService.UserResendInvite(body, metadata),
+    );
   }
 
   async assignRoleToUser(body: AssignRoleToUserRequest) {

src/utils/ PackTheMetadata.ts

@@ -10,6 +10,7 @@ interface IMetadata {
   sensitive?: string;
   roles?: string[];
   is_data_manager?: boolean;
+  access_token?: string;
 }
 
 export function PackTheMetadata(info: IMetadata): Metadata {