eitje_s3 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 819fd4119ba036edf00465389ac4fda4be8bc4003d41997a6a5824d19964fcf8
-  data.tar.gz: bdee3c536e21ded2851636d15cab0f54a6ff9ef270d0aa6b465db856a4c40ed2
+  metadata.gz: 230fdba2a8fd9f8de892d021ab35594b8a84970ff0a7c518b16d01716a698df0
+  data.tar.gz: d70670f7249f28fc27dbd92b44670cd46cd9b768b836ea9321deb18743d2197e
 SHA512:
-  metadata.gz: c51ee452a93e0715ad4c6b515cfa35e282952fb72056bd9ba7a8d7413a9e8ec4220067ed0dc80bcbbb7bd96b03583f6ec022d972e427b9bf319635455cedba48
-  data.tar.gz: 6b6b6e69c2959d319f92bf4fd5541b93efd09fb48b441551c433a0485a1ae72d1fe78d02021021fe4b78c52f216b81fc99bea421158ee48e8868d8c8e7e6b8b1
+  metadata.gz: e697501276a0a4921e2fd48e5daa5e697b5bae4a1554414deb910dceb1e2866e9770fb8fc489036e9299e341251efea4bf1faea96b91e07abeb28b3564c073c7
+  data.tar.gz: 7c1d4880cd61c4fffbe6df19f47b89d79012d74ab48f974e9e46023436d40a8af99a34a25b9ee7fe332ed76a1a17e1b8dea98f90f79919e4ba7c771f323261cb

data/app/services/s3/old_deleted_records_service.rb

@@ -34,6 +34,8 @@ module S3::OldDeletedRecordsService
         @file_name = file_name
         @file      = request_object 
 
+        next unless @file
+
         case @db_table
         when 'users'
           filter_users_table_by_env
@@ -43,7 +45,7 @@ module S3::OldDeletedRecordsService
           filter_file_by_env
         end
 
-      end.flatten
+      end.flatten.compact
     end
 
     # filter methods
@@ -93,14 +95,24 @@ module S3::OldDeletedRecordsService
       folder = "verlofverzoeks" if @db_table == "verlof_verzoeken"
 
       s3      = Aws::S3::Client.new
-      objects = s3.list_objects(bucket: 'eitje-backups', prefix: folder).contents
-      names   = objects.collect &:key
+
+      objects = []
+
+      # Pagination: AWS returns 1000 items at max
+      s3.list_objects(bucket: 'eitje-backups', prefix: folder).each do |response|
+        objects += response.contents
+      end
+
+      names = objects.collect &:key
     end
 
     def request_object
       s3     = Aws::S3::Client.new
       object = s3.get_object(bucket: 'eitje-backups', key: @file_name)
-      json   = JSON.parse(object.body.read.as_json).map(&:symbolize_keys)
+      body   = object.body.read.as_json
+      json   = JSON.parse(body).map(&:symbolize_keys)
+      rescue JSON::ParserError => e
+        puts "Invalid file... skip this file"
     end
 
   end

data/app/services/s3/transform_deleted_files_service.rb

@@ -32,7 +32,12 @@ module S3::TransformDeletedFilesService
         if table == 'topics'
           env_ids = json.map {|row| row[:environment_ids]}.flatten.compact.uniq
         else
-          env_ids = json.map {|row| row[:env]}.uniq.map { |name| Environment.find_by(naam: name)&.id }
+          puts "new table logic...?"
+          env_ids = json.map { _1[:environment_id] }.compact.uniq
+
+          unless env_ids.present?
+            env_ids = json.map {|row| row[:env]}.uniq.map { |name| Environment.find_by(naam: name)&.id }
+          end
         end
 
         envs_to_migrate << env_ids
@@ -55,6 +60,11 @@ module S3::TransformDeletedFilesService
         @table = table          
         compose_file
       end
+
+    rescue ActiveRecord::RecordNotFound => e
+
+    rescue => e
+      binding.pry
     end
 
     def migrate_files_multi_env(environment_ids, start_date: Date.yesterday)
@@ -105,6 +115,7 @@ module S3::TransformDeletedFilesService
       @existing_records = JSON.parse(object.body.read.as_json).map(&:symbolize_keys)
       
       rescue Aws::S3::Errors::NoSuchKey => e
+        binding.pry
         @existing_records = nil
     end
 
@@ -115,11 +126,13 @@ module S3::TransformDeletedFilesService
 
       @records = (@records | @existing_records) if @existing_records
       set_json
+      puts "completed successfully! new total: #{@records&.count}, old total: #{@existing_records&.count}"
       upload_file
 
       rescue => e
         message = "Error for env #{@env.naam} (##{@env.id}) with table '#{@table}' => #{e.class}: #{e.message}.\n\nBacktrace:#{e.backtrace}\n"
         puts message
+        binding.pry
         @logger.error message
     end
 

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eitje_s3
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails