Code Refactor

Author: lakshaykamat

controllers/albumController.js

@@ -30,6 +30,7 @@ const getAlbum = async (req, res) => {
     const songs = await Promise.all(songPromises);
 
     album.tracks = cleanUpSongs(songs, album);
+    album.songs = album.tracks.length;
 
     res.json(album);
   } catch (error) {
@@ -48,6 +49,7 @@ const getAllAlbums = async (req, res) => {
       const songs = await Promise.all(songPromises);
 
       album.tracks = cleanUpSongs(songs, album);
+      album.songs = album.tracks.length;
     }
 
     return res.json(albums);
@@ -83,8 +85,7 @@ const deleteAlbum = async (req, res) => {
 
 const newAlbum = async (req, res) => {
   try {
-    const { title, artist, releaseYear, releaseDate, albumCover, user } =
-      req.body;
+    const { title, artist, releaseDate, albumCover, user } = req.body;
     if (!user || !isAdmin(user.username, user.password)) {
       return res.status(403).send("Forbidden");
     }

controllers/songController.js

@@ -1,11 +1,11 @@
 const Song = require("../models/Song");
 const Album = require("../models/Album");
-const { isAdmin } = require("../utils");
+const { isAdmin, getAlbumDetails } = require("../utils");
 
 const getSong = async (req, res) => {
   try {
     const { name } = req.params;
-    const song = await Song.findOne({ name })
+    const song = await Song.findOne({ name: { $regex: name, $options: "i" } })
       .select("-__v -_id") // Exclude unnecessary fields
       .lean();
 
@@ -14,29 +14,19 @@ const getSong = async (req, res) => {
     }
 
     // Get album details without the tracks property
-    const album = await Album.findById(song.albumId)
-      .select("-__v -_id") // Exclude unnecessary fields
-      .lean();
+    const albumDetails = await getAlbumDetails(song.albumId);
 
-    if (!album) {
+    if (!albumDetails) {
       return res.status(404).json({ error: "Album not found" });
     }
 
-    const albumDetails = {
-      title: album.title,
-      albumCover: album.albumCover,
-      artist: album.artist,
-      releaseYear: album.releaseYear,
-      releaseDate: album.realeaseDate,
-    };
-
     res.json({
       ...song,
       album: albumDetails,
     });
   } catch (error) {
-    console.error("Error fetching song:", error.message);
-    res.status(500).json({ error: "Internal Server Error" });
+    console.error("Error fetching songs");
+    errorHandler(res, error);
   }
 };
 
@@ -45,19 +35,22 @@ const getAllSongs = async (req, res) => {
     const songs = await Song.find().select("-__v -_id").lean();
 
     for (const song of songs) {
-      const album = await Album.findById(song.albumId)
-        .select("-__v -_id")
-        .lean();
+      // Use getAlbumDetails to get album details from albumId
+      const albumDetails = await getAlbumDetails(song.albumId);
 
-      if (album) {
-        song.albumName = album.title;
+      if (albumDetails) {
+        song.albumName = albumDetails.albumName;
         delete song.albumId; // Remove the original albumId field
       }
     }
 
     res.json(songs);
   } catch (error) {
-    console.error("Error fetching songs:", error.message);
+    console.error("Error fetching songs");
+    errorHandler(res, error);
+  }
+};
+
     res.status(500).json({ error: "Internal Server Error" });
   }
 };
@@ -95,8 +88,8 @@ const newSong = async (req, res) => {
 
     res.json(savedSongs);
   } catch (error) {
-    console.error("Error creating songs and updating album:", error.message);
-    res.status(500).json({ error: "Internal Server Error" });
+    console.error("Error creating a song and updating an album");
+    errorHandler(res, error);
   }
 };
 

models/Album.js

@@ -13,11 +13,7 @@ const albumSchema = new mongoose.Schema({
     type: String,
     required: true,
   },
-  releaseYear: {
-    type: Number,
-    required: true,
-  },
-  realeaseDate: {
+  releaseDate: {
     type: Array,
     required: true,
   },

utils/index.js

@@ -1,3 +1,4 @@
+const Album = require("../models/Album");
 const isAdmin = (usernameToCheck, passwordToCheck) => {
   const USER = [
     {
@@ -19,4 +20,31 @@ const isAdmin = (usernameToCheck, passwordToCheck) => {
   return false;
 };
 
-module.exports = { isAdmin };
+const getAlbumName = async (albumId) => {
+  try {
+    const album = await Album.findById(albumId).select("title").lean();
+
+    return album ? album.title : null;
+  } catch (error) {
+    console.error("Error fetching album name:", error.message);
+    return null;
+  }
+};
+
+const getAlbumDetails = async (albumId) => {
+  try {
+    const album = await Album.findById(albumId).select("-__v -_id").lean();
+    return album
+      ? {
+          albumName: album.title,
+          albumCover: album.albumCover,
+          artist: album.artist,
+          releaseDate: album.releaseDate,
+        }
+      : null;
+  } catch (error) {
+    console.error("Error fetching album details:", error.message);
+    return null;
+  }
+};
+module.exports = { isAdmin, getAlbumName, getAlbumDetails };