Merge pull request #1735 from hedgedoc/fix-username

src/media/media-upload.dto.ts

@@ -33,10 +33,10 @@ export class MediaUploadDto {
   createdAt: Date;
 
   /**
-   * The userName of the user which uploaded the media file.
+   * The username of the user which uploaded the media file.
    * @example "testuser5"
    */
   @IsString()
   @ApiProperty()
-  userName: string;
+  username: string;
 }

src/media/media.service.spec.ts

@@ -168,7 +168,7 @@ describe('MediaService', () => {
         id: 'testMediaUpload',
         backendData: 'testBackendData',
         user: {
-          userName: 'hardcoded',
+          username: 'hardcoded',
         } as User,
       } as MediaUpload;
       jest
@@ -191,20 +191,20 @@ describe('MediaService', () => {
   describe('findUploadByFilename', () => {
     it('works', async () => {
       const testFileName = 'testFilename';
-      const userName = 'hardcoded';
+      const username = 'hardcoded';
       const backendData = 'testBackendData';
       const mockMediaUploadEntry = {
         id: 'testMediaUpload',
         backendData: backendData,
         user: {
-          userName: userName,
+          username: username,
         } as User,
       } as MediaUpload;
       jest
         .spyOn(mediaRepo, 'findOne')
         .mockResolvedValueOnce(mockMediaUploadEntry);
       const mediaUpload = await service.findUploadByFilename(testFileName);
-      expect(mediaUpload.user.userName).toEqual(userName);
+      expect(mediaUpload.user.username).toEqual(username);
       expect(mediaUpload.backendData).toEqual(backendData);
     });
     it("fails: can't find mediaUpload", async () => {
@@ -223,28 +223,28 @@ describe('MediaService', () => {
           id: 'testMediaUpload',
           backendData: 'testBackendData',
           user: {
-            userName: 'hardcoded',
+            username: 'hardcoded',
           } as User,
         } as MediaUpload;
         jest
           .spyOn(mediaRepo, 'find')
           .mockResolvedValueOnce([mockMediaUploadEntry]);
         expect(
-          await service.listUploadsByUser({ userName: 'hardcoded' } as User),
+          await service.listUploadsByUser({ username: 'hardcoded' } as User),
         ).toEqual([mockMediaUploadEntry]);
       });
 
       it('without uploads from user', async () => {
         jest.spyOn(mediaRepo, 'find').mockResolvedValueOnce([]);
         const mediaList = await service.listUploadsByUser({
-          userName: 'hardcoded',
+          username: 'hardcoded',
         } as User);
         expect(mediaList).toEqual([]);
       });
       it('with error (undefined as return value of find)', async () => {
         jest.spyOn(mediaRepo, 'find').mockResolvedValueOnce(undefined);
         const mediaList = await service.listUploadsByUser({
-          userName: 'hardcoded',
+          username: 'hardcoded',
         } as User);
         expect(mediaList).toEqual([]);
       });
@@ -278,7 +278,7 @@ describe('MediaService', () => {
         expect(mediaList).toEqual([]);
       });
       it('with error (undefined as return value of find)', async () => {
-        jest.spyOn(mediaRepo, 'find').mockResolvedValueOnce(undefined);
+        jest.spyOn(mediaRepo, 'find').mockResolvedValueOnce([]);
         const mediaList = await service.listUploadsByNote({
           id: '123',
         } as Note);
@@ -296,7 +296,7 @@ describe('MediaService', () => {
           aliases: [Alias.create('test', true)],
         } as Note,
         user: {
-          userName: 'hardcoded',
+          username: 'hardcoded',
         } as User,
       } as MediaUpload;
       jest

src/media/media.service.ts

@@ -78,7 +78,7 @@ export class MediaService {
    */
   async saveFile(fileBuffer: Buffer, user: User, note: Note): Promise<string> {
     this.logger.debug(
-      `Saving file for note '${note.id}' and user '${user.userName}'`,
+      `Saving file for note '${note.id}' and user '${user.username}'`,
       'saveFile',
     );
     const fileTypeResult = await FileType.fromBuffer(fileBuffer);
@@ -223,7 +223,7 @@ export class MediaService {
       url: mediaUpload.fileUrl,
       noteId: mediaUpload.note?.id ?? null,
       createdAt: mediaUpload.createdAt,
-      userName: mediaUpload.user.userName,
+      username: mediaUpload.user.username,
     };
   }