usps-support 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b6530a24087990168baaaf9878366a5d4ff56a9f705c1410173eec2a2f42f76
-  data.tar.gz: 71f71e5c96b9f0c6622aa0e978a83bf74c0efe30a9aeec9699a69fbc4e2b026a
+  metadata.gz: 2c0c2a0aea0cbf009639e7eecaa41da6885bbd98e94d561ed6f02d3e2c4bd990
+  data.tar.gz: 6a4d7ba5a60b86420b554c3bbc6dd30b453f908abd615d5e483dcd944c17d70a
 SHA512:
-  metadata.gz: b401086e84d77ff3f7dcbcb9d731a9e802db3ff00d264fa3899971c3b994c2bcfdf066dd28d090beb4a2819ab4408a237d897a8db35d378e814f98ffd76a8190
-  data.tar.gz: 2526d8b93f8c9f49e20c7609c66475f9ba1f5467c63b15cb90b6874964bf731912f75713ec69091249027c06dfa9cb262835443c9eeabca6363863d7f52d81d3
+  metadata.gz: eea8776b12bf74f898f19a673eb4cc4dc7e1bac297db9edbbadd78f9ae11d28fa0002ec138f53e34a4b1c21cc7f9717ca19b31eb57aec0dee0ec20edb4f415c1
+  data.tar.gz: 2df7a193373cdbc7212c7d42f25356acb7c71f7aa33c803ffdfb0d08aa18fb38c55d983661a72e9ccf62a9f394168555787212f372a665d5cc00d544a274ad36

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    usps-support (0.1.11)
+    usps-support (0.1.12)
       sassc-rails
       usps-imis-api (~> 0.10.4)
       usps-jwt_auth (~> 1.0.0)

data/lib/usps/support/models/hq/members/associate_member.rb

@@ -7,14 +7,20 @@ module Usps::Support::Models::Hq::Members
     self.table_name = :associates
     self.inheritance_column = nil # The database has a `type` column, which confuses with Rails STI
 
-    belongs_to :member, foreign_key: 'certno', primary_key: 'certno', inverse_of: :associate_memberships
+    belongs_to(
+      :member,
+      class_name: '::Members::Member',
+      foreign_key: 'certno', primary_key: 'certno', inverse_of: :associate_memberships
+    )
     belongs_to(
       :squadron,
-      class_name: 'Squadrons::Squadron', foreign_key: 'squadno', primary_key: 'account', inverse_of: :associate_members
+      class_name: '::Squadrons::Squadron',
+      foreign_key: 'squadno', primary_key: 'account', inverse_of: :associate_members
     )
     belongs_to(
       :district,
-      class_name: 'Squadrons::District', foreign_key: 'dist', primary_key: 'dist', inverse_of: :associate_members
+      class_name: '::Squadrons::District',
+      foreign_key: 'dist', primary_key: 'dist', inverse_of: :associate_members
     )
   end
 end

data/lib/usps/support/models/hq/members/district_job.rb

@@ -7,8 +7,16 @@ module Usps::Support::Models::Hq::Members
     self.table_name = :djftp
     self.primary_key = %i[certno jobcode year]
 
-    belongs_to :member, foreign_key: :certno, inverse_of: :district_jobs
-    has_one :district_job_description, foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :district_jobs
+    belongs_to(
+      :member,
+      class_name: '::Members::Member',
+      foreign_key: :certno, inverse_of: :district_jobs
+    )
+    has_one(
+      :district_job_description,
+      class_name: '::Members::DistrictJobDescription',
+      foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :district_jobs
+    )
 
     def acting? = acting == 'Y'
 

data/lib/usps/support/models/hq/members/district_job_description.rb

@@ -7,6 +7,10 @@ module Usps::Support::Models::Hq::Members
     self.table_name = :djdesc
     self.primary_key = :jobcode
 
-    has_many :district_jobs, foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :district_job_description
+    has_many(
+      :district_jobs,
+      class_name: '::Members::DistrictJob',
+      foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :district_job_description
+    )
   end
 end

data/lib/usps/support/models/hq/members/former_member.rb

