openstax_accounts 9.5.0 → 9.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ae6fdbc68368694770f436f5a7a4e57dea39b18c93b2791308aace6b07a02a
-  data.tar.gz: bbfbe2609b86b3b216ad0a94c7bf41b7c6bc1b29ea65e4a99388288dfcc80f7f
+  metadata.gz: 3bbc4f9d4b0e45a223ac13d149012a2f27fc8ab8b77d71aa2213f447974ae0ee
+  data.tar.gz: fed8b3ecbf12bbd0cf45ca9f11a0e73a98c4a4157f97733ce3b2672ecb8bc7ff
 SHA512:
-  metadata.gz: 29b93ef99bbb0ee170f4619269e79dd94fd89634a328985d55a057b9f0c85980480fdf8bfe47d4e946fb9dfc42e3a91c7e087a1825b8067c7c4a68d27e56f70f
-  data.tar.gz: dd689a226b1f8c92be65d8543c917b35af81eafa9a90f9de3b718fc2cf7b14e4df0ed7f64aff883bc2cf2141bfe1122dffadb9841a7cf0b1df9147e7b419779c
+  metadata.gz: eaf4336be588df387e67d9f79633f398053f655c10d624f29d2d0dfe027854a5def31a12c70e088edd7069633762c12707e481cf078e12ea9a389d98b43658be
+  data.tar.gz: 98a1fd1915f40aaf349112a28d91a359cc5ec2b8fbeb230d7192e423b07aaab0a65a367367c400bf2ac3ed3180158561a3abcd9a4e930ea6e2c0af18e0dc88d3

data/app/routines/openstax/accounts/sync_accounts.rb

@@ -1,7 +1,5 @@
 # Routine for getting account updates from the Accounts server
-#
 # Should be scheduled to run regularly
-
 module OpenStax
   module Accounts
     class SyncAccounts
@@ -12,36 +10,40 @@ module OpenStax
       def exec(options={})
         return if OpenStax::Accounts.configuration.enable_stubbing?
 
-        response = OpenStax::Accounts::Api.get_application_account_updates
+        loop do
+          response = OpenStax::Accounts::Api.get_application_account_updates
 
-        app_accounts = []
-        app_accounts_rep = OpenStax::Accounts::Api::V1::ApplicationAccountsRepresenter
-                             .new(app_accounts)
-        app_accounts_rep.from_json(response.body)
+          app_accounts = []
+          app_accounts_rep = OpenStax::Accounts::Api::V1::ApplicationAccountsRepresenter.new(
+            app_accounts
+          )
+          app_accounts_rep.from_json(response.body)
 
-        return if app_accounts.empty?
+          num_accounts = app_accounts.size
+          return if num_accounts == 0
 
-        updated_app_accounts = []
-        app_accounts.each do |app_account|
-          account = OpenStax::Accounts::Account.find_by(
-            uuid: app_account.account.uuid
-          ) || app_account.account
-          account.syncing = true
+          updated_app_accounts = []
+          app_accounts.each do |app_account|
+            account = OpenStax::Accounts::Account.find_by(
+              uuid: app_account.account.uuid
+            ) || app_account.account
+            account.syncing = true
 
-          if account != app_account.account
             OpenStax::Accounts::Account::SYNC_ATTRIBUTES.each do |attribute|
-              account.send("#{attribute}=", app_account.account.send(attribute))
-            end
+              account.send "#{attribute}=", app_account.account.send(attribute)
+            end if account != app_account.account
+
+            next unless account.save
+
+            updated_app_accounts << {
+              user_id: account.openstax_uid, read_updates: app_account.unread_updates
+            }
           end
 
-          next unless account.save
+          OpenStax::Accounts::Api.mark_account_updates_as_read(updated_app_accounts)
 
-          updated_app_accounts << {
-            user_id: account.openstax_uid, read_updates: app_account.unread_updates
-          }
+          return if num_accounts < OpenStax::Accounts.configuration.max_user_updates_per_request
         end
-
-        OpenStax::Accounts::Api.mark_account_updates_as_read(updated_app_accounts)
       end
     end
   end

data/lib/openstax/accounts/api.rb

@@ -81,7 +81,9 @@ module OpenStax
       # On success, returns an OAuth2::Response object.
       def self.get_application_account_updates(options = {})
         limit = OpenStax::Accounts.configuration.max_user_updates_per_request
-        request(:get, "application_users/updates#{ '?limit=' + limit.to_s if !limit.blank? }", options)
+        request(
+          :get, "application_users/updates#{ '?limit=' + limit.to_s if !limit.blank? }", options
+        )
       end
 
       # Marks account updates as "read".

data/lib/openstax/accounts/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Accounts
-    VERSION = '9.5.0'
+    VERSION = '9.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 9.5.0
+  version: 9.5.1
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails