fix: replace first and last name with single field (#4915)

2023-11-11 20:03:32 -05:00
parent 413ab2c538
commit 7fca0d8da5
98 changed files with 567 additions and 1147 deletions
@@ -38,9 +38,7 @@ export class UsageByUserDto {
  @ApiProperty({ type: 'string' })
  userId!: string;
  @ApiProperty({ type: 'string' })
-  userFirstName!: string;
-  @ApiProperty({ type: 'string' })
-  userLastName!: string;
+  userName!: string;
  @ApiProperty({ type: 'integer' })
  photos!: number;
  @ApiProperty({ type: 'integer' })
@@ -195,24 +195,21 @@ describe(ServerInfoService.name, () => {
      userMock.getUserStats.mockResolvedValue([
        {
          userId: 'user1',
-          userFirstName: '1',
-          userLastName: 'User',
+          userName: '1 User',
          photos: 10,
          videos: 11,
          usage: 12345,
        },
        {
          userId: 'user2',
-          userFirstName: '2',
-          userLastName: 'User',
+          userName: '2 User',
          photos: 10,
          videos: 20,
          usage: 123456,
        },
        {
          userId: 'user3',
-          userFirstName: '3',
-          userLastName: 'User',
+          userName: '3 User',
          photos: 100,
          videos: 0,
          usage: 987654,
@@ -227,25 +224,22 @@ describe(ServerInfoService.name, () => {
          {
            photos: 10,
            usage: 12345,
-            userFirstName: '1',
+            userName: '1 User',
            userId: 'user1',
-            userLastName: 'User',
            videos: 11,
          },
          {
            photos: 10,
            usage: 123456,
-            userFirstName: '2',
+            userName: '2 User',
            userId: 'user2',
-            userLastName: 'User',
            videos: 20,
          },
          {
            photos: 100,
            usage: 987654,
-            userFirstName: '3',
+            userName: '3 User',
            userId: 'user3',
-            userLastName: 'User',
            videos: 0,
          },
        ],
@@ -98,8 +98,7 @@ export class ServerInfoService {
    for (const user of userStats) {
      const usage = new UsageByUserDto();
      usage.userId = user.userId;
-      usage.userFirstName = user.userFirstName;
-      usage.userLastName = user.userLastName;
+      usage.userName = user.userName;
      usage.photos = user.photos;
      usage.videos = user.videos;
      usage.usage = user.usage;