novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Blacked the code

Browse source
This commit is contained in:
Eliot Berriot 2018-06-09 15:36:16 +02:00
commit 62ca3bd736
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
279 changed files with 8890 additions and 9556 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/funkwhale_api/requests/admin.py
View file

@ -5,11 +5,7 @@ from . import models
@admin.register(models.ImportRequest)
class ImportRequestAdmin(admin.ModelAdmin):
list_display = ['artist_name', 'user', 'status', 'creation_date']
list_select_related = [
'user'
]
list_filter = [
'status',
]
search_fields = ['artist_name', 'comment', 'albums']
list_display = ["artist_name", "user", "status", "creation_date"]
list_select_related = ["user"]
list_filter = ["status"]
search_fields = ["artist_name", "comment", "albums"]

6
api/funkwhale_api/requests/api_urls.py
View file

@ -2,10 +2,8 @@ from django.conf.urls import include, url
from . import views
from rest_framework import routers
router = routers.SimpleRouter()
router.register(
r'import-requests',
views.ImportRequestViewSet,
'import-requests')
router.register(r"import-requests", views.ImportRequestViewSet, "import-requests")
urlpatterns = router.urls

8
api/funkwhale_api/requests/factories.py
View file

@ -6,10 +6,10 @@ from funkwhale_api.users.factories import UserFactory
@registry.register
class ImportRequestFactory(factory.django.DjangoModelFactory):
artist_name = factory.Faker('name')
albums = factory.Faker('sentence')
artist_name = factory.Faker("name")
albums = factory.Faker("sentence")
user = factory.SubFactory(UserFactory)
comment = factory.Faker('paragraph')
comment = factory.Faker("paragraph")
class Meta:
model = 'requests.ImportRequest'
model = "requests.ImportRequest"

15
api/funkwhale_api/requests/filters.py
View file

@ -6,17 +6,14 @@ from . import models
class ImportRequestFilter(django_filters.FilterSet):
q = fields.SearchFilter(search_fields=[
'artist_name',
'user__username',
'albums',
'comment',
])
q = fields.SearchFilter(
search_fields=["artist_name", "user__username", "albums", "comment"]
)
class Meta:
model = models.ImportRequest
fields = {
'artist_name': ['exact', 'iexact', 'startswith', 'icontains'],
'status': ['exact'],
'user__username': ['exact'],
"artist_name": ["exact", "iexact", "startswith", "icontains"],
"status": ["exact"],
"user__username": ["exact"],
}

54
api/funkwhale_api/requests/migrations/0001_initial.py
View file

@ -10,22 +10,50 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
operations = [
migrations.CreateModel(
name='ImportRequest',
name="ImportRequest",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('creation_date', models.DateTimeField(default=django.utils.timezone.now)),
('imported_date', models.DateTimeField(blank=True, null=True)),
('artist_name', models.CharField(max_length=250)),
('albums', models.CharField(blank=True, max_length=3000, null=True)),
('status', models.CharField(choices=[('pending', 'pending'), ('accepted', 'accepted'), ('imported', 'imported'), ('closed', 'closed')], default='pending', max_length=50)),
('comment', models.TextField(blank=True, max_length=3000, null=True)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='import_requests', to=settings.AUTH_USER_MODEL)),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"creation_date",
models.DateTimeField(default=django.utils.timezone.now),
),
("imported_date", models.DateTimeField(blank=True, null=True)),
("artist_name", models.CharField(max_length=250)),
("albums", models.CharField(blank=True, max_length=3000, null=True)),
(
"status",
models.CharField(
choices=[
("pending", "pending"),
("accepted", "accepted"),
("imported", "imported"),
("closed", "closed"),
],
default="pending",
max_length=50,
),
),
("comment", models.TextField(blank=True, max_length=3000, null=True)),
(
"user",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="import_requests",
to=settings.AUTH_USER_MODEL,
),
),
],
),
)
]

22
api/funkwhale_api/requests/models.py
View file

@ -2,17 +2,13 @@ from django.db import models
from django.utils import timezone
NATURE_CHOICES = [
('artist', 'artist'),
('album', 'album'),
('track', 'track'),
]
NATURE_CHOICES = [("artist", "artist"), ("album", "album"), ("track", "track")]
STATUS_CHOICES = [
('pending', 'pending'),
('accepted', 'accepted'),
('imported', 'imported'),
('closed', 'closed'),
("pending", "pending"),
("accepted", "accepted"),
("imported", "imported"),
("closed", "closed"),
]
@ -20,11 +16,9 @@ class ImportRequest(models.Model):
creation_date = models.DateTimeField(default=timezone.now)
imported_date = models.DateTimeField(null=True, blank=True)
user = models.ForeignKey(
'users.User',
related_name='import_requests',
on_delete=models.CASCADE)
"users.User", related_name="import_requests", on_delete=models.CASCADE
)
artist_name = models.CharField(max_length=250)
albums = models.CharField(max_length=3000, null=True, blank=True)
status = models.CharField(
choices=STATUS_CHOICES, max_length=50, default='pending')
status = models.CharField(choices=STATUS_CHOICES, max_length=50, default="pending")
comment = models.TextField(null=True, blank=True, max_length=3000)

25
api/funkwhale_api/requests/serializers.py
View file

@ -11,20 +11,17 @@ class ImportRequestSerializer(serializers.ModelSerializer):
class Meta:
model = models.ImportRequest
fields = (
'id',
'status',
'albums',
'artist_name',
'user',
'creation_date',
'imported_date',
'comment')
read_only_fields = (
'creation_date',
'imported_date',
'user',
'status')
"id",
"status",
"albums",
"artist_name",
"user",
"creation_date",
"imported_date",
"comment",
)
read_only_fields = ("creation_date", "imported_date", "user", "status")
def create(self, validated_data):
validated_data['user'] = self.context['user']
validated_data["user"] = self.context["user"]
return super().create(validated_data)

18
api/funkwhale_api/requests/views.py
View file

@ -9,18 +9,18 @@ from . import serializers
class ImportRequestViewSet(
mixins.CreateModelMixin,
mixins.RetrieveModelMixin,
mixins.ListModelMixin,
viewsets.GenericViewSet):
mixins.CreateModelMixin,
mixins.RetrieveModelMixin,
mixins.ListModelMixin,
viewsets.GenericViewSet,
):
serializer_class = serializers.ImportRequestSerializer
queryset = (
models.ImportRequest.objects.all()
.select_related()
.order_by('-creation_date'))
models.ImportRequest.objects.all().select_related().order_by("-creation_date")
)
filter_class = filters.ImportRequestFilter
ordering_fields = ('id', 'artist_name', 'creation_date', 'status')
ordering_fields = ("id", "artist_name", "creation_date", "status")
def perform_create(self, serializer):
return serializer.save(user=self.request.user)
@ -28,5 +28,5 @@ class ImportRequestViewSet(
def get_serializer_context(self):
context = super().get_serializer_context()
if self.request.user.is_authenticated:
context['user'] = self.request.user
context["user"] = self.request.user
return context