@@ -10,13 +10,13 @@ module Usps::Support::Models::Hq::Members
 
     belongs_to(
       :former_squadron,
-      class_name: 'Squadrons::Squadron', foreign_key: 'account', primary_key: 'account', inverse_of: :former_members,
-      optional: true
+      class_name: '::Squadrons::Squadron',
+      foreign_key: 'account', primary_key: 'account', inverse_of: :former_members, optional: true
     )
     belongs_to(
       :former_district,
-      class_name: 'Squadrons::District', foreign_key: 'district', primary_key: 'dist', inverse_of: :former_members,
-      optional: true
+      class_name: '::Squadrons::District',
+      foreign_key: 'district', primary_key: 'dist', inverse_of: :former_members, optional: true
     )
 
     alias_attribute :member_type, :type

data/lib/usps/support/models/hq/members/member.rb

@@ -10,20 +10,35 @@ module Usps::Support::Models::Hq::Members
 
     INVALID_RANKS = [0, 99].freeze
 
-    has_many :national_jobs, foreign_key: :certno, inverse_of: :member
-    has_many :district_jobs, foreign_key: :certno, inverse_of: :member
-    has_many :squadron_jobs, foreign_key: :certno, inverse_of: :member
+    has_many(
+      :national_jobs,
+      class_name: '::Members::NationalJob',
+      foreign_key: :certno, inverse_of: :member
+    )
+    has_many(
+      :district_jobs,
+      class_name: '::Members::DistrictJob',
+      foreign_key: :certno, inverse_of: :member
+    )
+    has_many(
+      :squadron_jobs,
+      class_name: '::Members::SquadronJob',
+      foreign_key: :certno, inverse_of: :member
+    )
     belongs_to(
       :squadron,
-      class_name: 'Squadrons::Squadron', foreign_key: 'sqdcode', primary_key: 'account', inverse_of: :members
+      class_name: '::Squadrons::Squadron',
+      foreign_key: 'sqdcode', primary_key: 'account', inverse_of: :members
     )
     belongs_to(
       :district,
-      class_name: 'Squadrons::District', foreign_key: 'daccount', primary_key: 'account', inverse_of: :members
+      class_name: '::Squadrons::District',
+      foreign_key: 'daccount', primary_key: 'account', inverse_of: :members
     )
     has_many(
       :associate_memberships,
-      class_name: 'Members::AssociateMember', foreign_key: 'certno', primary_key: 'certno', inverse_of: :member
+      class_name: '::Members::AssociateMember',
+      foreign_key: 'certno', primary_key: 'certno', inverse_of: :member
     )
 
     alias_attribute :certificate, :certno

data/lib/usps/support/models/hq/members/national_job.rb

@@ -7,8 +7,16 @@ module Usps::Support::Models::Hq::Members
     self.table_name = :njftp
     self.primary_key = %i[certno jobcode year]
 
-    belongs_to :member, foreign_key: :certno, inverse_of: :national_jobs
-    has_one :national_job_description, foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :national_jobs
+    belongs_to(
+      :member,
+      class_name: '::Members::Member',
+      foreign_key: :certno, inverse_of: :national_jobs
+    )
+    has_one(
+      :national_job_description,
+      class_name: '::Members::NationalJobDescription',
+      foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :national_jobs
+    )
 
     scope :current, -> { where(year: Time.zone.now.year) }
     scope :educational_chair, -> { current.where('jobcode REGEXP ?', '13\d{2}0') }

data/lib/usps/support/models/hq/members/national_job_description.rb

@@ -8,7 +8,11 @@ module Usps::Support::Models::Hq::Members
     self.primary_key = :jobcode
     self.inheritance_column = nil # The database has a `type` column, which confuses with Rails STI
 
-    has_many :national_jobs, foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :national_job_description
+    has_many(
+      :national_jobs,
+      class_name: '::Members::NationalJob',
+      foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :national_job_description
+    )
 
     def description
       return 'Budget Director' if jdesc =~ %r{/Budget Director$}

data/lib/usps/support/models/hq/members/squadron_job.rb

