Merge branch 'feature/removing-read-all-tracks' into develop

* feature/removing-read-all-tracks:
  We actually need this method to be backward compatible.
  Removing `ReadAllTracks` from the interface since it returns a low-level TrackData object which shouldn't be exposed to the general public.

Author: AddictedCS

src/SoundFingerprinting.Tests/Integration/FingerprintCommandBuilderIntTest.cs

@@ -15,7 +15,7 @@
     public class FingerprintCommandBuilderIntTest : IntegrationWithSampleFilesTest
     {
         private readonly DefaultFingerprintConfiguration config = new DefaultFingerprintConfiguration();
-        private readonly IAudioService audioService = new SoundFingerprintingAudioService();
+        private readonly SoundFingerprintingAudioService audioService = new SoundFingerprintingAudioService();
 
         [Test]
         public async Task CreateFingerprintsFromFileAndAssertNumberOfFingerprints()

src/SoundFingerprinting.Tests/Integration/InMemoryModelServiceSerializationTest.cs

@@ -66,15 +66,12 @@ public void ShouldSerializeAndIncrementNextIdCorrectly()
             var secondTrack = new TrackInfo("id2", "title", "artist");
             fromFileService.Insert(secondTrack, new Hashes(new[] { new HashedFingerprint(GenericHashBuckets(), 1, 0f, Array.Empty<byte>()) }, 1.48, DateTime.Now, Enumerable.Empty<string>()));
 
-            var tracks = fromFileService.ReadAllTracks().ToList();
+            var tracks = fromFileService.GetTrackIds().ToList();
 
             File.Delete(tempFile);
 
-            var ref1 = tracks.First(track => track.Id == "id1").TrackReference;
-            var ref2 = tracks.First(track => track.Id == "id2").TrackReference;
-            Assert.IsTrue(tracks.Any(track => track.Id == "id1"));
-            Assert.IsTrue(tracks.Any(track => track.Id == "id2"));
-            Assert.IsTrue(!ref1.Equals(ref2));
+            Assert.IsTrue(tracks.Any(track => track == "id1"));
+            Assert.IsTrue(tracks.Any(track => track == "id2"));
         }
 
         [Test]

src/SoundFingerprinting.Tests/Integration/InMemoryModelServiceTest.cs

@@ -68,7 +68,7 @@ public void ReadMultipleTracksTest()
                 modelService.Insert(track, new Hashes(new[] { new HashedFingerprint(GenericHashBuckets(), 0, 0f, Array.Empty<byte>()) }, 1.48d, DateTime.Now, Enumerable.Empty<string>()));
             }
 
-            var actualTracks = modelService.ReadAllTracks().ToList();
+            var actualTracks = modelService.GetTrackIds().ToList();
 
             Assert.AreEqual(numberOfTracks, actualTracks.Count);
         }

src/SoundFingerprinting.Tests/Integration/SoundFingerprintingAudioServiceIntTest.cs

@@ -7,11 +7,11 @@
     [TestFixture]
     public class SoundFingerprintingAudioServiceIntTest : IntegrationWithSampleFilesTest
     {
-        private readonly IAudioService audioService = new SoundFingerprintingAudioService();
-
         [Test]
         public void ShouldEstimateLengthCorrectly()
         {
+            var audioService = new SoundFingerprintingAudioService();
+                
             var duration = audioService.GetLengthInSeconds(PathToWav);
 
             Assert.AreEqual(10.0f, duration, 0.1);

src/SoundFingerprinting.Tests/Integration/TrackDaoTest.cs

@@ -54,17 +54,17 @@ public void MultipleInsertTest()
         }
 
         [Test]
-        public void ReadAllTracksTest()
+        public void GetTrackIdsTest()
         {
             const int trackCount = 5;
             var expectedTracks = InsertTracks(trackCount);
 
-            var tracks = trackDao.ReadAll().ToList();
+            var tracks = trackDao.GetTrackIds().ToList();
 
             Assert.AreEqual(trackCount, tracks.Count);
             foreach (var expectedTrack in expectedTracks)
             {
-                Assert.IsTrue(tracks.Any(track => track.Id == expectedTrack.Id));
+                Assert.IsTrue(tracks.Any(trackId => trackId == expectedTrack.Id));
             }
         }
 
@@ -74,7 +74,7 @@ public void InsertMultipleTrackAtOnceTest()
             const int trackCount = 100;
             var tracks = InsertTracks(trackCount);
 
-            var actualTracks = trackDao.ReadAll().ToList();
+            var actualTracks = trackDao.GetTrackIds().ToList();
 
             Assert.AreEqual(tracks.Count, actualTracks.Count);
         }
