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
f308f614
Commit
f308f614
authored
Dec 30, 2015
by
Rafal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add user event request model, serializer, view
parent
59f3bfbc
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
3 deletions
+36
-3
urls.py
JoinTheCityREST/JoinTheCityREST/urls.py
+1
-0
models.py
JoinTheCityREST/app/User/models.py
+11
-0
serializers.py
JoinTheCityREST/app/User/serializers.py
+6
-1
views.py
JoinTheCityREST/app/User/views.py
+18
-2
No files found.
JoinTheCityREST/JoinTheCityREST/urls.py
View file @
f308f614
...
...
@@ -23,6 +23,7 @@ router.register(r'localization', localization_views.LocalizationViewSet)
router
.
register
(
r'tag'
,
tag_views
.
TagViewSet
)
router
.
register
(
r'user_friendship'
,
user_views
.
UserFriendshipViewSet
)
router
.
register
(
r'user_friendship_request'
,
user_views
.
UserFriendshipRequestViewSet
)
router
.
register
(
r'user_event_request'
,
user_views
.
UserEventRequestViewSet
)
router
.
register
(
r'user_api'
,
user_views
.
UserAPIViewSet
)
router
.
register
(
r'user_event'
,
user_views
.
UserEventViewSet
)
...
...
JoinTheCityREST/app/User/models.py
View file @
f308f614
...
...
@@ -2,6 +2,9 @@ from django.contrib.auth.models import User
from
django.db
import
models
# Create your models here.
from
app.Event.models
import
Event
class
UserFriendship
(
models
.
Model
):
user
=
models
.
ForeignKey
(
User
,
related_name
=
'user_friendship'
,
blank
=
False
,
null
=
False
,
default
=
None
)
...
...
@@ -14,6 +17,14 @@ class UserFriendshipRequest(models.Model):
creted_by
=
models
.
ForeignKey
(
User
,
related_name
=
'user_friend_requeset_creator'
,
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
)
creted_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
=
'user_api'
,
blank
=
False
,
null
=
False
,
default
=
None
)
...
...
JoinTheCityREST/app/User/serializers.py
View file @
f308f614
from
rest_framework
import
serializers
from
app.Tag.models
import
Tag
from
app.User.models
import
UserFriendship
,
UserFriendshipRequest
,
UserAPI
,
UserEvent
from
app.User.models
import
UserFriendship
,
UserFriendshipRequest
,
UserAPI
,
UserEvent
,
UserEventRequest
class
UserFriendshipSerializer
(
serializers
.
HyperlinkedModelSerializer
):
...
...
@@ -13,6 +13,11 @@ class UserFriendshipRequestSerializer(serializers.HyperlinkedModelSerializer):
model
=
UserFriendshipRequest
fields
=
()
class
UserEventRequestSerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
Meta
:
model
=
UserEventRequest
fields
=
()
class
UserAPISerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
Meta
:
model
=
UserAPI
...
...
JoinTheCityREST/app/User/views.py
View file @
f308f614
from
rest_framework
import
viewsets
,
permissions
from
app.User.models
import
UserFriendship
,
UserFriendshipRequest
,
UserAPI
,
UserEvent
from
app.User.models
import
UserFriendship
,
UserFriendshipRequest
,
UserAPI
,
UserEvent
,
UserEventRequest
from
app.User.serializers
import
UserFriendshipSerializer
,
UserFriendshipRequestSerializer
,
UserAPISerializer
,
\
UserEventSerializer
UserEventSerializer
,
UserEventRequestSerializer
class
UserFriendshipViewSet
(
viewsets
.
ModelViewSet
):
...
...
@@ -34,6 +34,22 @@ class UserFriendshipRequestViewSet(viewsets.ModelViewSet):
serializer
=
UserFriendshipRequestSerializer
(
page
,
many
=
True
,
context
=
{
'request'
:
request
})
return
self
.
get_paginated_response
(
serializer
.
data
)
class
UserEventRequestViewSet
(
viewsets
.
ModelViewSet
):
"""
User Friendships
"""
queryset
=
UserEventRequest
.
objects
.
all
()
serializer_class
=
UserEventRequestSerializer
permission_classes
=
(
permissions
.
IsAuthenticatedOrReadOnly
,)
def
list
(
self
,
request
):
user
=
request
.
user
queryset
=
UserEventRequest
.
objects
.
filter
(
user
=
user
)
.
all
()
page
=
self
.
paginate_queryset
(
queryset
)
serializer
=
UserEventRequestSerializer
(
page
,
many
=
True
,
context
=
{
'request'
:
request
})
return
self
.
get_paginated_response
(
serializer
.
data
)
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