@@ -9,10 +9,18 @@ module Usps::Support::Models::Hq::Members
 
     belongs_to(
       :squadron,
-      class_name: 'Squadrons::Squadron', foreign_key: 'account', primary_key: 'account', inverse_of: :squadron_jobs
+      class_name: '::Squadrons::Squadron', foreign_key: 'account', primary_key: 'account', inverse_of: :squadron_jobs
+    )
+    belongs_to(
+      :member,
+      class_name: '::Members::Member',
+      foreign_key: :certno, inverse_of: :squadron_jobs
+    )
+    has_one(
+      :squadron_job_description,
+      class_name: '::Members::SquadronJobDescription',
+      foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :squadron_jobs
     )
-    belongs_to :member, foreign_key: :certno, inverse_of: :squadron_jobs
-    has_one :squadron_job_description, foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :squadron_jobs
 
     def acting? = acting == 'Y'
 

data/lib/usps/support/models/hq/members/squadron_job_description.rb

@@ -7,6 +7,10 @@ module Usps::Support::Models::Hq::Members
     self.table_name = :sjdesc
     self.primary_key = :jobcode
 
-    has_many :squadron_jobs, foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :squadron_job_description
+    has_many(
+      :squadron_jobs,
+      class_name: '::Members::SquadronJob',
+      foreign_key: :jobcode, primary_key: :jobcode, inverse_of: :squadron_job_description
+    )
   end
 end

data/lib/usps/support/models/hq/squadrons/district.rb

@@ -4,16 +4,26 @@ module Usps::Support::Models::Hq::Squadrons
   # District organization information
   #
   class District < Website
-    has_many :squadrons, inverse_of: :district, foreign_key: 'daccount', primary_key: 'account'
-    has_many :former_squadrons, inverse_of: :district, foreign_key: 'daccount', primary_key: 'account'
+    has_many(
+      :squadrons,
+      class_name: '::Squadrons::Squadron',
+      inverse_of: :district, foreign_key: 'daccount', primary_key: 'account'
+    )
+    has_many(
+      :former_squadrons,
+      class_name: '::Squadrons::FormerSquadron',
+      inverse_of: :district, foreign_key: 'daccount', primary_key: 'sqdno'
+    )
 
     has_many(
       :members,
-      class_name: 'Members::Member', foreign_key: 'daccount', primary_key: 'account', inverse_of: :district
+      class_name: '::Members::Member',
+      foreign_key: 'daccount', primary_key: 'account', inverse_of: :district
     )
     has_many(
       :former_members,
-      class_name: 'Members::FormerMember', foreign_key: 'dist', primary_key: 'district', inverse_of: :former_district
+      class_name: '::Members::FormerMember',
+      foreign_key: 'dist', primary_key: 'district', inverse_of: :former_district
     )
 
     # Squadrons and Districts are both stored in the same table, along with various historical entries

data/lib/usps/support/models/hq/squadrons/former_squadron.rb

@@ -4,10 +4,16 @@ module Usps::Support::Models::Hq::Squadrons
   # Former Squadron organization information
   #
   class FormerSquadron < Website
-    belongs_to :district, inverse_of: :former_squadrons, foreign_key: 'daccount', primary_key: 'account'
+    belongs_to(
+      :district,
+      -> { where(account: [0, nil]) },
+      inverse_of: :former_squadrons,
+      foreign_key: 'daccount',
+      primary_key: 'plat'
+    )
 
     # Former Squadrons stored in the same table as current Squadrons
-    default_scope { where(account: nil).where('Name NOT REGEXP \'^[0-9]{2}\.$\'') }
+    default_scope { where(account: 0).where('Name NOT REGEXP \'^[0-9]{2}\.$\'') }
 
     # When a squadron becomes "former", its account is moved into the `plat` column
     alias_attribute :account_number, :plat

data/lib/usps/support/models/hq/squadrons/squadron.rb

@@ -4,23 +4,28 @@ module Usps::Support::Models::Hq::Squadrons
   # Squadron organization information
   #
   class Squadron < Website
