src/middleware/Albums.js

@@ -191,11 +191,10 @@ class Albums extends Pages {
     async patchOne() {
         const { itemId: _id } = this.req.params;
         const { _id: User } = this.req.user;
-        const query = {
+        const album = await AlbumsModel.findOne({
             _id,
             User,
-        };
-        const album = await AlbumsModel.findOne(query);
+        });
 
         if (!album) {
             throw new ErrorEvent(
@@ -207,7 +206,9 @@ class Albums extends Pages {
 
         const values = await getAlbumDetails(album.discogsId);
 
-        return AlbumsModel.findOneAndUpdate(query, values, { new: true });
+        await album.updateOne(values);
+
+        return album;
     }
 
     /**

views/pages/collection.ejs

@@ -196,19 +196,19 @@
 
                 let url = `/api/v1/albums?userId=${this.userId}&page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`;
                 if ( this.artist ) {
-                    url += `&artists_sort=${this.artist.replace('&', '%26')}`;
+                    url += `&artists_sort=${this.artist}`;
                 }
                 if ( this.format ) {
-                    url += `&format=${this.format.replace('&', '%26')}`;
+                    url += `&format=${this.format}`;
                 }
                 if ( this.year ) {
                     url += `&year=${this.year}`;
                 }
                 if ( this.genre ) {
-                    url += `&genre=${this.genre.replace('&', '%26')}`;
+                    url += `&genre=${this.genre}`;
                 }
                 if ( this.style ) {
-                    url += `&style=${this.style.replace('&', '%26')}`;
+                    url += `&style=${this.style}`;
                 }
 
                 axios.get(url)

views/pages/mon-compte/ma-collection/index.ejs

@@ -250,19 +250,19 @@
 
                 let url = `/api/v1/albums?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`;
                 if ( this.artist ) {
-                    url += `&artists_sort=${this.artist.replace('&', '%26')}`;
+                    url += `&artists_sort=${this.artist}`;
                 }
                 if ( this.format ) {
-                    url += `&format=${this.format.replace('&', '%26')}`;
+                    url += `&format=${this.format}`;
                 }
                 if ( this.year ) {
                     url += `&year=${this.year}`;
                 }
                 if ( this.genre ) {
-                    url += `&genre=${this.genre.replace('&', '%26')}`;
+                    url += `&genre=${this.genre}`;
                 }
                 if ( this.style ) {
-                    url += `&style=${this.style.replace('&', '%26')}`;
+                    url += `&style=${this.style}`;
                 }
 
                 axios.get(url)