oneroster 2.3.16 → 2.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fe9dad3ac5ec94b56e19e454c4f5b02cef8aa2d296ab9fd4712fecc5d5cb900
-  data.tar.gz: 56d71fcd5e105f8c39f1634be90ab0da4f88259a03c73c796f3a73c4eb86a55d
+  metadata.gz: 555858921ccacbcd41542d5b989a9f9cd5fb444d87612a487628cf1e5aa9f080
+  data.tar.gz: a49f9e318f4906526059e081fb167ef6e3807390e6525e5f077df3f39f829876
 SHA512:
-  metadata.gz: 999b238ab6e94f5fb2f83517a282945e4d758ff6a5f297f8448d44321e4d79188c208d1aaa42cb0a184a5c4d7953754a4e6e4ba66693031ba3854d642506bb9c
-  data.tar.gz: c7abc5bd193fe99d7d6750889bda3ecf6c56f0fc14b46d25294f16003d96b2d6784c8e8df8d085f9ef16cff3e391838543287b9c6aa7a92202ffa76b62d5abaf
+  metadata.gz: c843a76353e9e318f06bb0288bb40f4867ce721a22c7416073a0999baab245a6ba490c414d03ca7fe5ee47045cec220e0acb55c1452a9277ab9716e7ffdc63d9
+  data.tar.gz: ffe69362126bec58ba2d46f08810628f42d243301e06e4e8a53928e43eaaf5c4d6d5e478de8bdd8b8159e0fd0a0ad5340b50b1cc7fe5f0b57cca245b7ce8af05

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oneroster (2.3.16)
+    oneroster (2.3.17)
       dry-inflector
       faraday
       faraday_middleware

data/lib/one_roster/client.rb

@@ -171,6 +171,7 @@ module OneRoster
 
       enrollments.each_with_object(teacher: [], student: []) do |enrollment, enrollments|
         next if classroom_uids.any? && !classroom_uids.include?(enrollment.classroom_uid)
+        next unless enrollment.in_term?
 
         enrollments[enrollment.role.to_sym] << enrollment if enrollment.valid?
       end

data/lib/one_roster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OneRoster
-  VERSION = '2.3.16'
+  VERSION = '2.3.17'
 end

data/lib/types/enrollment.rb

@@ -7,7 +7,9 @@ module OneRoster
                   :classroom_uid,
                   :user_uid,
                   :role,
-                  :provider
+                  :provider,
+                  :begin_date,
+                  :end_date
 
       def initialize(attributes = {}, *)
         @uid           = attributes['sourcedId']
@@ -16,6 +18,8 @@ module OneRoster
         @user_uid      = attributes['user_uid'] || attributes.dig('user', 'sourcedId')
         @role          = attributes['role']
         @primary       = attributes['primary']
+        @begin_date    = presence(attributes['beginDate'])
+        @end_date      = presence(attributes['endDate'])
         @provider      = 'oneroster'
       end
 
@@ -37,6 +41,14 @@ module OneRoster
         @role == 'student'
       end
 
+      def in_term?
+        return true if begin_date.nil? && end_date.nil?
+        return Time.parse(begin_date) < Time.now if !begin_date.nil? && end_date.nil?
+        return Time.parse(end_date) > Time.now if !end_date.nil? && begin_date.nil?
+
+        Time.parse(begin_date) <= Time.now && Time.parse(end_date) >= Time.now
+      end
+
       def to_h
         {
           classroom_uid: @classroom_uid,
@@ -45,6 +57,10 @@ module OneRoster
           provider: @provider
         }
       end
+
+      def presence(value)
+        value unless value.respond_to?(:empty?) && value.empty?
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneroster
 version: !ruby/object:Gem::Version
-  version: 2.3.16
+  version: 2.3.17
 platform: ruby
 authors:
 - Robert Julius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday