From 3a05ced86ecccf1bc09d78fc06ec788e7c304187 Mon Sep 17 00:00:00 2001
From: Roxana Riza <roxana_r2000@yahoo.com>
Date: Mon, 7 Oct 2024 21:37:30 +0300
Subject: [PATCH] Related_lessons with the same artist && genre should be
 available only for songs

---
 src/services/sanity.js          | 4 ++--
 test/sanityQueryService.test.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/services/sanity.js b/src/services/sanity.js
index e2af9bf..4494388 100644
--- a/src/services/sanity.js
+++ b/src/services/sanity.js
@@ -971,8 +971,8 @@ export async function fetchRelatedLessons(railContentId, brand) {
    _type, parent_type, railcontent_id,
               "related_lessons" : array::unique([
                 ...(*[references(^._id)][0].child[]->{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type}),
-                ...(*[_type=="song" && brand == "${brand}" && references(^.artist->_id) && railcontent_id !=${railContentId}]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type}|order(published_on desc, title asc)[0...11]),
-                ...(*[_type=="song" && brand == "${brand}" && references(^.genre[]->_id) && railcontent_id !=${railContentId}]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type}|order(published_on desc, title asc)[0...11]),
+                ...(*[_type=="song" && _type==^._type && brand == "${brand}" && references(^.artist->_id) && railcontent_id !=${railContentId}]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type}|order(published_on desc, title asc)[0...11]),
+                ...(*[_type=="song" && _type==^._type && brand == "${brand}" && references(^.genre[]->_id) && railcontent_id !=${railContentId}]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type}|order(published_on desc, title asc)[0...11]),
                 ...(*[_type==^._type &&  _type in ${JSON.stringify(typeWithSortOrder)} && brand == "${brand}" && railcontent_id !=${railContentId}]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type, sort}|order(sort asc, title asc)[0...11]),
                 ...(*[_type==^._type && !(_type in ${JSON.stringify(typeWithSortOrder)}) && brand == "${brand}" && railcontent_id !=${railContentId}]{_id, "id":railcontent_id, published_on, title, "thumbnail_url":thumbnail.asset->url, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type}|order(published_on desc, title asc)[0...11]),
                 ])[0...11]}`;
diff --git a/test/sanityQueryService.test.js b/test/sanityQueryService.test.js
index 02b9d88..3d633d9 100644
--- a/test/sanityQueryService.test.js
+++ b/test/sanityQueryService.test.js
@@ -273,7 +273,7 @@ describe('Sanity Queries', function () {
             expect(lesson.sort).toBeGreaterThan(episode);
             episode = lesson.sort;
         });
-    },10000);
+    });
 
     test('fetchRelatedLessons-child', async () => {
         const id = 362278;