Support receiving two albums with the same names

Signed-off-by: Louis Chemineau <[email protected]>

Author: artonge

cypress/e2e/shared_albums.cy.js

@@ -161,4 +161,29 @@ describe('Manage shared albums', () => {
       cy.get('ul.collections__list li').should('have.length', 3)
     })
   })
+
+  context('Two shared albums with the same name', () => {
+    before(() => {
+      cy.logout()
+      cy.login(randUser, 'password')
+      cy.visit(`${Cypress.env('baseUrl')}/index.php/apps/photos/albums`)
+      cy.createAnAlbumFromAlbums('shared_album_test5')
+      cy.addCollaborators([randUser2])
+      cy.logout()
+
+      cy.login(randUser3, 'password')
+      cy.visit(`${Cypress.env('baseUrl')}/index.php/apps/photos/albums`)
+      cy.createAnAlbumFromAlbums('shared_album_test5')
+      cy.addCollaborators([randUser2])
+      cy.logout()
+    })
+
+
+    it('It should display two shared albums', () => {
+      cy.get('ul.collections__list li')
+        .contains(`shared_album_test5 (${randUser})`)
+      cy.get('ul.collections__list li')
+        .contains(`shared_album_test5 (${randUser3})`)
+    })
+  })
 })

lib/Album/AlbumMapper.php

@@ -364,11 +364,11 @@ public function getSharedAlbumsForCollaboratorWithFiles(string $collaboratorId,
 			if ($row['fileid']) {
 				$mimeId = $row['mimetype'];
 				$mimeType = $this->mimeTypeLoader->getMimetypeById($mimeId);
-				$filesByAlbum[$albumId][] = new AlbumFile((int)$row['fileid'], $row['file_name'], $mimeType, (int)$row['size'], (int)$row['mtime'], $row['etag'], (int)$row['added'], $row['owner']);
+				$filesByAlbum[$albumId][] = new AlbumFile((int)$row['fileid'], $row['album_name'].' ('.$row['album_user'].')', $mimeType, (int)$row['size'], (int)$row['mtime'], $row['etag'], (int)$row['added'], $row['owner']);
 			}
 
 			if (!isset($albumsById[$albumId])) {
-				$albumsById[$albumId] = new AlbumInfo($albumId, $row['album_user'], $row['album_name'], $row['location'], (int)$row['created'], (int)$row['last_added_photo']);
+				$albumsById[$albumId] = new AlbumInfo($albumId, $row['album_user'], $row['album_name'].' ('.$row['album_user'].')', $row['location'], (int)$row['created'], (int)$row['last_added_photo']);
 			}
 		}
 
@@ -419,7 +419,7 @@ public function getAlbumForCollaboratorIdAndFileId(string $collaboratorId, int $
 			return new AlbumInfo(
 				(int)$row['album_id'],
 				$row['user'],
-				$row['name'],
+				$row['name'].' ('.$row['user'].')',
 				$row['location'],
 				(int)$row['created'],
 				(int)$row['last_added_photo']