Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
JoinTheCity
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rafal
JoinTheCity
Commits
1ecf4da7
Commit
1ecf4da7
authored
Jan 01, 2016
by
Rafal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
now u can accept or decline event request
parent
f644a7b7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
8 deletions
+37
-8
models.py
JoinTheCityREST/app/User/models.py
+14
-8
views.py
JoinTheCityREST/app/User/views.py
+23
-0
No files found.
JoinTheCityREST/app/User/models.py
View file @
1ecf4da7
...
...
@@ -12,13 +12,6 @@ class UserFriendship(models.Model):
friend
=
models
.
ForeignKey
(
User
,
related_name
=
'user_friend'
,
blank
=
False
,
null
=
False
,
default
=
None
)
class
UserEventRequest
(
models
.
Model
):
user
=
models
.
ForeignKey
(
User
,
related_name
=
'user_event_request_recived'
,
blank
=
False
,
null
=
False
,
default
=
None
)
created_by
=
models
.
ForeignKey
(
User
,
related_name
=
'user_event_requeset_creator'
,
blank
=
False
,
null
=
False
,
default
=
None
)
event
=
models
.
ForeignKey
(
Event
,
related_name
=
'event'
,
blank
=
False
,
null
=
False
,
default
=
None
)
class
UserAPI
(
models
.
Model
):
user
=
models
.
ForeignKey
(
User
,
related_name
=
'api_participant'
,
...
...
@@ -31,3 +24,16 @@ class UserEvent(models.Model):
blank
=
False
,
null
=
False
,
default
=
None
)
event
=
models
.
ForeignKey
(
Event
,
related_name
=
'event_choosen_by_user'
,
blank
=
False
,
null
=
False
,
default
=
None
)
class
UserEventRequest
(
models
.
Model
):
user
=
models
.
ForeignKey
(
User
,
related_name
=
'user_event_request_recived'
,
blank
=
False
,
null
=
False
,
default
=
None
)
created_by
=
models
.
ForeignKey
(
User
,
related_name
=
'user_event_requeset_creator'
,
blank
=
False
,
null
=
False
,
default
=
None
)
event
=
models
.
ForeignKey
(
Event
,
related_name
=
'event'
,
blank
=
False
,
null
=
False
,
default
=
None
)
def
accept
(
self
):
user_event
=
UserEvent
(
user
=
self
.
user
,
event
=
self
.
event
)
user_event
.
save
()
self
.
delete
()
\ No newline at end of file
JoinTheCityREST/app/User/views.py
View file @
1ecf4da7
from
django.contrib.auth.models
import
User
from
django.shortcuts
import
get_object_or_404
from
rest_framework
import
viewsets
,
permissions
import
rest_framework
from
rest_framework.decorators
import
list_route
,
detail_route
from
rest_framework.response
import
Response
from
app.User.models
import
UserFriendship
,
UserAPI
,
UserEvent
,
UserEventRequest
from
app.User.serializers
import
UserFriendshipSerializer
,
UserAPISerializer
,
\
UserEventSerializer
,
UserEventRequestSerializer
,
UserSerializer
...
...
@@ -13,6 +17,12 @@ class UserViewSet(viewsets.ModelViewSet):
serializer_class
=
UserSerializer
permission_classes
=
(
permissions
.
IsAuthenticatedOrReadOnly
,)
@
list_route
(
methods
=
[
'get'
])
def
me
(
self
,
request
,
pk
=
None
):
user
=
User
.
objects
.
filter
(
pk
=
request
.
user
.
id
)[
0
]
user_data
=
UserSerializer
(
user
,
context
=
{
'request'
:
request
})
.
data
return
Response
(
status
=
rest_framework
.
status
.
HTTP_200_OK
,
data
=
user_data
)
class
UserFriendshipViewSet
(
viewsets
.
ModelViewSet
):
"""
API for articles
...
...
@@ -51,6 +61,19 @@ class UserEventRequestViewSet(viewsets.ModelViewSet):
return
self
.
get_paginated_response
(
serializer
.
data
)
@
detail_route
()
def
accept
(
self
,
request
,
pk
=
None
):
event_request
=
get_object_or_404
(
self
.
queryset
,
pk
=
pk
)
event_request
.
accept
()
return
Response
(
status
=
rest_framework
.
status
.
HTTP_200_OK
)
@
detail_route
()
def
decline
(
self
,
request
,
pk
=
None
):
event_request
=
get_object_or_404
(
self
.
queryset
,
pk
=
pk
)
event_request
.
delete
()
return
Response
(
status
=
rest_framework
.
status
.
HTTP_200_OK
)
class
UserAPIViewSet
(
viewsets
.
ModelViewSet
):
"""
User favorite api
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment