eitje_s3 1.1.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6849a57128be891415bc470d167489cd60be8d1e39f5aeb439b82afcfc0f83c3
-  data.tar.gz: 569b8280b4c64fe6e18510d20bb44952074e735fff4f0e06ef0ebebc446e6eaf
+  metadata.gz: 819fd4119ba036edf00465389ac4fda4be8bc4003d41997a6a5824d19964fcf8
+  data.tar.gz: bdee3c536e21ded2851636d15cab0f54a6ff9ef270d0aa6b465db856a4c40ed2
 SHA512:
-  metadata.gz: bd9864943eb8553e0b67a93a0ede6d477de9de5711a9292ac61c9b6af2c2bec4d439a7f8e0c55876cdeb0b498e8de0bdc7cb6ccbac334775a0ac6454160cda97
-  data.tar.gz: 641af7b9cd04053158bcaacd4b36bd595fe85ff7a60730e2eb602979a37d0492db25dd2b293af79b099ef8944aa755a88b905643f2c563b85e3321354ecf2060
+  metadata.gz: c51ee452a93e0715ad4c6b515cfa35e282952fb72056bd9ba7a8d7413a9e8ec4220067ed0dc80bcbbb7bd96b03583f6ec022d972e427b9bf319635455cedba48
+  data.tar.gz: 6b6b6e69c2959d319f92bf4fd5541b93efd09fb48b441551c433a0485a1ae72d1fe78d02021021fe4b78c52f216b81fc99bea421158ee48e8868d8c8e7e6b8b1

data/app/services/s3/new_deleted_records_service.rb

@@ -1,7 +1,7 @@
 module S3::NewDeletedRecordsService
   class << self
 
-   DB_TABLES = %w$ shifts teams users contracts infos posts topics $
+   DB_TABLES = %w$ shifts teams users contracts infos posts topics verlof_verzoeken$
 
     def get_records(db_table:, start_date:, end_date:, env_id:)    
       @date_range = Date.parse(start_date)..Date.parse(end_date)
@@ -32,8 +32,12 @@ module S3::NewDeletedRecordsService
       # the original returns waaaaay many records, so probably does not filter by date or
       # something. Change for now and investigate if shit goes BG.
 
-      file     = @s3.get_object(bucket: 'eitje-deleted-jurr-2', key: @file_name)
-      @records = JSON.parse(file.body.read.as_json).map(&:symbolize_keys)
+      begin
+        file = @s3.get_object(bucket: 'eitje-deleted-jurr-2', key: @file_name)
+        @records = JSON.parse(file.body.read.as_json).map(&:symbolize_keys)
+      rescue Aws::S3::Errors::NoSuchKey
+        @records = [] # files are only generated when an env has some deleted envs, through by uploading them old-style first
+      end
     end
 
     def filter_records
@@ -46,4 +50,15 @@ module S3::NewDeletedRecordsService
     end
 
   end
-end
+end
+
+__END__
+
+def show_env(env_id, db_table = "verlof_verzoeken")
+  start_date = (Date.today - 1.years).to_s
+  end_date = (Date.today).to_s
+  records = S3::NewDeletedRecordsService.get_records(db_table: db_table, start_date: start_date, end_date: end_date, env_id: env_id)
+end
+
+show_env(1176)
+show_env(1176, "verlof_verzoeken")

data/app/services/s3/old_deleted_records_service.rb

@@ -1,7 +1,7 @@
 module S3::OldDeletedRecordsService
   class << self
 
-   DB_TABLES = %w$ shifts teams users contracts infos posts topics $
+   DB_TABLES = %w$ shifts teams users contracts infos posts topics verlof_verzoeken$
 
     def get_records(db_table:, start_date:, end_date:, env_id:, env_name:)
 
@@ -89,8 +89,11 @@ module S3::OldDeletedRecordsService
     # AWS methods
 
     def request_object_names
+      folder = @db_table
+      folder = "verlofverzoeks" if @db_table == "verlof_verzoeken"
+
       s3      = Aws::S3::Client.new
-      objects = s3.list_objects(bucket: 'eitje-backups', prefix: @db_table).contents
+      objects = s3.list_objects(bucket: 'eitje-backups', prefix: folder).contents
       names   = objects.collect &:key
     end
 
@@ -101,4 +104,4 @@ module S3::OldDeletedRecordsService
     end
 
   end
-end
+end

data/app/services/s3/transform_deleted_files_service.rb

@@ -20,7 +20,13 @@ module S3::TransformDeletedFilesService
       envs_to_migrate = []
 
       set_tables.each do |table|  
-        object  = s3.get_object(bucket: 'eitje-backups', key: "#{table}/#{start_date.strftime("%Y-%m-%d")}.json")
+
+        folder = table
+        folder = "verlofverzoeks" if table == "verlof_verzoeken"
+
+        puts "requesting #{table} on #{start_date.strftime("%Y-%m-%d")}..."
+
+        object  = s3.get_object(bucket: 'eitje-backups', key: "#{folder}/#{start_date.strftime("%Y-%m-%d")}.json")
         json    = JSON.parse(object.body.read.as_json).map(&:symbolize_keys)
         
         if table == 'topics'
@@ -30,10 +36,11 @@ module S3::TransformDeletedFilesService
         end
 
         envs_to_migrate << env_ids
-      rescue => e
+      rescue Aws::S3::Errors::NoSuchKey => e
         # in case the file does not exist on S3, cause there are no deleted 
         # records, skip to next table
-        next
+        puts "no records found for #{table} on #{start_date.strftime("%Y-%m-%d")}!"
+        []
       end
 
       envs_to_migrate = envs_to_migrate.flatten.uniq.compact
@@ -106,12 +113,14 @@ module S3::TransformDeletedFilesService
       set_file_name
       set_existing_records
 
-      (@records += @existing_records) if @existing_records
+      @records = (@records | @existing_records) if @existing_records
       set_json
       upload_file
 
       rescue => e
-        @logger.error "Error for env #{@env.naam} (##{@env.id}) with table '#{@table}' => #{e.class}: #{e.message}.\n\nBacktrace:#{e.backtrace}\n"
+        message = "Error for env #{@env.naam} (##{@env.id}) with table '#{@table}' => #{e.class}: #{e.message}.\n\nBacktrace:#{e.backtrace}\n"
+        puts message
+        @logger.error message
     end
 
     def upload_file
@@ -119,4 +128,4 @@ module S3::TransformDeletedFilesService
     end
 
   end
-end
+end

data/lib/s3/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eitje_s3
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: S3