conflict fix 2 and check track if its saved

GrpcShared/DTO/StatusCodeMessage.cs

@@ -19,5 +19,7 @@ namespace GrpcShared.DTO
     {
         [ProtoMember(1)]
         public HttpStatusCode ResponseMsg { get; set; }
+        [ProtoMember(2)]
+        public bool IsSaved { get; set; } = false;
     }
 }

GrpcShared/DTO/TopItem/TopItemRequest.cs

@@ -16,7 +16,7 @@ namespace GrpcShared.DTO.TopItem
         [DefaultValue(true)]
         public bool IsTracks { get; set; } = true;
         [ProtoMember(2)]
-        public int? Limit { get; set; }
+        public int? Limit { get; set; } = 9;
         [ProtoMember(3)]
         public int? Offset { get; set; }
     }

GrpcShared/DTO/TopItem/TopItemResponse.cs

@@ -14,16 +14,7 @@ namespace GrpcShared.DTO.TopItem
         [ProtoMember(1)]
         [JsonProperty("items")]
         public Item[]? Items { get; set; }
-        [ProtoMember(2)]
-        [JsonProperty("total")]
-        public int? Total { get; set; }
-        [ProtoMember(3)]
-        [JsonProperty("limit")]
-        public int? Limit { get; set; }
-        [ProtoMember(4)]
-        [JsonProperty("offset")]
-        public int? Offset { get; set; }
-        [ProtoMember(5)]
+        [ProtoMember(2)]      
         [JsonProperty("href")]
         public Uri? Href { get; set; }
         
@@ -31,19 +22,16 @@ namespace GrpcShared.DTO.TopItem
     [ProtoContract]
     public partial class Item
     {      
-        [ProtoMember(1)]
-        [JsonProperty("genres")]
-        public string[]? Genres { get; set; }
-        [ProtoMember(2)]
+        [ProtoMember(1)]      
         [JsonProperty("id")]
         public string? Id { get; set; }
-        [ProtoMember(3)]
+        [ProtoMember(2)]
         [JsonProperty("images")]
         public Image[]? Images { get; set; }
-        [ProtoMember(4)]
+        [ProtoMember(3)]
         [JsonProperty("name")]
         public string? Name { get; set; }
-        [ProtoMember(5)]
+        [ProtoMember(4)]
         [JsonProperty("uri")]
         public string? Uri { get; set; }
     }

GrpcShared/DTO/Track/CurrentTrackResponse.cs

@@ -23,6 +23,8 @@ namespace GrpcShared.DTO.Track
         [ProtoMember(4)]
         [JsonProperty("item")]
         public Item? Item { get; set; }
+        [ProtoMember(5)]
+        public bool IsSaved { get; set; }
 
     }
     [ProtoContract]

