Better status management.

Status is mainly computed in Python. That fix inconsistent datetime between
client and server.

Client only receives status and keep timestamp of last received ws msg.

kfet/open/tests.py

@@ -1,7 +1,9 @@
 import json
+from datetime import timedelta
 
 from django.contrib.auth.models import AnonymousUser, Permission, User
 from django.test import Client
+from django.utils import timezone
 
 from channels.channel import Group
 from channels.test import ChannelTestCase, WSClient
@@ -54,11 +56,30 @@ class OpenKfetTest(ChannelTestCase):
             self.kfet_open.raw_open = raw_open
             self.assertFalse(self.kfet_open.is_open)
 
+    def test_status(self):
+        # (raw_open, force_close, expected status, expected admin)
+        cases = [
+            (False, False, OpenKfet.CLOSED, OpenKfet.CLOSED),
+            (False, True, OpenKfet.CLOSED, OpenKfet.CLOSED),
+            (True, False, OpenKfet.OPENED, OpenKfet.OPENED),
+            (True, True, OpenKfet.CLOSED, OpenKfet.FAKE_CLOSED),
+        ]
+        for raw_open, force_close, exp_stat, exp_adm_stat in cases:
+            self.kfet_open.raw_open = raw_open
+            self.kfet_open.force_close = force_close
+            self.assertEqual(exp_stat, self.kfet_open.status())
+            self.assertEqual(exp_adm_stat, self.kfet_open.admin_status())
+
+    def test_status_unknown(self):
+        self.kfet_open.raw_open = True
+        self.kfet_open._last_update = timezone.now() - timedelta(days=30)
+        self.assertEqual(OpenKfet.UNKNOWN, self.kfet_open.status())
+
     def test_export_user(self):
         """Export is limited for an anonymous user."""
         export = self.kfet_open.export(AnonymousUser())
         self.assertSetEqual(
-            set(['is_open', 'last_update']),
+            set(['status']),
             set(export),
         )
 
@@ -68,15 +89,7 @@ class OpenKfetTest(ChannelTestCase):
         user.user_permissions.add(Permission.objects.get(codename='is_team'))
         export = self.kfet_open.export(user)
         self.assertSetEqual(
-            set(['is_open', 'last_update', 'raw_open', 'force_close']),
-            set(export),
-        )
-
-    def test_export(self):
-        """Export all by default."""
-        export = self.kfet_open.export()
-        self.assertSetEqual(
-            set(['is_open', 'last_update', 'raw_open', 'force_close']),
+            set(['status', 'admin_status', 'force_close']),
             set(export),
         )
 
@@ -89,14 +102,14 @@ class OpenKfetTest(ChannelTestCase):
         recv_base = self.get_next_message('test.open.base', require=True)
         base = json.loads(recv_base['text'])
         self.assertSetEqual(
-            set(['is_open', 'last_update']),
+            set(['status']),
             set(base),
         )
 
         recv_admin = self.get_next_message('test.open.team', require=True)
         admin = json.loads(recv_admin['text'])
         self.assertSetEqual(
-            set(['is_open', 'last_update', 'raw_open', 'force_close']),
+            set(['status', 'admin_status', 'force_close']),
             set(admin),
         )
 
@@ -240,14 +253,14 @@ class OpenKfetScenarioTest(ChannelTestCase):
         # test for anonymous user
         msg = self.ws_connect(self.c_ws)
         self.assertSetEqual(
-            set(['is_open', 'last_update']),
+            set(['status']),
             set(msg),
         )
 
         # test for root user
         msg = self.ws_connect(self.r_c_ws)
         self.assertSetEqual(
-            set(['is_open', 'last_update', 'raw_open', 'force_close']),
+            set(['status', 'admin_status', 'force_close']),
             set(msg),
         )
 
@@ -264,25 +277,25 @@ class OpenKfetScenarioTest(ChannelTestCase):
 
         # anonymous user agree
         msg = self.c_ws.receive(json=True)
-        self.assertTrue(msg['is_open'])
+        self.assertEqual(OpenKfet.OPENED, msg['status'])
 
         # root user too
         msg = self.r_c_ws.receive(json=True)
-        self.assertTrue(msg['is_open'])
-        self.assertTrue(msg['raw_open'])
+        self.assertEqual(OpenKfet.OPENED, msg['status'])
+        self.assertEqual(OpenKfet.OPENED, msg['admin_status'])
 
         # admin says "no it's closed"
         self.r_c.post('/k-fet/open/force_close', {'force_close': True})
 
         # so anonymous user see it's closed
         msg = self.c_ws.receive(json=True)
-        self.assertFalse(msg['is_open'])
+        self.assertEqual(OpenKfet.CLOSED, msg['status'])
 
         # root user too
         msg = self.r_c_ws.receive(json=True)
-        self.assertFalse(msg['is_open'])
+        self.assertEqual(OpenKfet.CLOSED, msg['status'])
         # but root knows things
-        self.assertTrue(msg['raw_open'])
+        self.assertEqual(OpenKfet.FAKE_CLOSED, msg['admin_status'])
         self.assertTrue(msg['force_close'])
 
     def test_scenario_2(self):
@@ -291,19 +304,19 @@ class OpenKfetScenarioTest(ChannelTestCase):
         kfet_open.force_close = True
 
         msg = self.ws_connect(self.c_ws)
-        self.assertFalse(msg['is_open'])
+        self.assertEqual(OpenKfet.CLOSED, msg['status'])
 
         msg = self.ws_connect(self.r_c_ws)
-        self.assertFalse(msg['is_open'])
-        self.assertTrue(msg['raw_open'])
+        self.assertEqual(OpenKfet.CLOSED, msg['status'])
+        self.assertEqual(OpenKfet.FAKE_CLOSED, msg['admin_status'])
         self.assertTrue(msg['force_close'])
 
         self.r_c.post('/k-fet/open/force_close', {'force_close': False})
 
         msg = self.c_ws.receive(json=True)
-        self.assertTrue(msg['is_open'])
+        self.assertEqual(OpenKfet.OPENED, msg['status'])
 
         msg = self.r_c_ws.receive(json=True)
-        self.assertTrue(msg['is_open'])
-        self.assertTrue(msg['raw_open'])
+        self.assertEqual(OpenKfet.OPENED, msg['status'])
+        self.assertEqual(OpenKfet.OPENED, msg['admin_status'])
         self.assertFalse(msg['force_close'])