From 71bd9f6d14a10aaed681eddd62b1735b4bbe2d6c Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 6 Jul 2021 15:41:02 +0200
Subject: [PATCH] Update readonly property on user

---
 .../src/components/content-forms/AssignmentForm.vue |  2 +-
 server/assignments/tests/test_read_only.py          | 13 ++++++++++---
 server/users/models.py                              | 12 +++++-------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/client/src/components/content-forms/AssignmentForm.vue b/client/src/components/content-forms/AssignmentForm.vue
index 13020768..6a13e5df 100644
--- a/client/src/components/content-forms/AssignmentForm.vue
+++ b/client/src/components/content-forms/AssignmentForm.vue
@@ -31,7 +31,7 @@
   };
 </script>
 <style scoped lang="scss">
-  @import "@/styles/_variables.scss";
+  @import "~styles/helpers";
 
   .assignment-form {
     display: grid;
diff --git a/server/assignments/tests/test_read_only.py b/server/assignments/tests/test_read_only.py
index b83685e1..5a2f087e 100644
--- a/server/assignments/tests/test_read_only.py
+++ b/server/assignments/tests/test_read_only.py
@@ -1,3 +1,5 @@
+from datetime import timedelta, datetime
+
 from graphql_relay import to_global_id
 
 from assignments.factories import AssignmentFactory, StudentSubmissionFactory
@@ -9,7 +11,12 @@ from users.models import User
 class AssignmentReadOnlyTestCase(SkillboxTestCase):
     def setUp(self) -> None:
         self.createDefault()
-        self.student = User.objects.get(username='student1')
+        yesterday = datetime.now() - timedelta(days=1)
+
+        self.student1.license_expiry_date = yesterday
+        self.student1.save()
+        self.teacher.license_expiry_date = yesterday
+        self.teacher.save()
         self.assignment = AssignmentFactory()
         self.assignment_id = to_global_id('AssignmentNode', self.assignment.id)
 
@@ -24,7 +31,7 @@ class AssignmentReadOnlyTestCase(SkillboxTestCase):
                 }
             }
         }
-        result = self.get_client(self.student).execute(UPDATE_ASSIGNMENT_MUTATION, variables=variables)
+        result = self.get_client(self.student1).execute(UPDATE_ASSIGNMENT_MUTATION, variables=variables)
         self.assertIsNotNone(result.get('errors'))
 
     def test_share_assignment_fails(self):
@@ -38,7 +45,7 @@ class AssignmentReadOnlyTestCase(SkillboxTestCase):
                 }
             }
         }
-        result = self.get_client(self.student).execute(UPDATE_ASSIGNMENT_MUTATION, variables=variables)
+        result = self.get_client(self.student1).execute(UPDATE_ASSIGNMENT_MUTATION, variables=variables)
         self.assertIsNotNone(result.get('errors'))
 
     def test_edit_feedback_fails(self):
diff --git a/server/users/models.py b/server/users/models.py
index 310887e9..b4b70f65 100644
--- a/server/users/models.py
+++ b/server/users/models.py
@@ -119,18 +119,16 @@ class User(AbstractUser):
     def full_name(self):
         return self.get_full_name()
 
-    @cached_property
+    @property
     def read_only(self):
-        # todo: just mocked for now, link to license before release
-        return True
+        return self.get_license_status() == User.LICENSE_EXPIRED
 
     def get_license_status(self):
-        if not self.license_expiry_date:
+        if self.license_expiry_date is None:
             return User.LICENSE_NONE
-        now = datetime.now()
-        if self.license_expiry_date >= now:
+        if self.license_expiry_date >= datetime.now():
             return User.LICENSE_VALID
-        return User.LICENSE_NONE
+        return User.LICENSE_EXPIRED
 
     class Meta:
         ordering = ['pk', ]