@@ -96,15 +96,16 @@ public void DeleteCollectionOfTracksTest()
             const int numberOfTracks = 10;
             InsertTracks(numberOfTracks);
 
-            var allTracks = trackDao.ReadAll().ToList();
+            var allTracks = trackDao.GetTrackIds().ToList();
 
             Assert.IsTrue(allTracks.Count == numberOfTracks);
-            foreach (var track in allTracks)
+            foreach (var track in allTracks.Select(trackId => trackDao.ReadTrackById(trackId)))
             {
+                Assert.IsNotNull(track);
                 trackDao.DeleteTrack(track.TrackReference);
             }
 
-            Assert.IsFalse(trackDao.ReadAll().Any());
+            Assert.IsFalse(trackDao.GetTrackIds().Any());
         }
 
         [Test]

src/SoundFingerprinting/Audio/IAudioService.cs

@@ -3,7 +3,7 @@
     using System.Collections.Generic;
 
     /// <summary>
-    ///  Audio service used to read and resample audio from a datasource
+    ///  Audio service used to read and resample audio from a data source
     /// </summary>
     public interface IAudioService
     {
@@ -29,12 +29,5 @@ public interface IAudioService
         /// <param name="sampleRate">Target sample rate</param>
         /// <returns>Audio samples</returns>
         AudioSamples ReadMonoSamplesFromFile(string pathToSourceFile, int sampleRate);
-
-        /// <summary>
-        ///  Returns a usually accurate estimate for the length of the file
-        /// </summary>
-        /// <param name="pathToSourceFile">Path to audio source to get it's length from</param>
-        /// <returns>Length in seconds</returns>
-        float GetLengthInSeconds(string pathToSourceFile);
     }
 }

src/SoundFingerprinting/DAO/ITrackDao.cs

@@ -20,5 +20,7 @@ public interface ITrackDao
         TrackData? ReadTrackById(string id);
 
         IEnumerable<TrackData> ReadAll();
+        
+        IEnumerable<string> GetTrackIds();
     }
 }

src/SoundFingerprinting/Data/TrackInfo.cs

@@ -52,5 +52,21 @@ public override string ToString()
                    $"MediaType {MediaType}, " +
                    $"MetaFields {string.Join(",", MetaFields.Select(pair => $"{pair.Key}:{pair.Value}"))}";
         }
+
+        public override int GetHashCode()
+        {
+            return Id.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+                return false;
+
+            if (!(obj is TrackInfo trackInfo))
+                return false;
+
+            return Id.Equals(trackInfo.Id) && MediaType.Equals(trackInfo.MediaType);
+        }
     }
 }

src/SoundFingerprinting/IModelService.cs

@@ -29,7 +29,6 @@ public interface IModelService
         /// <returns>List of matched fingerprints</returns>
         IEnumerable<SubFingerprintData> Query(Hashes hashes, QueryConfiguration config);
 
-        
         /// <summary>
         ///  Read tracks by model references
         /// </summary>
@@ -52,9 +51,9 @@ public interface IModelService
         TrackInfo? ReadTrackById(string trackId);
 
         /// <summary>
-        ///  Read all tracks from the storage
+        ///  Read all track ids from the storage
         /// </summary>
-        /// <returns>List of all inserted tracks</returns>
-        IEnumerable<TrackData> ReadAllTracks();
+        /// <returns>List of all inserted track ids</returns>
+        IEnumerable<string> GetTrackIds();
     }
 }

src/SoundFingerprinting/InMemory/TrackDao.cs

@@ -33,6 +33,11 @@ public TrackData ReadTrackById(string id)
             return storage.Tracks.FirstOrDefault(pair => pair.Value.Id == id).Value;
         }
 
+        public IEnumerable<string> GetTrackIds()
+        {
+            return storage.Tracks.Values.Select(_ => _.Id);
+        }
+
         public IEnumerable<TrackData> ReadAll()
         {
             return storage.Tracks.Values;