stbaldricks 12.10.0.alpha.1 → 12.10.0.alpha.2

data/lib/stbaldricks/entities/donation.rb

@@ -35,12 +35,14 @@ module SBF
 
       class EmployerMatched < SBF::Client::BaseEntity
         attr_accessor :is_match
+
         entity_attr_accessor :matching_donation, 'SBF::Client::FullDonation'
       end
 
       class Tribute < SBF::Client::BaseEntity
         attr_accessor :type
         attr_reader :name
+
         entity_attr_accessor :name_pieces, 'SBF::Client::NamePieces'
 
         module Type
@@ -124,8 +126,7 @@ module SBF
 
       class FullFund < SBF::Client::FullFund
         include ModelTypeConcern
-        attr_reader :model_type
-        attr_reader :direct_to_fund_donations_only
+        attr_reader :model_type, :direct_to_fund_donations_only
 
         def model_type
           SBF::Client::Donation::RecipientType::FUND
@@ -203,6 +204,7 @@ module SBF
       class RecognitionCard < SBF::Client::BaseEntity
         class Recipient < SBF::Client::BaseEntity
           attr_reader :name
+
           entity_attr_accessor :name_pieces, SBF::Client::NamePieces
           entity_attr_accessor :address, SBF::Client::Address
         end
@@ -250,7 +252,7 @@ module SBF
 
             # Get country and state from the person
             country = person.addresses.primary.country
-            state = (country.to_sym == SBF::Client::Country.list[SBF::Client::Country::UNITED_STATES] ? person.addresses.primary.state : '')
+            state = ((country.to_sym == SBF::Client::Country.list[SBF::Client::Country::UNITED_STATES]) ? person.addresses.primary.state : '')
 
           else
             country = (defined?(entity.country).nil? ? nil : entity.country)
@@ -282,7 +284,7 @@ module SBF
 
           # Get country and state from the person
           country = person.addresses.primary.country
-          state = (country.to_sym == SBF::Client::Country.list[SBF::Client::Country::UNITED_STATES] ? person.addresses.primary.state : '')
+          state = ((country.to_sym == SBF::Client::Country.list[SBF::Client::Country::UNITED_STATES]) ? person.addresses.primary.state : '')
 
         else
           country = (defined?(event.venue.location.address.country).nil? ? nil : event.venue.location.address.country)
@@ -298,13 +300,10 @@ module SBF
     class PartialDonation < SBF::Client::Donation
       attr_accessor :id
     end
+
     class FullDonation < SBF::Client::Donation
-      attr_accessor :id
-      attr_accessor :status
-      attr_accessor :amount
-      attr_accessor :fee_amount
-      attr_accessor :display_name
-      attr_accessor :year
+      attr_accessor :id, :status, :amount, :fee_amount, :display_name, :year, :is_unrecognized, :special_donation_type, :foreign_beneficiary_country,
+                    :promotional_code, :collected_at, :created_at, :modified_at, :modified_by, :how_created, :is_thanked
       attr_reader :is_send_card
 
       multitype_attr_accessor(
@@ -348,7 +347,6 @@ module SBF
         optional: true
       )
 
