From 815b98168eb8748b714518fbb14f8f396869ca70 Mon Sep 17 00:00:00 2001 From: Fernando Valverde Date: Wed, 3 Aug 2022 10:51:35 -0600 Subject: [PATCH] Include user_id fields in a couple API endpoint responses (#18214) * Include user_id fields in a couple API responses * Replace v0 partial within API v1 jbuilder views --- app/views/api/v0/shared/_follows.json.jbuilder | 1 + app/views/api/v0/shared/_user.json.jbuilder | 1 + app/views/api/v1/followers/users.json.jbuilder | 2 +- app/views/api/v1/listings/show.json.jbuilder | 6 +++--- app/views/api/v1/organizations/listings.json.jbuilder | 6 +++--- app/views/api/v1/organizations/users.json.jbuilder | 2 +- app/views/api/v1/readinglist/index.json.jbuilder | 6 +++--- app/views/api/v1/shared/_follows.json.jbuilder | 1 + app/views/api/v1/shared/_user.json.jbuilder | 1 + app/views/api/v1/users/show.json.jbuilder | 2 +- 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/views/api/v0/shared/_follows.json.jbuilder b/app/views/api/v0/shared/_follows.json.jbuilder index f7a483b34..14a094b1b 100644 --- a/app/views/api/v0/shared/_follows.json.jbuilder +++ b/app/views/api/v0/shared/_follows.json.jbuilder @@ -1,3 +1,4 @@ +json.user_id user.id json.name user.name json.path "/#{user.path.delete_prefix('/')}" json.username user.try(:username) || user.name diff --git a/app/views/api/v0/shared/_user.json.jbuilder b/app/views/api/v0/shared/_user.json.jbuilder index 0be193e5c..ade5dc9e4 100644 --- a/app/views/api/v0/shared/_user.json.jbuilder +++ b/app/views/api/v0/shared/_user.json.jbuilder @@ -1,6 +1,7 @@ json.user do json.extract!(user, :name, :username, :twitter_username, :github_username) + json.user_id user.id json.website_url user.processed_website_url json.profile_image user.profile_image_url_for(length: 640) json.profile_image_90 user.profile_image_url_for(length: 90) diff --git a/app/views/api/v1/followers/users.json.jbuilder b/app/views/api/v1/followers/users.json.jbuilder index 16ce2c9e9..b8a9fe671 100644 --- a/app/views/api/v1/followers/users.json.jbuilder +++ b/app/views/api/v1/followers/users.json.jbuilder @@ -3,5 +3,5 @@ json.array! @follows do |follow| json.id follow.id json.created_at utc_iso_timestamp(follow.created_at) - json.partial! "api/v0/shared/follows", user: follow.follower + json.partial! "api/v1/shared/follows", user: follow.follower end diff --git a/app/views/api/v1/listings/show.json.jbuilder b/app/views/api/v1/listings/show.json.jbuilder index b3231d908..5a00d5818 100644 --- a/app/views/api/v1/listings/show.json.jbuilder +++ b/app/views/api/v1/listings/show.json.jbuilder @@ -1,7 +1,7 @@ -json.partial! "api/v0/shared/listing", listing: @listing +json.partial! "api/v1/shared/listing", listing: @listing -json.partial! "api/v0/shared/user", user: @listing.user +json.partial! "api/v1/shared/user", user: @listing.user if @listing.organization - json.partial! "api/v0/shared/organization", organization: @listing.organization + json.partial! "api/v1/shared/organization", organization: @listing.organization end diff --git a/app/views/api/v1/organizations/listings.json.jbuilder b/app/views/api/v1/organizations/listings.json.jbuilder index 0c4a48734..b07642ca0 100644 --- a/app/views/api/v1/organizations/listings.json.jbuilder +++ b/app/views/api/v1/organizations/listings.json.jbuilder @@ -1,5 +1,5 @@ json.array! @listings do |listing| - json.partial! "api/v0/shared/listing", listing: listing - json.partial! "api/v0/shared/user", user: listing.user - json.partial! "api/v0/shared/organization", organization: @organization + json.partial! "api/v1/shared/listing", listing: listing + json.partial! "api/v1/shared/user", user: listing.user + json.partial! "api/v1/shared/organization", organization: @organization end diff --git a/app/views/api/v1/organizations/users.json.jbuilder b/app/views/api/v1/organizations/users.json.jbuilder index b7b8fcb55..c901adcb9 100644 --- a/app/views/api/v1/organizations/users.json.jbuilder +++ b/app/views/api/v1/organizations/users.json.jbuilder @@ -1,3 +1,3 @@ json.array! @users do |user| - json.partial! "api/v0/shared/user_show", user: user + json.partial! "api/v1/shared/user_show", user: user end diff --git a/app/views/api/v1/readinglist/index.json.jbuilder b/app/views/api/v1/readinglist/index.json.jbuilder index 69e0d6e44..ca29b8d1f 100644 --- a/app/views/api/v1/readinglist/index.json.jbuilder +++ b/app/views/api/v1/readinglist/index.json.jbuilder @@ -4,11 +4,11 @@ json.array! @readinglist do |reaction| json.created_at utc_iso_timestamp(reaction.created_at) json.article do article = @articles_by_reaction_ids[reaction.id] - json.partial! "api/v0/articles/article", article: article + json.partial! "api/v1/articles/article", article: article json.tags article.cached_tag_list - json.partial! "api/v0/shared/user", user: @users_by_id[article.user_id] + json.partial! "api/v1/shared/user", user: @users_by_id[article.user_id] if article.organization - json.partial! "api/v0/shared/organization", organization: article.organization + json.partial! "api/v1/shared/organization", organization: article.organization end end end diff --git a/app/views/api/v1/shared/_follows.json.jbuilder b/app/views/api/v1/shared/_follows.json.jbuilder index f7a483b34..14a094b1b 100644 --- a/app/views/api/v1/shared/_follows.json.jbuilder +++ b/app/views/api/v1/shared/_follows.json.jbuilder @@ -1,3 +1,4 @@ +json.user_id user.id json.name user.name json.path "/#{user.path.delete_prefix('/')}" json.username user.try(:username) || user.name diff --git a/app/views/api/v1/shared/_user.json.jbuilder b/app/views/api/v1/shared/_user.json.jbuilder index 0be193e5c..ade5dc9e4 100644 --- a/app/views/api/v1/shared/_user.json.jbuilder +++ b/app/views/api/v1/shared/_user.json.jbuilder @@ -1,6 +1,7 @@ json.user do json.extract!(user, :name, :username, :twitter_username, :github_username) + json.user_id user.id json.website_url user.processed_website_url json.profile_image user.profile_image_url_for(length: 640) json.profile_image_90 user.profile_image_url_for(length: 90) diff --git a/app/views/api/v1/users/show.json.jbuilder b/app/views/api/v1/users/show.json.jbuilder index 76f8211b0..cea14ce99 100644 --- a/app/views/api/v1/users/show.json.jbuilder +++ b/app/views/api/v1/users/show.json.jbuilder @@ -1 +1 @@ -json.partial! "api/v0/shared/user_show", user: @user +json.partial! "api/v1/shared/user_show", user: @user