Merge pull request #2108 from TEAMSchools/fix-20241104

Fix 20241104
TEAMSchools · Nov 4, 2024 · b68cab1 · b68cab1
2 parents 9ece440 + 7fc45a3
commit b68cab1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -8,20 +8,20 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - [email protected].386
+    - [email protected].387
     - [email protected]
     - git-diff-check
     - [email protected]
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected].0
+    - [email protected].1
     - [email protected]
     - [email protected]
-    - [email protected].1
+    - [email protected].2
     - [email protected]
     - [email protected]
-    - [email protected].4
+    - [email protected].5
     - [email protected]
     - [email protected]
     - [email protected]

diff --git a/src/dbt/kipptaf/models/extracts/google/directory/rpt_google_directory__users_import.sql b/src/dbt/kipptaf/models/extracts/google/directory/rpt_google_directory__users_import.sql
@@ -7,12 +7,14 @@ with
             se.school_name,
             se.is_out_of_district,
 
-            to_hex(sha1(se.student_web_password)) as `password`,
-            if(se.grade_level >= 3, true, false) as `changePasswordAtNextLogin`,
-            if(se.enroll_status = 0, false, true) as `suspended`,
             concat(
                 'group-students-', lower(se.region), '@teamstudents.org'
             ) as `groupKey`,
+
+            to_hex(sha1(se.student_web_password)) as `password`,
+
+            if(se.grade_level >= 3, true, false) as `changePasswordAtNextLogin`,
+            if(se.enroll_status = 0, false, true) as `suspended`,
         from {{ ref("base_powerschool__student_enrollments") }} as se
         where se.rn_all = 1 and se.student_email_google is not null
     ),
@@ -30,18 +32,17 @@ with
             u.name__given_name as given_name_target,
             u.name__family_name as family_name_target,
             u.suspended as suspended_target,
-
-            o.org_unit_path as org_unit_path_target,
+            u.org_unit_path as org_unit_path_target,
 
             'SHA-1' as `hashFunction`,
 
+            if(u.primary_email is not null, true, false) as is_matched,
+
             if(
                 s.suspended or s.is_out_of_district,
                 '/Students/Disabled',
                 o.org_unit_path
             ) as `orgUnitPath`,
-
-            if(u.primary_email is not null, true, false) as is_matched,
         from students as s
         left join
             {{ ref("stg_google_directory__users") }} as u

diff --git a/src/teamster/libraries/deanslist/resources.py b/src/teamster/libraries/deanslist/resources.py
@@ -10,7 +10,7 @@
 class DeansListResource(ConfigurableResource):
     subdomain: str
     api_key_map: str
-    request_timeout: float = 30.0
+    request_timeout: float = 60.0
 
     _session: Session = PrivateAttr(default_factory=Session)
     _base_url: str = PrivateAttr()