mirror of
https://github.com/ae-utbm/sith.git
synced 2025-07-09 19:40:19 +00:00
All: Apply Black coding rules
This commit is contained in:
@ -21,4 +21,3 @@
|
||||
# Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
#
|
||||
|
||||
|
35
api/urls.py
35
api/urls.py
@ -29,25 +29,28 @@ from rest_framework import routers
|
||||
|
||||
# Router config
|
||||
router = routers.DefaultRouter()
|
||||
router.register(r'counter', CounterViewSet, base_name='api_counter')
|
||||
router.register(r'user', UserViewSet, base_name='api_user')
|
||||
router.register(r'club', ClubViewSet, base_name='api_club')
|
||||
router.register(r'group', GroupViewSet, base_name='api_group')
|
||||
router.register(r"counter", CounterViewSet, base_name="api_counter")
|
||||
router.register(r"user", UserViewSet, base_name="api_user")
|
||||
router.register(r"club", ClubViewSet, base_name="api_club")
|
||||
router.register(r"group", GroupViewSet, base_name="api_group")
|
||||
|
||||
# Launderette
|
||||
router.register(r'launderette/place', LaunderettePlaceViewSet,
|
||||
base_name='api_launderette_place')
|
||||
router.register(r'launderette/machine', LaunderetteMachineViewSet,
|
||||
base_name='api_launderette_machine')
|
||||
router.register(r'launderette/token', LaunderetteTokenViewSet,
|
||||
base_name='api_launderette_token')
|
||||
router.register(
|
||||
r"launderette/place", LaunderettePlaceViewSet, base_name="api_launderette_place"
|
||||
)
|
||||
router.register(
|
||||
r"launderette/machine",
|
||||
LaunderetteMachineViewSet,
|
||||
base_name="api_launderette_machine",
|
||||
)
|
||||
router.register(
|
||||
r"launderette/token", LaunderetteTokenViewSet, base_name="api_launderette_token"
|
||||
)
|
||||
|
||||
urlpatterns = [
|
||||
|
||||
# API
|
||||
url(r'^', include(router.urls)),
|
||||
url(r'^login/', include('rest_framework.urls', namespace='rest_framework')),
|
||||
url(r'^markdown$', RenderMarkdown, name='api_markdown'),
|
||||
url(r'^mailings$', FetchMailingLists, name='mailings_fetch')
|
||||
|
||||
url(r"^", include(router.urls)),
|
||||
url(r"^login/", include("rest_framework.urls", namespace="rest_framework")),
|
||||
url(r"^markdown$", RenderMarkdown, name="api_markdown"),
|
||||
url(r"^mailings$", FetchMailingLists, name="mailings_fetch"),
|
||||
]
|
||||
|
@ -30,19 +30,21 @@ from django.db.models.query import QuerySet
|
||||
|
||||
from core.views import can_view, can_edit
|
||||
|
||||
|
||||
def check_if(obj, user, test):
|
||||
"""
|
||||
Detect if it's a single object or a queryset
|
||||
aply a given test on individual object and return global permission
|
||||
"""
|
||||
if (isinstance(obj, QuerySet)):
|
||||
if isinstance(obj, QuerySet):
|
||||
for o in obj:
|
||||
if (test(o, user) is False):
|
||||
if test(o, user) is False:
|
||||
return False
|
||||
return True
|
||||
else:
|
||||
return test(obj, user)
|
||||
|
||||
|
||||
class ManageModelMixin:
|
||||
@detail_route()
|
||||
def id(self, request, pk=None):
|
||||
@ -53,19 +55,19 @@ class ManageModelMixin:
|
||||
serializer = self.get_serializer(self.queryset)
|
||||
return Response(serializer.data)
|
||||
|
||||
class RightModelViewSet(ManageModelMixin, viewsets.ModelViewSet):
|
||||
|
||||
class RightModelViewSet(ManageModelMixin, viewsets.ModelViewSet):
|
||||
def dispatch(self, request, *arg, **kwargs):
|
||||
res = super(RightModelViewSet,
|
||||
self).dispatch(request, *arg, **kwargs)
|
||||
res = super(RightModelViewSet, self).dispatch(request, *arg, **kwargs)
|
||||
obj = self.queryset
|
||||
user = self.request.user
|
||||
try:
|
||||
if (request.method == 'GET' and check_if(obj, user, can_view)):
|
||||
if request.method == "GET" and check_if(obj, user, can_view):
|
||||
return res
|
||||
if (request.method != 'GET' and check_if(obj, user, can_edit)):
|
||||
if request.method != "GET" and check_if(obj, user, can_edit):
|
||||
return res
|
||||
except: pass # To prevent bug with Anonymous user
|
||||
except:
|
||||
pass # To prevent bug with Anonymous user
|
||||
raise PermissionDenied
|
||||
|
||||
|
||||
@ -74,4 +76,4 @@ from .counter import *
|
||||
from .user import *
|
||||
from .club import *
|
||||
from .group import *
|
||||
from .launderette import *
|
||||
from .launderette import *
|
||||
|
@ -30,15 +30,14 @@ from rest_framework.views import APIView
|
||||
from core.templatetags.renderer import markdown
|
||||
|
||||
|
||||
@api_view(['POST'])
|
||||
@api_view(["POST"])
|
||||
@renderer_classes((StaticHTMLRenderer,))
|
||||
def RenderMarkdown(request):
|
||||
"""
|
||||
Render Markdown
|
||||
"""
|
||||
try:
|
||||
data = markdown(request.POST['text'])
|
||||
data = markdown(request.POST["text"])
|
||||
except:
|
||||
data = 'Error'
|
||||
data = "Error"
|
||||
return Response(data)
|
||||
|
||||
|
@ -36,10 +36,9 @@ from api.views import RightModelViewSet
|
||||
|
||||
|
||||
class ClubSerializer(serializers.ModelSerializer):
|
||||
|
||||
class Meta:
|
||||
model = Club
|
||||
fields = ('id', 'name', 'unix_name', 'address', 'members')
|
||||
fields = ("id", "name", "unix_name", "address", "members")
|
||||
|
||||
|
||||
class ClubViewSet(RightModelViewSet):
|
||||
@ -51,13 +50,15 @@ class ClubViewSet(RightModelViewSet):
|
||||
queryset = Club.objects.all()
|
||||
|
||||
|
||||
@api_view(['GET'])
|
||||
@api_view(["GET"])
|
||||
@renderer_classes((StaticHTMLRenderer,))
|
||||
def FetchMailingLists(request):
|
||||
key = request.GET.get('key', '')
|
||||
key = request.GET.get("key", "")
|
||||
if key != settings.SITH_MAILING_FETCH_KEY:
|
||||
raise PermissionDenied
|
||||
data = ''
|
||||
for mailing in Mailing.objects.filter(is_moderated=True, club__is_active=True).all():
|
||||
data = ""
|
||||
for mailing in Mailing.objects.filter(
|
||||
is_moderated=True, club__is_active=True
|
||||
).all():
|
||||
data += mailing.fetch_format() + "\n"
|
||||
return Response(data)
|
||||
|
@ -35,14 +35,12 @@ class CounterSerializer(serializers.ModelSerializer):
|
||||
|
||||
is_open = serializers.BooleanField(read_only=True)
|
||||
barman_list = serializers.ListField(
|
||||
child=serializers.IntegerField(),
|
||||
read_only=True
|
||||
child=serializers.IntegerField(), read_only=True
|
||||
)
|
||||
|
||||
class Meta:
|
||||
model = Counter
|
||||
fields = ('id', 'name', 'type', 'club',
|
||||
'products', 'is_open', 'barman_list')
|
||||
fields = ("id", "name", "type", "club", "products", "is_open", "barman_list")
|
||||
|
||||
|
||||
class CounterViewSet(RightModelViewSet):
|
||||
|
@ -30,7 +30,6 @@ from api.views import RightModelViewSet
|
||||
|
||||
|
||||
class GroupSerializer(serializers.ModelSerializer):
|
||||
|
||||
class Meta:
|
||||
model = RealGroup
|
||||
|
||||
|
@ -30,34 +30,45 @@ from launderette.models import Launderette, Machine, Token
|
||||
|
||||
from api.views import RightModelViewSet
|
||||
|
||||
|
||||
class LaunderettePlaceSerializer(serializers.ModelSerializer):
|
||||
|
||||
machine_list = serializers.ListField(
|
||||
child=serializers.IntegerField(),
|
||||
read_only=True
|
||||
)
|
||||
token_list = serializers.ListField(
|
||||
child=serializers.IntegerField(),
|
||||
read_only=True
|
||||
child=serializers.IntegerField(), read_only=True
|
||||
)
|
||||
token_list = serializers.ListField(child=serializers.IntegerField(), read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = Launderette
|
||||
fields = ('id', 'name', 'counter', 'machine_list',
|
||||
'token_list', 'get_absolute_url')
|
||||
fields = (
|
||||
"id",
|
||||
"name",
|
||||
"counter",
|
||||
"machine_list",
|
||||
"token_list",
|
||||
"get_absolute_url",
|
||||
)
|
||||
|
||||
|
||||
class LaunderetteMachineSerializer(serializers.ModelSerializer):
|
||||
|
||||
class Meta:
|
||||
model = Machine
|
||||
fields = ('id', 'name', 'type', 'is_working', 'launderette')
|
||||
fields = ("id", "name", "type", "is_working", "launderette")
|
||||
|
||||
|
||||
class LaunderetteTokenSerializer(serializers.ModelSerializer):
|
||||
|
||||
class Meta:
|
||||
model = Token
|
||||
fields = ('id', 'name', 'type', 'launderette', 'borrow_date',
|
||||
'user', 'is_avaliable')
|
||||
fields = (
|
||||
"id",
|
||||
"name",
|
||||
"type",
|
||||
"launderette",
|
||||
"borrow_date",
|
||||
"user",
|
||||
"is_avaliable",
|
||||
)
|
||||
|
||||
|
||||
class LaunderettePlaceViewSet(RightModelViewSet):
|
||||
"""
|
||||
@ -67,6 +78,7 @@ class LaunderettePlaceViewSet(RightModelViewSet):
|
||||
serializer_class = LaunderettePlaceSerializer
|
||||
queryset = Launderette.objects.all()
|
||||
|
||||
|
||||
class LaunderetteMachineViewSet(RightModelViewSet):
|
||||
"""
|
||||
Manage Washing Machines (api/v1/launderette/machine/)
|
||||
@ -89,7 +101,7 @@ class LaunderetteTokenViewSet(RightModelViewSet):
|
||||
"""
|
||||
Return all washing tokens (api/v1/launderette/token/washing)
|
||||
"""
|
||||
self.queryset = self.queryset.filter(type='WASHING')
|
||||
self.queryset = self.queryset.filter(type="WASHING")
|
||||
serializer = self.get_serializer(self.queryset, many=True)
|
||||
return Response(serializer.data)
|
||||
|
||||
@ -98,7 +110,7 @@ class LaunderetteTokenViewSet(RightModelViewSet):
|
||||
"""
|
||||
Return all drying tokens (api/v1/launderette/token/drying)
|
||||
"""
|
||||
self.queryset = self.queryset.filter(type='DRYING')
|
||||
self.queryset = self.queryset.filter(type="DRYING")
|
||||
serializer = self.get_serializer(self.queryset, many=True)
|
||||
return Response(serializer.data)
|
||||
|
||||
@ -107,7 +119,9 @@ class LaunderetteTokenViewSet(RightModelViewSet):
|
||||
"""
|
||||
Return all avaliable tokens (api/v1/launderette/token/avaliable)
|
||||
"""
|
||||
self.queryset = self.queryset.filter(borrow_date__isnull=True, user__isnull=True)
|
||||
self.queryset = self.queryset.filter(
|
||||
borrow_date__isnull=True, user__isnull=True
|
||||
)
|
||||
serializer = self.get_serializer(self.queryset, many=True)
|
||||
return Response(serializer.data)
|
||||
|
||||
@ -116,6 +130,8 @@ class LaunderetteTokenViewSet(RightModelViewSet):
|
||||
"""
|
||||
Return all unavaliable tokens (api/v1/launderette/token/unavaliable)
|
||||
"""
|
||||
self.queryset = self.queryset.filter(borrow_date__isnull=False, user__isnull=False)
|
||||
self.queryset = self.queryset.filter(
|
||||
borrow_date__isnull=False, user__isnull=False
|
||||
)
|
||||
serializer = self.get_serializer(self.queryset, many=True)
|
||||
return Response(serializer.data)
|
||||
|
@ -34,11 +34,18 @@ from api.views import RightModelViewSet
|
||||
|
||||
|
||||
class UserSerializer(serializers.ModelSerializer):
|
||||
|
||||
class Meta:
|
||||
model = User
|
||||
fields = ('id', 'first_name', 'last_name', 'email',
|
||||
'date_of_birth', 'nick_name', 'is_active', 'date_joined')
|
||||
fields = (
|
||||
"id",
|
||||
"first_name",
|
||||
"last_name",
|
||||
"email",
|
||||
"date_of_birth",
|
||||
"nick_name",
|
||||
"is_active",
|
||||
"date_joined",
|
||||
)
|
||||
|
||||
|
||||
class UserViewSet(RightModelViewSet):
|
||||
|
Reference in New Issue
Block a user