Backend: Update initial fixtures

3 files changed, 50 insertions, 27 deletions

diff --git a/backend/fixtures/initial_data.json b/backend/fixtures/initial_data.json
index 7b6be46..78b9616 100644
--- a/backend/fixtures/initial_data.json
+++ b/backend/fixtures/initial_data.json
@@ -116,7 +116,9 @@
             "access": 0,
             "score": 1,
             "user": 2,
-            "nickname": "Nickname 1"
+            "nickname": "Nickname 1",
+            "lastseen_chat": "2012-08-16T06:14:49Z",
+            "lastseen_webcam": "2012-08-16T06:14:49Z"
         }
     },
     {
@@ -128,7 +130,9 @@
             "access": 0,
             "score": 2,
             "user": 3,
-            "nickname": "Nickname 2"
+            "nickname": "Nickname 2",
+            "lastseen_chat": "2012-08-16T06:14:49Z",
+            "lastseen_webcam": "2012-08-16T06:14:49Z"
         }
     },
     {
@@ -140,7 +144,9 @@
             "access": 0,
             "score": 3,
             "user": 4,
-            "nickname": "Nickname 3"
+            "nickname": "Nickname 3",
+            "lastseen_chat": "2012-08-16T06:14:49Z",
+            "lastseen_webcam": "2012-08-16T06:14:49Z"
         }
     },
     {
@@ -152,7 +158,9 @@
             "access": 0,
             "score": 4,
             "user": 5,
-            "nickname": "Nickname 4"
+            "nickname": "Nickname 4",
+            "lastseen_chat": "2012-08-16T06:14:49Z",
+            "lastseen_webcam": "2012-08-16T06:14:49Z"
         }
     },
     {
@@ -164,7 +172,9 @@
             "access": 0,
             "score": 5,
             "user": 6,
-            "nickname": "Nickname 5"
+            "nickname": "Nickname 5",
+            "lastseen_chat": "2012-08-16T06:14:49Z",
+            "lastseen_webcam": "2012-08-16T06:14:49Z"
         }
     },
     {
@@ -172,7 +182,7 @@
         "model": "backend.sjroom",
         "fields": {
             "private": false,
-            "settings_text": "{}",
+            "settings_text": "{\"bg\": \"http://exmaple.com/background1\"}",
             "user": 2,
             "name": "Room 1",
             "datetime": "2012-08-13T21:21:43Z"
@@ -183,7 +193,7 @@
         "model": "backend.sjroom",
         "fields": {
             "private": true,
-            "settings_text": "{}",
+            "settings_text": "{\"bg\": \"http://exmaple.com/background2\"}",
             "user": 3,
             "name": "Room 2",
             "datetime": "2012-08-13T21:22:46Z"
@@ -194,7 +204,7 @@
         "model": "backend.sjroom",
         "fields": {
             "private": true,
-            "settings_text": "{}",
+            "settings_text": "{\"bg\": \"http://exmaple.com/background3\"}",
             "user": 4,
             "name": "Room 3",
             "datetime": "2012-08-13T21:23:07Z"
@@ -205,7 +215,7 @@
         "model": "backend.sjroom",
         "fields": {
             "private": false,
-            "settings_text": "{}",
+            "settings_text": "{\"bg\": \"http://exmaple.com/background4\"}",
             "user": 5,
             "name": "Room 4",
             "datetime": "2012-08-13T21:23:25Z"
@@ -216,7 +226,7 @@
         "model": "backend.sjroom",
         "fields": {
             "private": false,
-            "settings_text": "{}",
+            "settings_text": "{\"bg\": \"http://exmaple.com/background5\"}",
             "user": 6,
             "name": "Room 5",
             "datetime": "2012-08-13T21:23:39Z"
@@ -227,7 +237,7 @@
         "model": "backend.sjroom",
         "fields": {
             "private": false,
-            "settings_text": "{}",
+            "settings_text": "{\"bg\": \"http://exmaple.com/background6\"}",
             "user": 3,
             "name": "Room 6",
             "datetime": "2012-08-13T21:24:00Z"
@@ -238,7 +248,7 @@
         "model": "backend.sjroom",
         "fields": {
             "private": false,
-            "settings_text": "{}",
+            "settings_text": "{\"bg\": \"http://exmaple.com/background7\"}",
             "user": 4,
             "name": "Room 7",
             "datetime": "2012-08-13T21:24:16Z"
@@ -248,7 +258,7 @@
         "pk": 1,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'url':'http://example.com/room1/user1/url1'}",
+            "settings_text": "{\"url\":\"http://example.com/room1/user1/url1\"}",
             "room": 1,
             "user": 2,
             "content_type": "url",
@@ -259,7 +269,7 @@
         "pk": 2,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'html': '<h1>example</h1>'}",
+            "settings_text": "{\"html\": \"<h1>example</h1>\"}",
             "room": 1,
             "user": 2,
             "content_type": "html",
@@ -270,7 +280,7 @@
         "pk": 3,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'text': 'example'}",
+            "settings_text": "{\"text\": \"example\"}",
             "room": 1,
             "user": 2,
             "content_type": "text",
@@ -281,7 +291,7 @@
         "pk": 4,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'url': 'http://example.com/image1'}",
+            "settings_text": "{\"url\": \"http://example.com/image1\"}",
             "room": 1,
             "user": 2,
             "content_type": "image",
@@ -292,7 +302,7 @@
         "pk": 5,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'url': 'http://example.com/room1/user1/video1'}",
+            "settings_text": "{\"url\": \"http://example.com/room1/user1/video1\", \"title\": \"Video 1\"}",
             "room": 1,
             "user": 2,
             "content_type": "video",
@@ -303,7 +313,7 @@
         "pk": 6,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'url': 'http://example.com/room1/user1/audio1'}",
+            "settings_text": "{\"url\": \"http://example.com/room1/user1/audio1\"}",
             "room": 1,
             "user": 2,
             "content_type": "audio",
@@ -314,7 +324,7 @@
         "pk": 7,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'url': 'http://example.com/background1'}",
+            "settings_text": "{\"url\": \"http://example.com/background1\"}",
             "room": 1,
             "user": 2,
             "content_type": "background",
@@ -325,7 +335,7 @@
         "pk": 8,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'url':'http://example.com/room2/user2/url1'}",