-    belongs_to :district, inverse_of: :squadrons, foreign_key: 'daccount', primary_key: 'account'
+    belongs_to(
+      :district,
+      class_name: '::Squadrons::District',
+      inverse_of: :squadrons, foreign_key: 'daccount', primary_key: 'account'
+    )
     has_many(
       :members,
-      class_name: 'Members::Member', foreign_key: 'account', primary_key: 'account', inverse_of: :squadron
+      class_name: '::Members::Member',
+      foreign_key: 'account', primary_key: 'sqnumber', inverse_of: :squadron
     )
     has_many(
       :former_members,
-      class_name: 'Members::FormerMember', foreign_key: 'account', primary_key: 'account', inverse_of: :former_squadron
+      class_name: '::Members::FormerMember',
+      foreign_key: 'account', primary_key: 'sqdno', inverse_of: :former_squadron
     )
     has_many(
       :squadron_jobs,
-      class_name: 'Members::SquadronJob', foreign_key: 'account', primary_key: 'account', inverse_of: :squadron
+      class_name: '::Members::SquadronJob',
+      foreign_key: 'account', primary_key: 'account', inverse_of: :squadron
     )
-    has_many :classrooms, foreign_key: 'account', primary_key: 'account', inverse_of: :squadron
-    has_many :course_reports, foreign_key: 'account', primary_key: 'sqnumber', inverse_of: :squadron
 
-    default_scope { where.not("Name REGEXP '^D?[0-9]{2}$'").where.not(account: nil) }
+    default_scope { where.not("Name REGEXP '^D?[0-9]{2}$'").where.not(account: 0) }
 
     def name = self.Name.split(/ Sail (&|and)/)[0]
   end

data/lib/usps/support/models/hq/squadrons.rb

@@ -6,8 +6,6 @@ module Usps::Support::Models::Hq::Squadrons; end
 
 require_relative 'squadrons/base_record'
 require_relative 'squadrons/website'
-require_relative 'squadrons/course_report'
 require_relative 'squadrons/district'
 require_relative 'squadrons/former_squadron'
 require_relative 'squadrons/squadron'
-require_relative 'squadrons/student'

data/lib/usps/support/version.rb

@@ -2,6 +2,6 @@
 
 module Usps
   module Support
-    VERSION = '0.1.11'
+    VERSION = '0.1.12'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usps-support
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Julian Fiander
@@ -91,11 +91,9 @@ files:
 - lib/usps/support/models/hq/shared_record.rb
 - lib/usps/support/models/hq/squadrons.rb
 - lib/usps/support/models/hq/squadrons/base_record.rb
-- lib/usps/support/models/hq/squadrons/course_report.rb
 - lib/usps/support/models/hq/squadrons/district.rb
 - lib/usps/support/models/hq/squadrons/former_squadron.rb
 - lib/usps/support/models/hq/squadrons/squadron.rb
-- lib/usps/support/models/hq/squadrons/student.rb
 - lib/usps/support/models/hq/squadrons/website.rb
 - lib/usps/support/models/toast.rb
 - lib/usps/support/version.rb

data/lib/usps/support/models/hq/squadrons/course_report.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Usps::Support::Models::Hq::Squadrons
-  # HQ-800 course
-  #
-  class CourseReport < Website
-    self.table_name = :mbrclasses
-
-    belongs_to :squadron, foreign_key: 'account', primary_key: 'sqnumber', inverse_of: :course_reports
-    has_one :classroom, inverse_of: :course_report
-    has_many :students, foreign_key: %i[crsid squadno], primary_key: %i[crsid sqnumber], inverse_of: :course_report
-
-    enum :status, { closed: 'C', ordered: 'O', graded: 'G' }
-  end
-end

data/lib/usps/support/models/hq/squadrons/student.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Usps::Support::Models::Hq::Squadrons
-  # HQ-800 student
-  #
-  class Student < Website
-    self.table_name = :students
-    self.ignored_columns += %i[validate]
-
-    belongs_to :course_report, foreign_key: %i[crsid squadno], primary_key: %i[crsid sqnumber], inverse_of: :students
-
-    alias_attribute :certificate, :certno
-
-    # Tweak data format to match expected
-    def grade=(int_or_string)
-      write_attribute(:grade, int_or_string.to_s.rjust(3, '0'))
-    end
-  end
-end