tests for meta for single user. #81

app/controllers/users_controller.rb

@@ -14,9 +14,11 @@ class UsersController < BaseController
 
   def show
     options = {}
+
+    meta = get_meta(user_id: params[:id])
     options[:meta] = {
-      dois: doi_count(user_id: params[:id]),
-      "resourceTypes" => resource_type_count(user_id: params[:id]) }.compact
+      dois: meta.fetch("created", []),
+      "resourceTypes" => meta.fetch("resourceTypes", []) }.compact
     options[:include] = @include
     options[:is_collection] = false
     options[:params] = { current_ability: current_ability }

app/models/concerns/countable.rb

@@ -2,30 +2,16 @@ module Countable
   extend ActiveSupport::Concern
 
   included do
-    def doi_count(user_id: nil, state: nil)
+    def get_meta(user_id: nil, state: nil)
       if user_id
         url = ENV['API_URL'] + "/dois?user-id=#{user_id}&page[size]=0"
       else
         url = ENV['API_URL'] + "/dois?page[size]=0"
       end
 
       response = Maremma.get(url, accept: 'application/vnd.api+json')
-      return [] if response.status != 200
-
-      response.body.dig("meta", "created") || []
-    end
-
-    def resource_type_count(user_id: nil, state: nil)
-      if user_id
-        url = ENV['API_URL'] + "/dois?user-id=#{user_id}&page[size]=0"
-      else
-        url = ENV['API_URL'] + "/dois?page[size]=0"
-      end
-
-      response = Maremma.get(url, accept: 'application/vnd.api+json')
-      return [] if response.status != 200
-
-      response.body.dig("meta", "resourceTypes") || []
+      return {} if response.status != 200
+      response.body.fetch("meta", {}).slice("created", "resourceTypes")
     end
   end
 end

spec/concerns/countable_spec.rb

@@ -0,0 +1,18 @@
+require "rails_helper"
+
+describe "UsersController", type: :controller, vcr: true do
+  subject { UsersController.new }
+
+  it "get_meta" do
+    response = subject.get_meta
+    expect(response["created"].first).to eq("count"=>29, "id"=>"2011", "title"=>"2011")
+    expect(response["resourceTypes"].first).to eq("count"=>323850, "id"=>"text", "title"=>"Text")
+  end
+
+  it "get_meta with user_id" do
+    user_id = "0000-0003-1419-2405"
+    response = subject.get_meta(user_id: user_id)
+    expect(response["created"].first).to eq("count"=>2, "id"=>"2018", "title"=>"2018")
+    expect(response["resourceTypes"].first).to eq("count"=>27, "id"=>"text", "title"=>"Text")
+  end
+end

spec/requests/users_spec.rb

@@ -30,7 +30,7 @@
   end
 
   describe 'GET /users/:id' do
-    context 'when the record exists' do
+    context 'when the record exists', vcr: true do
       it 'returns the user' do
         get "/users/#{user.uid}", nil, headers