From 9ad64cbf5a4efc56f0df4cfc52a9bedda759ec75 Mon Sep 17 00:00:00 2001
From: Tanner Collin <git@tannercollin.com>
Date: Fri, 5 Jun 2020 03:29:32 +0000
Subject: [PATCH] Resolve member objects in lockout auth update script

---
 apiserver/lockout_auth_update.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/apiserver/lockout_auth_update.py b/apiserver/lockout_auth_update.py
index 6b32881..0e1e536 100644
--- a/apiserver/lockout_auth_update.py
+++ b/apiserver/lockout_auth_update.py
@@ -10,11 +10,20 @@ from apiserver.api import models, utils
 print("Updating member orientation dates")
 sessions = models.Session.objects.filter(course = 249)
 
+def get_member(obj):
+    # same as in serialzers.py -> get_cards for example
+    if obj.user:
+        member = obj.user.member
+    else:
+        member = models.Member.objects.get(id=obj.member_id)
+    return member
+
+
 for session in sessions:
     students = models.Training.objects.filter(session = session)
     for student in students:
-        if student.member_id and student.attendance_status == "Attended":
-            member = models.Member.objects.get(pk=student.member_id)
+        if student.attendance_status == "Attended":
+            member = get_member(student)
             if not member.orientation_date:
                 member.orientation_date = session.datetime
                 member.save()
@@ -26,8 +35,8 @@ sessions = models.Session.objects.filter(course = 281)
 for session in sessions:
     students = models.Training.objects.filter(session = session)
     for student in students:
-        if student.member_id and student.attendance_status == "Attended":
-            member = models.Member.objects.get(pk=student.member_id)
+        if student.attendance_status == "Attended":
+            member = get_member(student)
             if not member.lathe_cert_date:
                 member.lathe_cert_date = session.datetime
                 member.save()
@@ -39,8 +48,8 @@ sessions = models.Session.objects.filter(course = 283)
 for session in sessions:
     students = models.Training.objects.filter(session = session)
     for student in students:
-        if student.member_id and student.attendance_status == "Attended":
-            member = models.Member.objects.get(pk=student.member_id)
+        if student.attendance_status == "Attended":
+            member = get_member(student)
             if not member.mill_cert_date:
                 member.mill_cert_date = session.datetime
                 member.save()
@@ -53,8 +62,8 @@ sessions = models.Session.objects.filter(course = 261)
 for session in sessions:
     students = models.Training.objects.filter(session = session)
     for student in students:
-        if student.member_id and student.attendance_status == "Attended":
-            member = models.Member.objects.get(pk=student.member_id)
+        if student.attendance_status == "Attended":
+            member = get_member(student)
             if not member.wood_cert_date:
                 member.wood_cert_date = session.datetime
                 member.save()