meibo 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fed6d292ab3d38301370ef4d6238d4ddc470d8ae380e1e8bdf8f6d88822aaf0
-  data.tar.gz: d364e20a7336ad702b4d3434efefe800bed8a971f0cc02177c817398fa79982d
+  metadata.gz: 5ad0dc346f3bc9d8166c4ddc9a55ddfedc79bcf78aea61f83289e339a40dfea4
+  data.tar.gz: d2bf911450a3c05d334e3b6c5ea7ea9a2dd8e9cb141ce125f0d6a95a99e4daca
 SHA512:
-  metadata.gz: bb712c2090b7cc03708a4c8b302e187357db4f2bf260e62486f79072ba646371368c6968baaa022c472774b6a09c0aba3a7f1716b1b074e6fcb2ab6ab6e19935
-  data.tar.gz: dd2f31087c8b28e02b9e257dcb405cb1eec588d5a576c120cdcadcb0402743cb7a02f6e62262ca1c932f93c8f119839d95eb505ce44534a04a478883e0d966af
+  metadata.gz: fb78b3143e372d6629f174fe3e0d34eea05ecbaf11bb1b8c0478c09a6a78c9792349f850da3f7530f5e20e5503b5151907dd6e7ee85a46dc286f5bc1f24cbc71
+  data.tar.gz: d28830dba3e605a95bca895ddc2655d6921707884c0fefa5257e79766e400f13bcc7e9c47a940c8687f4a874a2e8d4178ef61aef721cd7bcd16e784d4aeac2ab

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    meibo (0.13.0)
+    meibo (0.14.0)
       rubyzip
       zeitwerk
 

data/lib/meibo/academic_session.rb

@@ -62,7 +62,11 @@ module Meibo
     end
 
     def parent
-      Meibo.current_roster.academic_sessions.find(parent_sourced_id)
+      parent_sourced_id && Meibo.current_roster.academic_sessions.find(parent_sourced_id)
+    end
+
+    def children
+      Meibo.current_roster.academic_sessions.where(parent_sourced_id: sourced_id)
     end
   end
 end

data/lib/meibo/classroom.rb

@@ -83,5 +83,9 @@ module Meibo
     def terms
       term_sourced_ids.map {|term_sourced_id| Meibo.current_roster.academic_sessions.find(term_sourced_id) }
     end
+
+    def enrollments
+      Meibo.current_roster.enrollments.where(class_sourced_id: sourced_id)
+    end
   end
 end

data/lib/meibo/course.rb

@@ -49,5 +49,9 @@ module Meibo
     def school_year
       Meibo.current_roster.academic_sessions.find(school_year_sourced_id)
     end
+
+    def classes
+      Meibo.current_roster.classes.where(course_sourced_id: sourced_id)
+    end
   end
 end

data/lib/meibo/data_set.rb

@@ -42,19 +42,17 @@ module Meibo
       raise DataNotFoundError, "sourcedId: #{sourced_id} が見つかりません"
     end
 
-    def by_organization(org_sourced_id)
-      data_by_org_sourced_id[org_sourced_id]
-    end
-
-    def by_user(user_sourced_id)
-      data_by_user_sourced_id[user_sourced_id]
+    def where(**conditions)
+      group_cache[conditions.keys.sort][conditions.values]
     end
 
     private
 
-    def data_by_org_sourced_id
-      @cache[:data_by_org_sourced_id] ||= @data.group_by(&:data_by_org_sourced_id).to_h do |org_sourced_id, data|
-        [org_sourced_id, new(data)]
+    def group_cache
+      @cache[:group_cache] ||= Hash.new do |hash, keys|
+        hash[keys] = @data.group_by {|datum| keys.map {|attribute| datum.public_send(attribute) } }.to_h do |values, data|
+          [values, new(data)]
+        end
       end
     end
 
@@ -62,12 +60,6 @@ module Meibo
       @cache[:data_by_sourced_id] ||= @data.to_h {|datum| [datum.sourced_id, datum] }
     end
 
-    def data_by_user_sourced_id
-      @cache[:data_by_user_sourced_id] ||= @data.group_by(&:user_sourced_id).to_h do |user_sourced_id, data|
-        [user_sourced_id, new(data)]
-      end
-    end
-
     def new(data)
       self.class.new(data, roster: roster)
     end

data/lib/meibo/organization.rb

@@ -68,5 +68,21 @@ module Meibo
     def parent
       parent_sourced_id && Meibo.current_roster.organizations.find(parent_sourced_id)
     end
+
+    def enrollments
+      Meibo.current_roster.enrollments.where(school_sourced_id: sourced_id)
+    end
+
+    def classes
+      Meibo.current_roster.classes.where(school_sourced_id: sourced_id)
+    end
+
+    def courses
+      Meibo.current_roster.courses.where(org_sourced_id: sourced_id)
+    end
+
+    def roles
+      Meibo.current_roster.roles.where(org_sourced_id: sourced_id)
+    end
   end
 end

data/lib/meibo/user.rb

@@ -79,7 +79,7 @@ module Meibo
     end
 
     def enrollments
-      Meibo.current_roster.enrollments.by_user(sourced_id)
+      Meibo.current_roster.enrollments.where(user_sourced_id: sourced_id)
     end
 
     def primary_organization
@@ -87,17 +87,17 @@ module Meibo
     end
 
     def primary_role_in(org)
-      Meibo.current_roster.roles.by_user(sourced_id).detect do |role|
+      Meibo.current_roster.roles.where(user_sourced_id: sourced_id).detect do |role|
         role.primary? && role.org_sourced_id == org.sourced_id
       end
     end
 
     def roles
-      Meibo.current_roster.roles.by_user(sourced_id)
+      Meibo.current_roster.roles.where(user_sourced_id: sourced_id)
     end
 
     def user_profiles
-      Meibo.current_roster.user_profiles.by_user(sourced_id)
+      Meibo.current_roster.user_profiles.where(user_sourced_id: sourced_id)
     end
   end
 end

data/lib/meibo/user_profile.rb

@@ -42,5 +42,9 @@ module Meibo
     def user
       Meibo.current_roster.users.find(user_sourced_id)
     end
+
+    def role
+      Meibo.current_roster.roles.where(user_profile_sourced_id: sourced_id).first
+    end
   end
 end

data/lib/meibo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Meibo
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meibo
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Seiei Miyagi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -125,7 +125,7 @@ metadata:
   allowed_push_host: https://rubygems.org/
   homepage_uri: https://github.com/hanachin/meibo
   source_code_uri: https://github.com/hanachin/meibo
-  changelog_uri: https://github.com/hanachin/meibo/blob/meibo/v0.13.0/CHANGELOG.md
+  changelog_uri: https://github.com/hanachin/meibo/blob/meibo/v0.14.0/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: