fixed api which was broken when we removed core app from project, serializers fo…

…r log and users are now working

fixed api which was broken when we removed core app from project, serializers fo…
…r log and users are now working
fbormann
1 parent b0f214b3
Showing 13 changed files with 70 additions and 3 deletions Show diff stats
amadeus/settings.py
amadeus/urls.py
api/__init__.py
api/admin.py
api/apps.py
api/migrations/__init__.py
api/models.py
api/tests.py
api/urls.py
api/views.py
log/serializers.py
log/views.py
users/serializers.py
@@ -75,6 +75,7 @@ INSTALLED_APPS = [
     'mailsender',
     'security',
     'themes',
+    'api',
  
 ]
  
@@ -289,6 +290,21 @@ S3DIRECT_DESTINATIONS = {
  
 }
  
+#API CONFIG STARTS
+#TELL the rest framework to use a different backend
+REST_FRAMEWORK = {
+    'DEFAULT_AUTHENTICATION_CLASSES':(
+        'oauth2_provider.ext.rest_framework.OAuth2Authentication',),
+    'DEFAULT_PERMISSION_CLASSES':(
+        'rest_framework.permissions.IsAuthenticated',),
+     'PAGE_SIZE': 10, #pagination purposes
+}
+
+OAUTH2_PROVIDER = {
+    'SCOPES':{'read':'Read scope', 'write': 'Write scope'}
+}
+#API CONFIG ENDS
+
 # FILE UPLOAD
 MAX_UPLOAD_SIZE = 10485760
  
@@ -25,6 +25,7 @@ urlpatterns = [
     url(r'^users/', include('users.urls', namespace = 'users')),
     url(r'^admin/', admin.site.urls),
     url(r'^$', index, name = 'home'),
+    url(r'api/', include('api.urls', namespace = 'api')),
     url(r'^categories/', include('categories.urls', namespace = 'categories')),
     url(r'^subjects/', include('subjects.urls', namespace = 'subjects')),
     url(r'^groups/', include('students_group.urls', namespace = 'groups')),
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ApiConfig(AppConfig):
+    name = 'api'
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,17 @@
+from django.conf.urls import url, include
+
+# ========== API IMPORTS ============= #
+
+from rest_framework import routers
+
+from users.views import UserViewSet
+from log.views import LogViewSet
+
+router = routers.DefaultRouter()
+router.register(r'logs', LogViewSet)
+router.register(r'usersapi', UserViewSet)
+
+urlpatterns = [
+	#API REST
+    url(r'^', include(router.urls)),
+]
 \ No newline at end of file
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
@@ -0,0 +1,7 @@
+from rest_framework import serializers
+from .models import Log
+
+class LogSerializer(serializers.ModelSerializer):
+	class Meta:
+		model = Log
+		fields = '__all__'
 \ No newline at end of file
 from django.shortcuts import render
-
+#API IMPORTS
+from rest_framework import viewsets
+from .serializers import LogSerializer
+from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnly
+from .models import Log
 # Create your views here.
+
+#REST API VIEWS
+class LogViewSet(viewsets.ModelViewSet):
+	permission_classes = [IsAuthenticated]
+	queryset = Log.objects.all()
+	serializer_class = LogSerializer
 \ No newline at end of file
@@ -4,6 +4,5 @@ from .models import User
 class UserSerializer(serializers.ModelSerializer):
 	class Meta:
 		model = User
-		fields = ('username','email','name','city','state','gender','image','birth_date','phone',
-			'cpf','type_profile','titration','year_titration','institution','curriculum','date_created',
+		fields = ('username','email','image','last_update','date_created','last_name','social_name',
 			'is_staff','is_active')
...	...	@@ -75,6 +75,7 @@ INSTALLED_APPS = [
75	75	'mailsender',
76	76	'security',
77	77	'themes',
	78	+ 'api',
78	79
79	80	]
80	81
...	...	@@ -289,6 +290,21 @@ S3DIRECT_DESTINATIONS = {
289	290
290	291	}
291	292
	293	+#API CONFIG STARTS
	294	+#TELL the rest framework to use a different backend
	295	+REST_FRAMEWORK = {
	296	+ 'DEFAULT_AUTHENTICATION_CLASSES':(
	297	+ 'oauth2_provider.ext.rest_framework.OAuth2Authentication',),
	298	+ 'DEFAULT_PERMISSION_CLASSES':(
	299	+ 'rest_framework.permissions.IsAuthenticated',),
	300	+ 'PAGE_SIZE': 10, #pagination purposes
	301	+}
	302	+
	303	+OAUTH2_PROVIDER = {
	304	+ 'SCOPES':{'read':'Read scope', 'write': 'Write scope'}
	305	+}
	306	+#API CONFIG ENDS
	307	+
292	308	# FILE UPLOAD
293	309	MAX_UPLOAD_SIZE = 10485760
294	310
...	...
...	...	@@ -25,6 +25,7 @@ urlpatterns = [
25	25	url(r'^users/', include('users.urls', namespace = 'users')),
26	26	url(r'^admin/', admin.site.urls),
27	27	url(r'^$', index, name = 'home'),
	28	+ url(r'api/', include('api.urls', namespace = 'api')),
28	29	url(r'^categories/', include('categories.urls', namespace = 'categories')),
29	30	url(r'^subjects/', include('subjects.urls', namespace = 'subjects')),
30	31	url(r'^groups/', include('students_group.urls', namespace = 'groups')),
...	...
...	...	@@ -0,0 +1,3 @@
	1	+from django.contrib import admin
	2	+
	3	+# Register your models here.
...	...
...	...	@@ -0,0 +1,5 @@
	1	+from django.apps import AppConfig
	2	+
	3	+
	4	+class ApiConfig(AppConfig):
	5	+ name = 'api'
...	...
...	...	@@ -0,0 +1,3 @@
	1	+from django.db import models
	2	+
	3	+# Create your models here.
...	...
...	...	@@ -0,0 +1,3 @@
	1	+from django.test import TestCase
	2	+
	3	+# Create your tests here.
...	...
...	...	@@ -0,0 +1,17 @@
	1	+from django.conf.urls import url, include
	2	+
	3	+# ========== API IMPORTS ============= #
	4	+
	5	+from rest_framework import routers
	6	+
	7	+from users.views import UserViewSet
	8	+from log.views import LogViewSet
	9	+
	10	+router = routers.DefaultRouter()
	11	+router.register(r'logs', LogViewSet)
	12	+router.register(r'usersapi', UserViewSet)
	13	+
	14	+urlpatterns = [
	15	+ #API REST
	16	+ url(r'^', include(router.urls)),
	17	+]
0	18	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,3 @@
	1	+from django.shortcuts import render
	2	+
	3	+# Create your views here.
...	...
...	...	@@ -0,0 +1,7 @@
	1	+from rest_framework import serializers
	2	+from .models import Log
	3	+
	4	+class LogSerializer(serializers.ModelSerializer):
	5	+ class Meta:
	6	+ model = Log
	7	+ fields = '__all__'
0	8	\ No newline at end of file
...	...
1	1	from django.shortcuts import render
2		-
	2	+#API IMPORTS
	3	+from rest_framework import viewsets
	4	+from .serializers import LogSerializer
	5	+from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnly
	6	+from .models import Log
3	7	# Create your views here.
	8	+
	9	+#REST API VIEWS
	10	+class LogViewSet(viewsets.ModelViewSet):
	11	+ permission_classes = [IsAuthenticated]
	12	+ queryset = Log.objects.all()
	13	+ serializer_class = LogSerializer
4	14	\ No newline at end of file
...	...