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
8c0b7da0
Commit
8c0b7da0
authored
Jan 01, 2016
by
Rafal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Api and UserApi serializers,models
parent
48f6b81b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
8 deletions
+13
-8
models.py
JoinTheCityREST/app/API/models.py
+7
-1
serializers.py
JoinTheCityREST/app/API/serializers.py
+1
-1
models.py
JoinTheCityREST/app/User/models.py
+1
-4
serializers.py
JoinTheCityREST/app/User/serializers.py
+1
-1
views.py
JoinTheCityREST/app/User/views.py
+3
-1
No files found.
JoinTheCityREST/app/API/models.py
View file @
8c0b7da0
...
@@ -2,6 +2,12 @@ from django.db import models
...
@@ -2,6 +2,12 @@ from django.db import models
# Create your models here.
# Create your models here.
from
app.Tag.models
import
Tag
class
API
(
models
.
Model
):
class
API
(
models
.
Model
):
pass
name
=
models
.
CharField
(
max_length
=
100
)
tag
=
models
.
ManyToManyField
(
Tag
,
related_name
=
'API_tags'
,
blank
=
False
,
null
=
False
,
default
=
None
)
def
__str__
(
self
):
return
self
.
name
\ No newline at end of file
JoinTheCityREST/app/API/serializers.py
View file @
8c0b7da0
...
@@ -6,4 +6,4 @@ class APISerializer(serializers.HyperlinkedModelSerializer):
...
@@ -6,4 +6,4 @@ class APISerializer(serializers.HyperlinkedModelSerializer):
class
Meta
:
class
Meta
:
model
=
API
model
=
API
fields
=
()
fields
=
(
'url'
,
'name'
,
'tag'
)
\ No newline at end of file
\ No newline at end of file
JoinTheCityREST/app/User/models.py
View file @
8c0b7da0
...
@@ -12,21 +12,18 @@ class UserFriendship(models.Model):
...
@@ -12,21 +12,18 @@ class UserFriendship(models.Model):
friend
=
models
.
ForeignKey
(
User
,
related_name
=
'user_friend'
,
friend
=
models
.
ForeignKey
(
User
,
related_name
=
'user_friend'
,
blank
=
False
,
null
=
False
,
default
=
None
)
blank
=
False
,
null
=
False
,
default
=
None
)
class
UserAPI
(
models
.
Model
):
class
UserAPI
(
models
.
Model
):
user
=
models
.
ForeignKey
(
User
,
related_name
=
'api_participant'
,
user
=
models
.
ForeignKey
(
User
,
related_name
=
'api_participant'
,
blank
=
False
,
null
=
False
,
default
=
None
)
blank
=
False
,
null
=
False
,
default
=
None
)
api
=
models
.
ForeignKey
(
API
,
related_name
=
'api_choosen_by_user'
,
api
=
models
.
ForeignKey
(
API
,
related_name
=
'api_choosen_by_user'
,
blank
=
False
,
null
=
False
,
default
=
None
)
blank
=
False
,
null
=
False
,
default
=
None
)
class
UserEvent
(
models
.
Model
):
class
UserEvent
(
models
.
Model
):
user
=
models
.
ForeignKey
(
User
,
related_name
=
'event_participant'
,
user
=
models
.
ForeignKey
(
User
,
related_name
=
'event_participant'
,
blank
=
False
,
null
=
False
,
default
=
None
)
blank
=
False
,
null
=
False
,
default
=
None
)
event
=
models
.
ForeignKey
(
Event
,
related_name
=
'event_choosen_by_user'
,
event
=
models
.
ForeignKey
(
Event
,
related_name
=
'event_choosen_by_user'
,
blank
=
False
,
null
=
False
,
default
=
None
)
blank
=
False
,
null
=
False
,
default
=
None
)
class
UserEventRequest
(
models
.
Model
):
class
UserEventRequest
(
models
.
Model
):
user
=
models
.
ForeignKey
(
User
,
related_name
=
'user_event_request_recived'
,
user
=
models
.
ForeignKey
(
User
,
related_name
=
'user_event_request_recived'
,
blank
=
False
,
null
=
False
,
default
=
None
)
blank
=
False
,
null
=
False
,
default
=
None
)
...
@@ -38,4 +35,4 @@ class UserEventRequest(models.Model):
...
@@ -38,4 +35,4 @@ class UserEventRequest(models.Model):
def
accept
(
self
):
def
accept
(
self
):
user_event
=
UserEvent
(
user
=
self
.
user
,
event
=
self
.
event
)
user_event
=
UserEvent
(
user
=
self
.
user
,
event
=
self
.
event
)
user_event
.
save
()
user_event
.
save
()
self
.
delete
()
self
.
delete
()
\ No newline at end of file
JoinTheCityREST/app/User/serializers.py
View file @
8c0b7da0
...
@@ -22,7 +22,7 @@ class UserEventRequestSerializer(serializers.HyperlinkedModelSerializer):
...
@@ -22,7 +22,7 @@ class UserEventRequestSerializer(serializers.HyperlinkedModelSerializer):
class
UserAPISerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
UserAPISerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
Meta
:
class
Meta
:
model
=
UserAPI
model
=
UserAPI
fields
=
()
fields
=
(
'url'
,
'api'
)
class
UserEventSerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
UserEventSerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
Meta
:
class
Meta
:
...
...
JoinTheCityREST/app/User/views.py
View file @
8c0b7da0
...
@@ -60,7 +60,6 @@ class UserEventRequestViewSet(viewsets.ModelViewSet):
...
@@ -60,7 +60,6 @@ class UserEventRequestViewSet(viewsets.ModelViewSet):
serializer
=
UserEventRequestSerializer
(
page
,
many
=
True
,
context
=
{
'request'
:
request
})
serializer
=
UserEventRequestSerializer
(
page
,
many
=
True
,
context
=
{
'request'
:
request
})
return
self
.
get_paginated_response
(
serializer
.
data
)
return
self
.
get_paginated_response
(
serializer
.
data
)
@
detail_route
()
@
detail_route
()
def
accept
(
self
,
request
,
pk
=
None
):
def
accept
(
self
,
request
,
pk
=
None
):
event_request
=
get_object_or_404
(
self
.
queryset
,
pk
=
pk
)
event_request
=
get_object_or_404
(
self
.
queryset
,
pk
=
pk
)
...
@@ -82,6 +81,9 @@ class UserAPIViewSet(viewsets.ModelViewSet):
...
@@ -82,6 +81,9 @@ class UserAPIViewSet(viewsets.ModelViewSet):
serializer_class
=
UserAPISerializer
serializer_class
=
UserAPISerializer
permission_classes
=
(
permissions
.
IsAuthenticatedOrReadOnly
,)
permission_classes
=
(
permissions
.
IsAuthenticatedOrReadOnly
,)
def
perform_create
(
self
,
serializer
):
serializer
.
save
(
user
=
self
.
request
.
user
)
def
list
(
self
,
request
):
def
list
(
self
,
request
):
user
=
request
.
user
user
=
request
.
user
queryset
=
UserAPI
.
objects
.
filter
(
user
=
user
)
.
all
()
queryset
=
UserAPI
.
objects
.
filter
(
user
=
user
)
.
all
()
...
...
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