NemAn.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32630.192
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NemAnBlazor", "NemAnCore\NemAnBlazor.csproj", "{74DCDAC5-76D7-4E06-A3F2-DE22CD37FB89}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NemAnBlazor", "NemAnBlazor\NemAnBlazor.csproj", "{74DCDAC5-76D7-4E06-A3F2-DE22CD37FB89}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpotifyService", "gRPCServer\SpotifyService.csproj", "{9E8FA4BC-BF52-47E2-8E61-A4151505ED7C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpotifyService", "SpotifyService\SpotifyService.csproj", "{9E8FA4BC-BF52-47E2-8E61-A4151505ED7C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpotifyWorker", "SpotifyWorker\SpotifyWorker.csproj", "{0CE36C12-E8D7-424A-9161-0A05306CD8BC}"
 EndProject

SpotifyService/GLOBALS.cs

@@ -9,8 +9,7 @@ namespace SpotifyService
         public const string SECRET = "ea752433d0774fad87fab5c1ee788c8d";
         //public const string REDIRECT_URI = "http://localhost:5051/callback";
         public const string REDIRECT_URI = "https://localhost:5001/callback";
-        public const string SCOPE = "user-read-currently-playing user-read-email user-library-modify user-top-read user-read-private";
-        /*
+        public const string SCOPE = "user-read-currently-playing user-read-email user-library-modify user-top-read user-read-private user-library-read";        /*
           "ClientId": "83e1d09876b049c4bb1953185a4b3bfb",
     "RedirectURI": "https://localhost:44342/callback",
     "Scope": "user-read-currently-playing user-read-email user-library-modify user-top-read user-read-private",

SpotifyService/Services/StatsService.cs

@@ -32,7 +32,18 @@ namespace SpotifyService.Services
                                          message.UserId!,
                                          _identityService,
                                          _authService);
-            
+            string savedUrl = $"me/tracks/contains?ids={response.Item!.Id}";
+
+            var savedResponse = await HttpUtils<List<bool>>
+                                  .GetData(_httpClientFactory,
+                                           savedUrl,
+                                           message.UserId!,
+                                           _identityService,
+                                           _authService);
+            if (response != null)
+            {
+                response.IsSaved = savedResponse[0];
+            }
             return response;
 
         }

SpotifyService/Services/TrackService.cs

@@ -36,25 +36,60 @@ namespace SpotifyService.Services
 
             string url = $"search?q={request.Query}&type={request.Type}";
 
-            return await HttpUtils.HttpUtils<SearchResponse>
-                                  .GetData(_httpClientFactory,
-                                           url,
-                                           request.UserId!,
-                                           _identityService,
-                                           _authService);
+            var response = await HttpUtils.HttpUtils<SearchResponse>
+                                 .GetData(_httpClientFactory,
+                                          url,
+                                          request.UserId!,
+                                          _identityService,
+                                          _authService);
+
+            //ovo je ako hocemo da dodamo da se prikazuje dal je sacuvana pesma od onih koje se pretrazuju,
+            //al ce potencijalno da prepuni requests ako ne optimizujemo  pretragu
 
+            //if (response != null)
+            //{
+            //    List<string> ids = response.Tracks!.Items!.Select(x => x.Id!).ToList();
+            //    var param = new Dictionary<string, List<string>>();
+            //    param["ids"] = ids;
+            //    var query = UriUtil(param);
+
+            //    string savedUrl = $"tracks/contains{query}";
+            //    var isSavedResponse = await HttpUtils.HttpUtils<IsSavedResponse>
+            //                                .GetData(_httpClientFactory,
+            //                               savedUrl,
+            //                               request.UserId!,
+            //                               _identityService,
+            //                               _authService);
+
+            //    for (int i = 0; i < response.Tracks.Items.Count; i++)
+            //    {
+            //        response.Tracks.Items[i].IsSaved = isSavedResponse.AreSaved[i];
+            //    }
+
+            //}
+            return response;
 
         }
         public async Task<SingleTrackResponse> ListSingleTrackAsync(SingleTrackRequest request)
         {
             string url = $"audio-features/{request.Id}";
-            
-            return await HttpUtils.HttpUtils<SingleTrackResponse>
+
+           var response = await HttpUtils.HttpUtils<SingleTrackResponse>
+                                 .GetData(_httpClientFactory,
+                                          url,
+                                          request.UserId!,
+                                          _identityService,
+                                          _authService);
+            string savedUrl = $"tracks/contains?ids={request.Id}";
+            var savedResponse = await HttpUtils.HttpUtils<List<bool>>
                                   .GetData(_httpClientFactory,
-                                           url,
+                                           savedUrl,
                                            request.UserId!,
                                            _identityService,
                                            _authService);
+            response.IsSaved = savedResponse[0];
+
+            return response;
         }
         public async Task<MultipleTrackResponse> ListMultipleTrackAsync(MultipleTrackRequest request)
         {

SpotifyService/SpotifyService.csproj

@@ -23,7 +23,7 @@
   <ItemGroup>
     <ProjectReference Include="..\GrpcShared\GrpcShared.csproj" />
     <ProjectReference Include="..\IdentityProvider\IdentityProvider.csproj" />
-    <ProjectReference Include="..\NemAnCore\NemAnBlazor.csproj" />
+    <ProjectReference Include="..\NemAnBlazor\NemAnBlazor.csproj" />
   </ItemGroup>
 
 </Project>

SpotifyService/appsettings.json

@@ -14,7 +14,7 @@
   "AuthParams": {
     "ClientId": "83e1d09876b049c4bb1953185a4b3bfb",
     "RedirectURI": "https://localhost:5001/callback",
-    "Scope": "user-read-currently-playing user-read-email user-library-modify user-top-read user-read-private",
+    "Scope": "user-read-currently-playing user-read-email user-library-modify user-top-read user-read-private user-library-read",
     "ClientSecret": "ea752433d0774fad87fab5c1ee788c8d"
   }
 }