Merge branch 'main' of https://github.com/Central-University-IT-prod/PROD-Animulichki-SkillHub
This commit is contained in:
@@ -54,3 +54,6 @@ class Event(BaseModel):
|
|||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.title
|
return self.title
|
||||||
|
|
||||||
|
def run_algorythm(self):
|
||||||
|
pass
|
||||||
|
|||||||
@@ -11,4 +11,9 @@ router.register("", EventViewSet)
|
|||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("", include(router.urls)),
|
path("", include(router.urls)),
|
||||||
path("<event_id>/users/", views.EventUsersApiView.as_view(), name="users"),
|
path("<event_id>/users/", views.EventUsersApiView.as_view(), name="users"),
|
||||||
|
path(
|
||||||
|
"<event_id>/run_algorythm/",
|
||||||
|
views.RunAlgorythmView.as_view(),
|
||||||
|
name="run_algotythm",
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -27,3 +27,18 @@ class EventUsersApiView(APIView):
|
|||||||
serializer = UserSerializer(users, many=True)
|
serializer = UserSerializer(users, many=True)
|
||||||
|
|
||||||
return Response(serializer.data)
|
return Response(serializer.data)
|
||||||
|
|
||||||
|
|
||||||
|
class RunAlgorythmView(APIView):
|
||||||
|
def post(self, request, event_id): # noqa: ARG002
|
||||||
|
try:
|
||||||
|
event = Event.objects.get(pk=event_id)
|
||||||
|
except Event.DoesNotExist:
|
||||||
|
return Response(
|
||||||
|
{"error": "Event does not exist"},
|
||||||
|
status=status.HTTP_404_NOT_FOUND,
|
||||||
|
)
|
||||||
|
|
||||||
|
event.run_algorythm()
|
||||||
|
|
||||||
|
return Response("ok")
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ from api.users.views import (
|
|||||||
DownloadUsersFromExcelView,
|
DownloadUsersFromExcelView,
|
||||||
RegisterUsersFromExcelView,
|
RegisterUsersFromExcelView,
|
||||||
UserViewSet,
|
UserViewSet,
|
||||||
UsersByEvent,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
app_name = "users"
|
app_name = "users"
|
||||||
@@ -16,11 +15,6 @@ router.register("", UserViewSet)
|
|||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("", include(router.urls)),
|
path("", include(router.urls)),
|
||||||
path(
|
|
||||||
"by-event/<event_id>/",
|
|
||||||
UsersByEvent.as_view(),
|
|
||||||
name="users-by-event",
|
|
||||||
),
|
|
||||||
path(
|
path(
|
||||||
"upload/excel/<event_id>/",
|
"upload/excel/<event_id>/",
|
||||||
RegisterUsersFromExcelView.as_view(),
|
RegisterUsersFromExcelView.as_view(),
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
import io
|
import io
|
||||||
|
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
@@ -18,22 +17,6 @@ class UserViewSet(ModelViewSet):
|
|||||||
serializer_class = UserSerializer
|
serializer_class = UserSerializer
|
||||||
|
|
||||||
|
|
||||||
class UsersByEvent(APIView):
|
|
||||||
def get(self, _, event_id):
|
|
||||||
try:
|
|
||||||
event = Event.objects.get(pk=event_id)
|
|
||||||
except Event.DoesNotExist:
|
|
||||||
return Response(
|
|
||||||
{"error": "Event does not exist"},
|
|
||||||
status=status.HTTP_404_NOT_FOUND,
|
|
||||||
)
|
|
||||||
|
|
||||||
users = event.users.all()
|
|
||||||
serializer = UserSerializer(users, many=True)
|
|
||||||
|
|
||||||
return Response(serializer.data)
|
|
||||||
|
|
||||||
|
|
||||||
class RegisterUsersFromExcelView(APIView):
|
class RegisterUsersFromExcelView(APIView):
|
||||||
def post(self, request, event_id):
|
def post(self, request, event_id):
|
||||||
try:
|
try:
|
||||||
|
|||||||
Generated
+1
-2
@@ -26,7 +26,6 @@
|
|||||||
"@radix-ui/react-tabs": "^1.0.4",
|
"@radix-ui/react-tabs": "^1.0.4",
|
||||||
"@radix-ui/react-toast": "^1.1.5",
|
"@radix-ui/react-toast": "^1.1.5",
|
||||||
"@vitejs/plugin-react-swc": "^3.5.0",
|
"@vitejs/plugin-react-swc": "^3.5.0",
|
||||||
"autoprefixer": "^10.4.19",
|
|
||||||
"class-variance-authority": "^0.7.0",
|
"class-variance-authority": "^0.7.0",
|
||||||
"clsx": "^2.1.0",
|
"clsx": "^2.1.0",
|
||||||
"cmdk": "^1.0.0",
|
"cmdk": "^1.0.0",
|
||||||
@@ -60,7 +59,7 @@
|
|||||||
"@typescript-eslint/eslint-plugin": "^7.2.0",
|
"@typescript-eslint/eslint-plugin": "^7.2.0",
|
||||||
"@typescript-eslint/parser": "^7.2.0",
|
"@typescript-eslint/parser": "^7.2.0",
|
||||||
"@vitejs/plugin-react": "^4.2.0",
|
"@vitejs/plugin-react": "^4.2.0",
|
||||||
"autoprefixer": "^10.4.16",
|
"autoprefixer": "^10.4.19",
|
||||||
"eslint": "^8.57.0",
|
"eslint": "^8.57.0",
|
||||||
"eslint-config-prettier": "^9.1.0",
|
"eslint-config-prettier": "^9.1.0",
|
||||||
"eslint-config-standard-with-typescript": "19.0.1",
|
"eslint-config-standard-with-typescript": "19.0.1",
|
||||||
|
|||||||
@@ -28,7 +28,6 @@
|
|||||||
"@radix-ui/react-tabs": "^1.0.4",
|
"@radix-ui/react-tabs": "^1.0.4",
|
||||||
"@radix-ui/react-toast": "^1.1.5",
|
"@radix-ui/react-toast": "^1.1.5",
|
||||||
"@vitejs/plugin-react-swc": "^3.5.0",
|
"@vitejs/plugin-react-swc": "^3.5.0",
|
||||||
"autoprefixer": "^10.4.19",
|
|
||||||
"class-variance-authority": "^0.7.0",
|
"class-variance-authority": "^0.7.0",
|
||||||
"clsx": "^2.1.0",
|
"clsx": "^2.1.0",
|
||||||
"cmdk": "^1.0.0",
|
"cmdk": "^1.0.0",
|
||||||
@@ -62,7 +61,7 @@
|
|||||||
"@typescript-eslint/eslint-plugin": "^7.2.0",
|
"@typescript-eslint/eslint-plugin": "^7.2.0",
|
||||||
"@typescript-eslint/parser": "^7.2.0",
|
"@typescript-eslint/parser": "^7.2.0",
|
||||||
"@vitejs/plugin-react": "^4.2.0",
|
"@vitejs/plugin-react": "^4.2.0",
|
||||||
"autoprefixer": "^10.4.16",
|
"autoprefixer": "^10.4.19",
|
||||||
"eslint": "^8.57.0",
|
"eslint": "^8.57.0",
|
||||||
"eslint-config-prettier": "^9.1.0",
|
"eslint-config-prettier": "^9.1.0",
|
||||||
"eslint-config-standard-with-typescript": "19.0.1",
|
"eslint-config-standard-with-typescript": "19.0.1",
|
||||||
|
|||||||
Reference in New Issue
Block a user