-      attr_accessor :is_unrecognized, :special_donation_type
       multitype_attr_accessor(
         :donor,
         [
@@ -395,8 +393,7 @@ module SBF
 
       entity_attr_accessor :employer_matching, 'SBF::Client::Donation::EmployerMatching'
       entity_attr_accessor :employer_matched, 'SBF::Client::Donation::EmployerMatched'
-      attr_accessor :foreign_beneficiary_country
-      attr_accessor :promotional_code
+
       entity_attr_accessor :recurring_gift, 'SBF::Client::FullRecurringGift'
       entity_attr_accessor :fund, 'SBF::Client::FullFund'
       entity_attr_accessor :memorial, 'SBF::Client::FullMemorial'
@@ -420,18 +417,15 @@ module SBF
       )
       entity_attr_accessor :tribute, 'SBF::Client::Donation::Tribute'
       entity_attr_accessor :recognition_card, 'SBF::Client::Donation::RecognitionCard'
-      attr_accessor :collected_at
-      attr_accessor :created_at, :modified_at, :modified_by, :how_created
-      attr_accessor :is_thanked
 
       def amount=(value)
         amount_will_change!
-        @amount = value.to_s.gsub(/[^0-9\.]/, '').to_f
+        @amount = value.to_s.gsub(/[^0-9.]/, '').to_f
       end
 
       def fee_amount=(value)
         fee_amount_will_change!
-        @fee_amount = value.to_s.gsub(/[^0-9\.]/, '').to_f
+        @fee_amount = value.to_s.gsub(/[^0-9.]/, '').to_f
       end
     end
   end

data/lib/stbaldricks/entities/donor.rb

@@ -6,11 +6,7 @@ module SBF
       action :find
       action :find_first
 
-      attr_accessor :donor_name
-      attr_accessor :amount
-      attr_accessor :count
-      attr_accessor :donation_created_at
-      attr_accessor :donation_collected_at
+      attr_accessor :donor_name, :amount, :count, :donation_created_at, :donation_collected_at
     end
   end
 end

data/lib/stbaldricks/entities/event.rb

@@ -47,6 +47,7 @@ module SBF
       class Contacts < SBF::Client::BaseEntity
         class Contact < SBF::Client::BaseEntity
           attr_reader :name
+
           entity_attr_accessor :name_pieces, 'SBF::Client::Event::Contacts::NamePieces'
           entity_attr_accessor :phone, 'SBF::Client::Phone'
           entity_attr_accessor :email_address, 'SBF::Client::EmailAddress'
@@ -62,11 +63,9 @@ module SBF
 
       class Activity < SBF::Client::BaseEntity
         attr_reader :id
-        entity_attr_accessor :event, 'SBF::Client::FullEvent', 'SBF::Client::PartialEvent', true
-        attr_accessor :start_time
-        attr_accessor :end_time
-        attr_accessor :activity
-        attr_accessor :sort_order
+
+        entity_attr_accessor :event, 'SBF::Client::FullEvent', 'SBF::Client::PartialEvent', optional: true
+        attr_accessor :start_time, :end_time, :activity, :sort_order
       end
 
       class CoachTracking < SBF::Client::BaseEntity
@@ -83,15 +82,15 @@ module SBF
         end
 
         attr_accessor :host_agreement_date, :activated_date, :proceeds, :coaching_interactions, :plaque
+
         entity_attr_accessor :proceeds, 'SBF::Client::Event::CoachTracking::Proceeds'
         entity_attr_accessor :coaching_interactions, 'SBF::Client::Event::CoachTracking::CoachingInteractions'
         entity_attr_accessor :plaque, 'SBF::Client::Event::CoachTracking::Plaque'
       end
 
       class Totals < SBF::Client::BaseEntity
-        attr_reader :fundraisers, :participants, :shavees, :amount_raised
-        attr_reader :current_year_ytd, :previous_year_ytd, :previous_year_total
-        attr_reader :current_year_shavees_ytd, :previous_year_shavees_ytd, :previous_year_shavees_total
+        attr_reader :fundraisers, :participants, :shavees, :amount_raised, :current_year_ytd, :previous_year_ytd, :previous_year_total,
+                    :current_year_shavees_ytd, :previous_year_shavees_ytd, :previous_year_shavees_total
       end
 
       class Agreement < SBF::Client::BaseEntity
@@ -111,6 +110,7 @@ module SBF
         end
 
         attr_accessor :agreement_received_date
+
         entity_collection_attr_accessor :questions, 'SBF::Client::Event::Agreement::Question'
       end
 
@@ -133,13 +133,13 @@ module SBF
             HYBRID = 'hybrid'.freeze
           end
 
-          attr_accessor :type
-          attr_accessor :type_other
+          attr_accessor :type, :type_other
         end
 
         entity_attr_accessor :location, 'SBF::Client::Event::Venue::Location'
         entity_attr_accessor :phone, 'SBF::Client::Phone'
         attr_accessor :website_url
+
         entity_attr_accessor :social, 'SBF::Client::Event::Venue::Social'
       end
     end
@@ -157,43 +157,32 @@ module SBF
       extend Forwardable
       def_delegator :@photos, :avatar, :avatar_photo_url
 
-      attr_accessor :id, :year
-      attr_accessor :status
-      attr_reader :display_name
-      attr_accessor :event_title
-      attr_accessor :type
-      attr_accessor :type_other
-      attr_accessor :sub_type
-      attr_accessor :is_private
-      attr_accessor :date, :is_date_confirmed
-      attr_accessor :start_time, :end_time, :is_time_confirmed
-      attr_accessor :is_open_for_registration, :is_open_for_fast_registration
-      attr_accessor :offline_donation_uuid, :offline_donation_form
-      attr_accessor :fundraising_goal, :fundraising_message
+      attr_accessor :id, :year, :status, :event_title, :type, :type_other, :sub_type, :is_private, :date,
+                    :is_date_confirmed, :start_time, :end_time, :is_time_confirmed, :is_open_for_registration,
+                    :is_open_for_fast_registration, :offline_donation_uuid, :offline_donation_form, :fundraising_goal,
+                    :fundraising_message, :modified_by, :how_created, :promotional_code, :fund_relationship_type
+      attr_reader :display_name, :created_at, :modified_at
+
       entity_attr_accessor :geo_location, 'SBF::Client::GeoLocation'
-      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, true
-      entity_attr_accessor :campaign, 'SBF::Client::FullCampaign', 'SBF::Client::PartialCampaign', true
-      entity_attr_accessor :fund, 'SBF::Client::FullFund', 'SBF::Client::PartialFund', true
+      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, optional: true
+      entity_attr_accessor :campaign, 'SBF::Client::FullCampaign', 'SBF::Client::PartialCampaign', optional: true
+      entity_attr_accessor :fund, 'SBF::Client::FullFund', 'SBF::Client::PartialFund', optional: true
       entity_attr_accessor :venue, 'SBF::Client::Event::Venue'
       entity_attr_accessor :photos, 'SBF::Client::Event::Photos'
-      entity_attr_accessor :contacts, 'SBF::Client::Event::Contacts', nil, true
+      entity_attr_accessor :contacts, 'SBF::Client::Event::Contacts', nil, optional: true
       entity_attr_accessor :coach_tracking, 'SBF::Client::Event::CoachTracking'
-      entity_attr_accessor :shave_schedule, 'SBF::Client::ShaveSchedule', nil, true
-      entity_attr_reader :totals, 'SBF::Client::Event::Totals', nil, true
-      entity_collection_attr_accessor :coaches, 'SBF::Client::FullPerson', nil, true
-      entity_collection_attr_accessor :closed_roles, 'SBF::Client::Participant::Roles::Type', nil, true
-      attr_reader :created_at, :modified_at
-      attr_accessor :modified_by
-      attr_accessor :how_created
-      attr_accessor :promotional_code
-      entity_attr_reader :permissions, 'SBF::Client::Permissions', nil, true
-      entity_attr_reader :agreement, 'SBF::Client::Event::Agreement', nil, true
-      entity_collection_attr_accessor :organizers, 'SBF::Client::FullParticipant', nil, true
-      entity_collection_attr_accessor :treasurers, 'SBF::Client::FullParticipant', nil, true
-      entity_collection_attr_accessor :activities, 'SBF::Client::Event::Activity', nil, true
-      entity_attr_accessor :third_party_media, 'SBF::Client::ThirdPartyMedia', nil, true
-      entity_collection_attr_accessor :supporters, 'SBF::Client::FullEventSupporter', nil, true
-      attr_accessor :fund_relationship_type
+      entity_attr_accessor :shave_schedule, 'SBF::Client::ShaveSchedule', nil, optional: true
+      entity_attr_reader :totals, 'SBF::Client::Event::Totals', nil, optional: true
+      entity_collection_attr_accessor :coaches, 'SBF::Client::FullPerson', nil, optional: true
+      entity_collection_attr_accessor :closed_roles, 'SBF::Client::Participant::Roles::Type', nil, optional: true
+
+      entity_attr_reader :permissions, 'SBF::Client::Permissions', nil, optional: true
+      entity_attr_reader :agreement, 'SBF::Client::Event::Agreement', nil, optional: true
+      entity_collection_attr_accessor :organizers, 'SBF::Client::FullParticipant', nil, optional: true
+      entity_collection_attr_accessor :treasurers, 'SBF::Client::FullParticipant', nil, optional: true
+      entity_collection_attr_accessor :activities, 'SBF::Client::Event::Activity', nil, optional: true
+      entity_attr_accessor :third_party_media, 'SBF::Client::ThirdPartyMedia', nil, optional: true
+      entity_collection_attr_accessor :supporters, 'SBF::Client::FullEventSupporter', nil, optional: true
 
       def active?
         status == SBF::Client::Event::Status::ACTIVE

data/lib/stbaldricks/entities/event_application.rb

@@ -93,23 +93,19 @@ module SBF
 
       class Requestor < SBF::Client::BaseEntity
         attr_accessor :name
+
         entity_attr_accessor :name_pieces, 'SBF::Client::NamePieces'
         entity_attr_accessor :email_address, 'SBF::Client::EmailAddress'
         entity_attr_accessor :phone, 'SBF::Client::Phone'
         entity_attr_accessor :address, 'SBF::Client::Address'
       end
 
-      attr_accessor :id
-      attr_accessor :requested_event_title
-      attr_accessor :status
-      attr_accessor :is_archived
-      attr_accessor :no_conversion_reason
-      attr_accessor :promotional_code
-      attr_accessor :created_at, :modified_at
+      attr_accessor :id, :requested_event_title, :status, :is_archived, :no_conversion_reason, :promotional_code, :created_at, :modified_at
+
       entity_attr_accessor :requestor, 'SBF::Client::EventApplication::Requestor'
-      entity_attr_accessor :qualifier, 'SBF::Client::FullPerson', 'SBF::Client::PartialPerson', true
-      entity_attr_accessor :fund, 'SBF::Client::FullFund', 'SBF::Client::PartialFund', true
-      entity_attr_accessor :campaign, 'SBF::Client::FullCampaign', 'SBF::Client::PartialCampaign', true
+      entity_attr_accessor :qualifier, 'SBF::Client::FullPerson', 'SBF::Client::PartialPerson', optional: true
+      entity_attr_accessor :fund, 'SBF::Client::FullFund', 'SBF::Client::PartialFund', optional: true
+      entity_attr_accessor :campaign, 'SBF::Client::FullCampaign', 'SBF::Client::PartialCampaign', optional: true
 
       multitype_attr_accessor(
         :model,

data/lib/stbaldricks/entities/event_donation_summary.rb

@@ -9,12 +9,9 @@ module SBF
       blacklist_action :update
       blacklist_action :delete
 
-      attr_accessor :amount_raised
-      attr_accessor :donations
-      attr_accessor :direct_amount_raised
-      attr_accessor :direct_donations
+      attr_accessor :amount_raised, :donations, :direct_amount_raised, :direct_donations
 
-      entity_attr_reader :event, 'SBF::Client::FullEvent', nil, true
+      entity_attr_reader :event, 'SBF::Client::FullEvent', nil, optional: true
     end
   end
 end

data/lib/stbaldricks/entities/event_participant_summary.rb

@@ -9,9 +9,7 @@ module SBF
       blacklist_action :update
       blacklist_action :delete
 
-      attr_accessor :shavees
-      attr_accessor :non_shavees
-      attr_accessor :participants
+      attr_accessor :shavees, :non_shavees, :participants
     end
   end
 end

data/lib/stbaldricks/entities/event_supporter.rb

@@ -15,10 +15,10 @@ module SBF
     end
 
     class FullEventSupporter < EventSupporter
-      attr_accessor :photo_url
-      attr_accessor :name, :url
+      attr_accessor :photo_url, :name, :url
       attr_reader :created_at, :modified_at
-      entity_attr_accessor :event, 'SBF::Client::FullEvent', 'SBF::Client::PartialEvent', true
+
+      entity_attr_accessor :event, 'SBF::Client::FullEvent', 'SBF::Client::PartialEvent', optional: true
       entity_attr_accessor :photo, 'SBF::Client::Photo'
     end
   end

data/lib/stbaldricks/entities/fund.rb

@@ -31,14 +31,7 @@ module SBF
       end
 
       class YearlyTotals < SBF::Client::BaseEntity
-        attr_reader :year
-        attr_reader :fundraisers
-        attr_reader :participants
-        attr_reader :shavees
-        attr_reader :non_shavees
-        attr_reader :teams
-        attr_reader :events
-        attr_reader :amount_raised
+        attr_reader :year, :fundraisers, :participants, :shavees, :non_shavees, :teams, :events, :amount_raised
 
         def to_hash
           {}.tap do |hsh|
@@ -48,13 +41,7 @@ module SBF
       end
 
       class Totals < SBF::Client::BaseEntity
-        attr_reader :fundraisers
-        attr_reader :participants
-        attr_reader :shavees
-        attr_reader :non_shavees
-        attr_reader :teams
-        attr_reader :events
-        attr_reader :amount_raised
+        attr_reader :fundraisers, :participants, :shavees, :non_shavees, :teams, :events, :amount_raised
       end
 
       class Photos < SBF::Client::BaseEntity
@@ -67,18 +54,14 @@ module SBF
     end
 
     class FullFund < Fund
-      attr_accessor :id
+      attr_accessor :id, :name, :disabled, :description, :kid_name, :offline_donation_uuid, :offline_donation_form
       attr_reader :display_name
-      attr_accessor :name
-      attr_accessor :disabled
-      attr_accessor :description
+
       entity_attr_accessor :photos, 'SBF::Client::Fund::Photos'
       entity_attr_reader :totals, 'SBF::Client::Fund::Totals'
       entity_collection_attr_accessor :totals_by_year, 'SBF::Client::Fund::Total'
-      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, true
+      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, optional: true
       entity_attr_accessor :photos, 'SBF::Client::Fund::Photos'
-      attr_accessor :kid_name
-      attr_accessor :offline_donation_uuid, :offline_donation_form
 
       multitype_attr_accessor(
         :manager,
@@ -110,7 +93,7 @@ module SBF
 
         totals_by_year_will_change!
         @totals_by_year = value.map do |k, v|
-          SBF::Client::Fund::YearlyTotals.new(v.merge(year: k.to_s.to_i))
+          SBF::Client::Fund::YearlyTotals.new(v.merge(year: k.to_s.to_i), **(;{}))
         end
       end
 

data/lib/stbaldricks/entities/fundraiser.rb

@@ -67,8 +67,7 @@ module SBF
       end
 
       class Totals < SBF::Client::BaseEntity
-        attr_reader :amount_raised
-        attr_reader :donations
+        attr_reader :amount_raised, :donations
       end
 
       class Rankings < SBF::Client::BaseEntity
@@ -93,8 +92,8 @@ module SBF
         end
       end
 
-      def dirty_data(with_keys = false)
-        data = super(with_keys)
+      def dirty_data(with_keys: false)
+        data = super(with_keys: with_keys)
         data[:event].delete(:id) if data[:event] && data[:event][:id].nil?
         data
       end
@@ -108,39 +107,27 @@ module SBF
       extend Forwardable
       def_delegator :@photos, :avatar, :avatar_photo_url
 
-      attr_accessor :id
+      attr_accessor :id, :category, :display_name_override, :facebook_fundraiser_id, :fund_relationship_type,
+                    :fundraising_goal, :fundraising_message, :how_created, :modified_by, :offline_donation_uuid,
+                    :offline_donation_form, :start_date, :end_date, :start_time, :end_time, :status, :title
+
+      attr_reader :created_at, :modified_at, :display_name
 
-      attr_reader :created_at, :modified_at
-      attr_reader :display_name
-
-      attr_accessor :category
-      attr_accessor :display_name_override
-      attr_accessor :facebook_fundraiser_id
-      attr_accessor :fund_relationship_type
-      attr_accessor :fundraising_goal, :fundraising_message
-      attr_accessor :how_created
-      attr_accessor :modified_by
-      attr_accessor :offline_donation_uuid, :offline_donation_form
-      attr_accessor :start_date, :end_date
-      attr_accessor :start_time, :end_time
-      attr_accessor :status
-      attr_accessor :title
-
-      entity_attr_reader :permissions, 'SBF::Client::Permissions', nil, true
-      entity_attr_reader :rankings, 'SBF::Client::Fundraiser::Rankings', nil, true
+      entity_attr_reader :permissions, 'SBF::Client::Permissions', nil, optional: true
+      entity_attr_reader :rankings, 'SBF::Client::Fundraiser::Rankings', nil, optional: true
       entity_attr_reader :totals, 'SBF::Client::Fundraiser::Totals'
 
-      entity_attr_accessor :event, 'SBF::Client::Fundraiser::FullEvent', 'SBF::Client::Fundraiser::PartialEvent', true
-      entity_attr_accessor :fund, 'SBF::Client::FullFund', 'SBF::Client::PartialFund', true
-      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, true
+      entity_attr_accessor :event, 'SBF::Client::Fundraiser::FullEvent', 'SBF::Client::Fundraiser::PartialEvent', optional: true
+      entity_attr_accessor :fund, 'SBF::Client::FullFund', 'SBF::Client::PartialFund', optional: true
+      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, optional: true
       entity_attr_accessor :owner, 'SBF::Client::FullPerson', 'SBF::Client::PartialPerson'
       entity_attr_accessor :photos, 'SBF::Client::Fundraiser::Photos'
       entity_attr_accessor :policies, 'SBF::Client::Fundraiser::Policies'
-      entity_attr_accessor :team, 'SBF::Client::FullTeam', 'SBF::Client::PartialTeam', true
-      entity_attr_accessor :third_party_media, 'SBF::Client::ThirdPartyMedia', nil, true
+      entity_attr_accessor :team, 'SBF::Client::FullTeam', 'SBF::Client::PartialTeam', optional: true
+      entity_attr_accessor :third_party_media, 'SBF::Client::ThirdPartyMedia', nil, optional: true
       entity_attr_accessor :venue, 'SBF::Client::Venue'
 
-      entity_collection_attr_accessor :milestones, 'SBF::Client::Milestone', nil, true
+      entity_collection_attr_accessor :milestones, 'SBF::Client::Milestone', nil, optional: true
 
       def active?
         status == SBF::Client::Fundraiser::Status::ACTIVE

data/lib/stbaldricks/entities/grant.rb

@@ -22,13 +22,10 @@ module SBF
       end
 
       class FullResearcher < SBF::Client::BaseEntity
-        attr_accessor :id
-        attr_reader :display_name
-        attr_accessor :description
-        attr_accessor :photo_url
+        attr_accessor :id, :description, :photo_url
+        attr_reader :display_name, :created_at, :modified_at
+
         entity_attr_accessor :name_pieces, 'SBF::Client::NamePieces'
-        attr_reader :created_at
-        attr_reader :modified_at
       end
 
       class PartialFundingType < SBF::Client::BaseEntity
@@ -36,11 +33,8 @@ module SBF
       end
 
       class FullFundingType < SBF::Client::BaseEntity
-        attr_accessor :id
-        attr_accessor :name
-        attr_accessor :description
-        attr_reader :created_at
-        attr_reader :modified_at
+        attr_accessor :id, :name, :description
+        attr_reader :created_at, :modified_at
       end
 
       class PartialInstitution < SBF::Client::PartialInstitution; end
@@ -55,20 +49,13 @@ module SBF
     end
 
     class FullGrant < SBF::Client::Grant
-      attr_accessor :id
-      attr_accessor :name
-      attr_accessor :funding_begin_date
-      attr_accessor :funding_end_date
-      attr_accessor :web_message
-      attr_accessor :article_url
-      attr_accessor :amount
-      entity_attr_accessor :researcher, 'SBF::Client::Grant::FullResearcher', 'SBF::Client::Grant::PartialResearcher', true
-      entity_attr_accessor :institution, 'SBF::Client::Grant::FullInstitution', 'SBF::Client::Grant::PartialInstitution', true
-      entity_attr_accessor :funding_type, 'SBF::Client::Grant::FullFundingType', 'SBF::Client::Grant::PartialFundingType', true
-      entity_collection_attr_accessor :diseases, 'SBF::Client::Grant::Disease', nil, true
-      attr_reader :photo_url
-      attr_reader :created_at
-      attr_reader :modified_at
+      attr_accessor :id, :name, :funding_begin_date, :funding_end_date, :web_message, :article_url, :amount
+
+      entity_attr_accessor :researcher, 'SBF::Client::Grant::FullResearcher', 'SBF::Client::Grant::PartialResearcher', optional: true
+      entity_attr_accessor :institution, 'SBF::Client::Grant::FullInstitution', 'SBF::Client::Grant::PartialInstitution', optional: true
+      entity_attr_accessor :funding_type, 'SBF::Client::Grant::FullFundingType', 'SBF::Client::Grant::PartialFundingType', optional: true
+      entity_collection_attr_accessor :diseases, 'SBF::Client::Grant::Disease', nil, optional: true
+      attr_reader :photo_url, :created_at, :modified_at
     end
   end
 end

data/lib/stbaldricks/entities/institution.rb

@@ -19,11 +19,10 @@ module SBF
     class PartialInstitution < SBF::Client::Institution; end
 
     class FullInstitution < SBF::Client::Institution
-      attr_accessor :name
+      attr_accessor :name, :institution_info
+
       entity_attr_accessor :address, 'SBF::Client::Address'
-      attr_reader :created_at
-      attr_reader :modified_at
-      attr_accessor :institution_info
+      attr_reader :created_at, :modified_at
     end
   end
 end

data/lib/stbaldricks/entities/international_partner.rb

@@ -20,13 +20,11 @@ module SBF
       end
 
       class WebPage < SBF::Client::BaseEntity
-        attr_accessor :url
-        attr_accessor :custom_url_segment
+        attr_accessor :url, :custom_url_segment
       end
 
       class Link < SBF::Client::BaseEntity
-        attr_accessor :url
-        attr_accessor :text
+        attr_accessor :url, :text
       end
     end
 
@@ -35,20 +33,10 @@ module SBF
     end
 
     class FullInternationalPartner < SBF::Client::InternationalPartner
-      attr_accessor :id
-      attr_accessor :status
-      attr_accessor :year
-      attr_accessor :country
-      attr_accessor :country_name
-      attr_accessor :name
-      attr_accessor :message
-      attr_accessor :description
+      attr_accessor :id, :status, :year, :country, :country_name, :name, :message, :description, :donate_url, :base_photo_url, :created_at
+
       entity_attr_accessor :web_page, 'SBF::Client::InternationalPartner::WebPage'
       entity_attr_accessor :link, 'SBF::Client::InternationalPartner::Link'
-      attr_accessor :donate_url
-      attr_accessor :base_photo_url
-
-      attr_accessor :created_at
 
       def active?
         status == SBF::Client::InternationalPartner::Status::ACTIVE

data/lib/stbaldricks/entities/kid.rb

@@ -11,9 +11,7 @@ require 'stbaldricks/entities/lib/default_cacheable'
 module SBF
   module Client
     class Diagnosis < SBF::Client::BaseEntity
-      attr_accessor :date
-      attr_accessor :cancer_type
-      attr_accessor :other
+      attr_accessor :date, :cancer_type, :other
 
       module CancerType
         ACUTE_LYMPHOBLASTIC_LEUKEMIA = 'acute_lymphoblastic_leukemia'.freeze
@@ -55,16 +53,15 @@ module SBF
         COUSIN = 'cousin'.freeze
       end
 
-      attr_accessor :name
-      attr_accessor :relationship
+      attr_accessor :name, :relationship
+
       entity_attr_accessor :name_pieces, 'SBF::Client::NamePieces'
       entity_attr_accessor :email_address, 'SBF::Client::EmailAddress'
       entity_attr_accessor :phone, 'SBF::Client::Phone'
     end
 
     class TreatmentStatus < SBF::Client::BaseEntity
-      attr_accessor :state
-      attr_accessor :other
+      attr_accessor :state, :other
 
       module SurvivorState
         IN_TREATMENT = 'in_treatment'.freeze
@@ -135,11 +132,10 @@ module SBF
           attr_accessor :is_editor
         end
 
-        attr_accessor :kid_id
+        attr_accessor :kid_id, :type, :guardian_type, :is_submitter
+
         entity_attr_accessor :person, 'SBF::Client::FullPerson', 'SBF::Client::PartialPerson'
-        attr_accessor :type
-        attr_accessor :guardian_type
-        attr_accessor :is_submitter
+
         entity_attr_accessor :permissions, 'SBF::Client::Kid::Relationship::Permissions'
       end
 
@@ -154,34 +150,21 @@ module SBF
       extend Forwardable
       def_delegator :@photos, :avatar, :avatar_photo_url
 
-      attr_accessor :id
-      attr_accessor :status
-      attr_accessor :gender
-      attr_accessor :birthday
-      attr_accessor :ethnicity
-      attr_accessor :date_of_passing
-      attr_accessor :display_name
-      attr_accessor :display_name_override
-      attr_accessor :name
-      attr_accessor :ambassador_year
-      attr_accessor :date_activated
-      attr_accessor :date_packet_sent
+      attr_accessor :id, :status, :gender, :birthday, :ethnicity, :date_of_passing, :display_name, :display_name_override, :name, :ambassador_year,
+                    :date_activated, :date_packet_sent, :web_message, :created_at, :modified_at, :modified_by
+
       entity_attr_accessor :name_pieces, 'SBF::Client::NamePieces'
       entity_attr_accessor :address, 'SBF::Client::Address'
       entity_attr_accessor :diagnosis, 'SBF::Client::Diagnosis'
       entity_attr_accessor :treatment_status, 'SBF::Client::TreatmentStatus'
-      attr_accessor :web_message
+
       entity_attr_accessor :photos, 'SBF::Client::Photos'
       entity_attr_accessor :web_page, 'SBF::Client::WebPage'
       entity_attr_accessor :guardian, 'SBF::Client::Guardian'
       entity_collection_attr_accessor :relationships, 'SBF::Client::Kid::Relationship'
       entity_collection_attr_accessor :urls, 'SBF::Client::KidURL'
-      entity_collection_attr_accessor :custom_institutions, 'SBF::Client::Kid::CustomInstitution', nil, true
-      entity_attr_accessor :third_party_media, 'SBF::Client::ThirdPartyMedia', nil, true
-
-      attr_accessor :created_at
-      attr_accessor :modified_at
-      attr_accessor :modified_by
+      entity_collection_attr_accessor :custom_institutions, 'SBF::Client::Kid::CustomInstitution', nil, optional: true
+      entity_attr_accessor :third_party_media, 'SBF::Client::ThirdPartyMedia', nil, optional: true
 
       def fundraising_page_url
         web_page&.url