+            "settings_text": "{\"url\":\"http://example.com/room2/user2/url1\"}",
             "room": 2,
             "user": 3,
             "content_type": "url",
@@ -336,7 +346,7 @@
         "pk": 9,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'html': '<h1>example</h1>'}",
+            "settings_text": "{\"html\": \"<h1>example</h1>\"}",
             "room": 2,
             "user": 3,
             "content_type": "html",
@@ -347,7 +357,7 @@
         "pk": 10,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'text': 'example'}",
+            "settings_text": "{\"text\": \"example\"}",
             "room": 2,
             "user": 3,
             "content_type": "text",
@@ -358,7 +368,7 @@
         "pk": 11,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'url': 'http://example.com/image1'}",
+            "settings_text": "{\"url\": \"http://example.com/image1\"}",
             "room": 2,
             "user": 3,
             "content_type": "image",
@@ -369,7 +379,7 @@
         "pk": 12,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'url': 'http://example.com/room2/user2/video1'}",
+            "settings_text": "{\"url\": \"http://example.com/room2/user2/video1\", \"title\": \"Video 1\"}",
             "room": 2,
             "user": 3,
             "content_type": "video",
@@ -380,7 +390,7 @@
         "pk": 13,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'url': 'http://example.com/room2/user2/audio1'}",
+            "settings_text": "{\"url\": \"http://example.com/room2/user2/audio1\"}",
             "room": 2,
             "user": 3,
             "content_type": "audio",
@@ -391,7 +401,7 @@
         "pk": 14,
         "model": "backend.sjcontent",
         "fields": {
-            "settings_text": "{'url': 'http://example.com/background1'}",
+            "settings_text": "{\"url\": \"http://example.com/background1\"}",
             "room": 2,
             "user": 3,
             "content_type": "background",
diff --git a/backend/models.py b/backend/models.py
index 39bedd2..6b6c9a7 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -39,6 +39,8 @@ class SJUserProfile(SJSettingsModel):
     score = models.IntegerField(default=0, blank=True)
     access = models.IntegerField(default=0, blank=True)
     bio = models.TextField(blank=True)
+    lastseen_chat = models.DateTimeField(blank=True)
+    lastseen_webcam = models.DateTimeField(blank=True)
 
     class Meta:
         verbose_name = "SJ User Profile"
@@ -70,6 +72,7 @@ class SJRoom(SJUserActivity, SJSettingsModel):
     """ ScannerJammer room model
     """
     name = models.CharField(max_length=32)
+    users = models.ManyToManyField(auth.models.User, related_name='+')
     private = models.BooleanField(default=False)
 
     class Meta:
diff --git a/backend/views.py b/backend/views.py
index b3a81a8..f87c9b6 100644
--- a/backend/views.py
+++ b/backend/views.py
@@ -393,10 +393,20 @@ def api_room_list(request):
 def api_room_view(request):
     """ Private API
     """
-    form_fields = ['room', 'last']
+    user = request.user
+    if not user.is_authenticated():
+        return response_error('no logged in')
+    user_profile = user.get_profile()
+    form_fields = ['room']
     response = check_form_fields(request, form_fields)
     if response:
         return response
+    try:
+        room = SJRoom.objects.get(name=request.POST['room'])
+    except:
+        return response_error('no room')
+
+   # user.
     return HttpResponse('Not implemented yet!\n')
 
 @require_POST