Merge pull request #16 from ProjetSigma/feature/improve_groups

GroupField / GroupMemberValue and Validator models.
+ Related tests, migrations and fixtures.

requirements/prod.txt

@@ -16,3 +16,5 @@ django-oauth-toolkit == 0.10.0
 markdown >= 2.6.5
 Pillow >= 3.1.0
 mysqlclient >= 1.3.7
+timeout-decorator
+jsonfield

resetdb.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
 python3 manage.py reset_db && \
 python3 manage.py migrate && \
-python3 manage.py loaddata fixtures.json
+python3 manage.py loaddata sigma_core/fixtures/fixtures_prod.json && \
+python3 manage.py loaddata sigma_core/fixtures/fixtures.json

sigma/urls.py

@@ -22,13 +22,19 @@
 from sigma_core.views.school import SchoolViewSet
 from sigma_core.views.group_user import GroupUserViewSet
 from sigma_core.views.group_member import GroupMemberViewSet
+from sigma_core.views.group_member_value import GroupMemberValueViewSet
+from sigma_core.views.group_field import GroupFieldViewSet
+from sigma_core.views.validator import ValidatorViewSet
 
 router = routers.DefaultRouter()
 
-router.register(r'user', UserViewSet)
 router.register(r'group', GroupViewSet)
-router.register(r'school', SchoolViewSet)
+router.register(r'group-field', GroupFieldViewSet)
 router.register(r'group-member', GroupMemberViewSet)
+router.register(r'group-member-value', GroupMemberValueViewSet)
+router.register(r'school', SchoolViewSet)
+router.register(r'user', UserViewSet)
+router.register(r'validator', ValidatorViewSet)
 
 urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),

sigma_core/fixtures/fixtures.json

@@ -0,0 +1 @@
+[{"model": "sigma_core.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$24000$uU67Dhb1NLr0$MUzBzq/nX+76AVEC8RmX9VioyOyBiOk+MzA8H/ICR0w=", "last_login": "2016-01-21T22:12:49.624Z", "email": "admin@sigma.fr", "lastname": "Dumbledore", "firstname": "Albus", "phone": "", "is_active": true, "last_modified": "2016-01-21T22:12:30.398Z", "join_date": "2016-01-21T22:12:30.392Z", "is_superuser": true, "is_staff": true, "invited_to_groups": []}}, {"model": "sigma_core.user", "pk": 2, "fields": {"password": "user", "last_login": null, "email": "user@sigma.fr", "lastname": "Masset", "firstname": "Camille", "phone": "0612345678", "is_active": true, "last_modified": "2016-01-21T22:13:51.808Z", "join_date": "2016-01-21T22:13:51.808Z", "is_superuser": false, "is_staff": false, "invited_to_groups": []}}, {"model": "sigma_core.user", "pk": 3, "fields": {"password": "student", "last_login": null, "email": "student@sigma.fr", "lastname": "Merigoux", "firstname": "Denis", "phone": "0787654321", "is_active": true, "last_modified": "2016-01-21T22:14:20.642Z", "join_date": "2016-01-21T22:14:20.642Z", "is_superuser": false, "is_staff": false, "invited_to_groups": []}}, {"model": "sigma_core.user", "pk": 4, "fields": {"password": "admin_x2013", "last_login": null, "email": "admin_x2013@polytechnique.edu", "lastname": "Kessier", "firstname": "Fruit", "phone": "", "is_active": true, "last_modified": "2016-01-21T22:50:22.557Z", "join_date": "2016-01-21T22:50:22.557Z", "is_superuser": false, "is_staff": false, "invited_to_groups": []}}, {"model": "sigma_core.user", "pk": 5, "fields": {"password": "tos2013", "last_login": null, "email": "tos2013@polytechnique.edu", "lastname": "TOS", "firstname": "Gros", "phone": "", "is_active": true, "last_modified": "2016-01-21T22:50:57.411Z", "join_date": "2016-01-21T22:50:57.411Z", "is_superuser": false, "is_staff": false, "invited_to_groups": []}}, {"model": "sigma_core.group", "pk": 1, "fields": {"name": "\u00c9cole polytechnique", "visibility": "public", "type": "school", "default_member_rank": -1, "req_rank_invite": 10, "req_rank_kick": 10, "req_rank_accept_join_requests": 10, "req_rank_promote": 10, "req_rank_demote": 10, "req_rank_modify_group_infos": 10}}, {"model": "sigma_core.group", "pk": 2, "fields": {"name": "Promotion X2013", "visibility": "public", "type": "school_promotion", "default_member_rank": -1, "req_rank_invite": 10, "req_rank_kick": 10, "req_rank_accept_join_requests": 10, "req_rank_promote": 10, "req_rank_demote": 10, "req_rank_modify_group_infos": 10}}, {"model": "sigma_core.group", "pk": 3, "fields": {"name": "Promotion X2014", "visibility": "public", "type": "school_promotion", "default_member_rank": -1, "req_rank_invite": 10, "req_rank_kick": 10, "req_rank_accept_join_requests": 10, "req_rank_promote": 10, "req_rank_demote": 10, "req_rank_modify_group_infos": 10}}, {"model": "sigma_core.groupmember", "pk": 1, "fields": {"user": 2, "group": 1, "created": "2016-01-21T22:38:37.156Z", "join_date": "2013-09-01", "leave_date": null, "perm_rank": 1}}, {"model": "sigma_core.groupmember", "pk": 2, "fields": {"user": 3, "group": 1, "created": "2016-01-21T22:38:48.081Z", "join_date": "2013-09-01", "leave_date": null, "perm_rank": 1}}, {"model": "sigma_core.groupmember", "pk": 3, "fields": {"user": 2, "group": 2, "created": "2016-01-21T22:38:55.987Z", "join_date": "2013-09-01", "leave_date": null, "perm_rank": 1}}, {"model": "sigma_core.groupmember", "pk": 4, "fields": {"user": 3, "group": 2, "created": "2016-01-21T22:38:59.313Z", "join_date": "2013-09-01", "leave_date": null, "perm_rank": 1}}, {"model": "sigma_core.groupmember", "pk": 5, "fields": {"user": 4, "group": 1, "created": "2016-01-21T22:51:21.839Z", "join_date": "2013-09-01", "leave_date": null, "perm_rank": 10}}]

sigma_core/fixtures/fixtures_prod.json

@@ -0,0 +1,18 @@
+[
+  {
+    "model": "sigma_core.validator",
+    "fields": {
+      "display_name": "Text",
+      "html_name": "text",
+      "values": { "message" : "Error message", "regex" : "Regex"}
+    }
+  },
+  {
+    "model": "sigma_core.validator",
+    "fields": {
+      "display_name": "No validation",
+      "html_name": "none",
+      "values": {}
+    }
+  }
+]