From 2997bfdb2df8c9f83803607f2f15fb96680bf4d4 Mon Sep 17 00:00:00 2001 From: Michelle Brier Date: Mon, 6 Feb 2023 12:14:14 -0800 Subject: [PATCH 1/3] encode artist pick in user response --- discovery-provider/src/api/v1/helpers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/discovery-provider/src/api/v1/helpers.py b/discovery-provider/src/api/v1/helpers.py index 3e4278a0786..03d9cac5eae 100644 --- a/discovery-provider/src/api/v1/helpers.py +++ b/discovery-provider/src/api/v1/helpers.py @@ -127,6 +127,9 @@ def extend_user(user, current_user_id=None): return user user_id = encode_int_id(user["user_id"]) user["id"] = user_id + if user.get("artist_pick_track_id"): + artist_pick_track_id = encode_int_id(user["artist_pick_track_id"]) + user["artist_pick_track_id"] = artist_pick_track_id user = add_user_artwork(user) # Do not surface playlist library in user response unless we are # that user specifically From 170a95b3702c261c62674cd9e15b9f6ada3dbb83 Mon Sep 17 00:00:00 2001 From: Michelle Brier Date: Mon, 6 Feb 2023 12:35:37 -0800 Subject: [PATCH 2/3] Fix field type --- discovery-provider/src/api/v1/models/users.py | 2 +- libs/package-lock.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/discovery-provider/src/api/v1/models/users.py b/discovery-provider/src/api/v1/models/users.py index 4fb90e103e0..9ed2424163c 100644 --- a/discovery-provider/src/api/v1/models/users.py +++ b/discovery-provider/src/api/v1/models/users.py @@ -28,7 +28,7 @@ "user", { "album_count": fields.Integer(required=True), - "artist_pick_track_id": fields.Integer(allow_null=True), + "artist_pick_track_id": fields.String(allow_null=True), "bio": fields.String, "cover_photo": fields.Nested(cover_photo, allow_null=True), "followee_count": fields.Integer(required=True), diff --git a/libs/package-lock.json b/libs/package-lock.json index fb03ea314c9..196e9517a68 100644 --- a/libs/package-lock.json +++ b/libs/package-lock.json @@ -6591,7 +6591,7 @@ "es6-promisify": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==", "requires": { "es6-promise": "^4.0.3" } @@ -7809,7 +7809,7 @@ "eyes": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=" + "integrity": "sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ==" }, "fast-deep-equal": { "version": "3.1.3", @@ -9522,7 +9522,7 @@ "jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=" + "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==" }, "jsonschema": { "version": "1.2.6", @@ -14441,7 +14441,7 @@ "wif": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz", - "integrity": "sha1-CNP1IFbGZnkplyb63g1DKudLRwQ=", + "integrity": "sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ==", "requires": { "bs58check": "<3.0.0" } From 4b3c1f26c5cce8b90efb10a2bc3b4b96618bcc02 Mon Sep 17 00:00:00 2001 From: Michelle Brier Date: Mon, 6 Feb 2023 13:10:45 -0800 Subject: [PATCH 3/3] Accidentally checked --- libs/package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/package-lock.json b/libs/package-lock.json index 196e9517a68..fb03ea314c9 100644 --- a/libs/package-lock.json +++ b/libs/package-lock.json @@ -6591,7 +6591,7 @@ "es6-promisify": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", "requires": { "es6-promise": "^4.0.3" } @@ -7809,7 +7809,7 @@ "eyes": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ==" + "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=" }, "fast-deep-equal": { "version": "3.1.3", @@ -9522,7 +9522,7 @@ "jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==" + "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=" }, "jsonschema": { "version": "1.2.6", @@ -14441,7 +14441,7 @@ "wif": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz", - "integrity": "sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ==", + "integrity": "sha1-CNP1IFbGZnkplyb63g1DKudLRwQ=", "requires": { "bs58check": "<3.0.0" }