fix: ann_id removed

Author: rombat

lib/handlers/MBNDSynchronizer.js

@@ -1,7 +1,6 @@
 const fs = require('fs');
 const csv2json = require('csvtojson');
 const { Op } = require('sequelize');
-const { randomUUID } = require('crypto');
 const pLimit = require('p-limit');
 const camelCase = require('camelcase');
 const dayjs = require('dayjs');
@@ -250,7 +249,6 @@ class MBNDSynchronizer {
           let annotation = foundTrack?.trackAnnotation;
           if (!annotation) {
             annotation = Annotation.build({
-              ann_id: randomUUID(),
               item_type: 'media_file',
               user_id: user.id,
               item_id: foundTrack.id,
@@ -364,7 +362,6 @@ class MBNDSynchronizer {
             let annotation = album?.albumAnnotation;
             if (!annotation) {
               annotation = Annotation.build({
-                ann_id: randomUUID(),
                 item_type: 'album',
                 user_id: user.id,
                 item_id: album.id,
@@ -476,7 +473,6 @@ class MBNDSynchronizer {
           let annotation = artist?.artistAnnotation;
           if (!annotation) {
             annotation = Annotation.build({
-              ann_id: randomUUID(),
               item_type: 'artist',
               user_id: user.id,
               item_id: artist.id,

lib/handlers/dbManager.js

@@ -44,4 +44,7 @@ const createRelationships = sequelize => {
   Annotation.belongsTo(Track, { as: 'track', foreignKey: 'item_id' });
   Annotation.belongsTo(Album, { as: 'album', foreignKey: 'item_id' });
   Annotation.belongsTo(User, { as: 'user', foreignKey: 'user_id' });
+  // ann_id removed from navidrome DB schema in this commit: https://github.com/navidrome/navidrome/commit/47378c68828861751b9d1a05d3fc9b29ce8dd9f0
+  // Sequelize sets an id attribute by default as primary key, which is not needed in this case
+  Annotation.removeAttribute('id');
 };

lib/models/Annotation.js

@@ -2,7 +2,6 @@ const { DataTypes } = require('sequelize');
 const dayjs = require('dayjs');
 
 exports.attributes = {
-  ann_id: { type: DataTypes.STRING, primaryKey: true, allowNull: false },
   user_id: { type: DataTypes.STRING, allowNull: false, defaultValue: '' },
   item_id: { type: DataTypes.STRING, allowNull: false, defaultValue: '' },
   item_type: { type: DataTypes.STRING, allowNull: false, defaultValue: '' },