-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #38 from andela/ft-reports-165305280
#165305280 Users should report articles
- Loading branch information
Showing
23 changed files
with
1,126 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
from django.apps import AppConfig | ||
|
||
|
||
class ReportsConfig(AppConfig): | ||
name = 'reports' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
# Generated by Django 2.2 on 2019-05-13 17:06 | ||
|
||
from django.conf import settings | ||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
initial = True | ||
|
||
dependencies = [ | ||
migrations.swappable_dependency(settings.AUTH_USER_MODEL), | ||
('articles', '0028_merge_20190509_1150'), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name='ReportModel', | ||
fields=[ | ||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('reason', models.TextField(max_length=700)), | ||
('createdAt', models.DateTimeField(auto_now_add=True)), | ||
('updatedAt', models.DateTimeField(auto_now_add=True)), | ||
('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reported', to='articles.ArticleModel')), | ||
('user', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reporter', to=settings.AUTH_USER_MODEL)), | ||
], | ||
options={ | ||
'ordering': ['-createdAt'], | ||
}, | ||
), | ||
] |
18 changes: 18 additions & 0 deletions
18
authors/apps/reports/migrations/0002_auto_20190513_1714.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 2.2 on 2019-05-13 17:14 | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('reports', '0001_initial'), | ||
] | ||
|
||
operations = [ | ||
migrations.RenameField( | ||
model_name='reportmodel', | ||
old_name='user', | ||
new_name='reporter', | ||
), | ||
] |
18 changes: 18 additions & 0 deletions
18
authors/apps/reports/migrations/0003_auto_20190513_1716.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 2.2 on 2019-05-13 17:16 | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('reports', '0002_auto_20190513_1714'), | ||
] | ||
|
||
operations = [ | ||
migrations.RenameField( | ||
model_name='reportmodel', | ||
old_name='reporter', | ||
new_name='user', | ||
), | ||
] |
18 changes: 18 additions & 0 deletions
18
authors/apps/reports/migrations/0004_auto_20190513_1758.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 2.2 on 2019-05-13 17:58 | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('reports', '0003_auto_20190513_1716'), | ||
] | ||
|
||
operations = [ | ||
migrations.RenameField( | ||
model_name='reportmodel', | ||
old_name='user', | ||
new_name='reporter', | ||
), | ||
] |
18 changes: 18 additions & 0 deletions
18
authors/apps/reports/migrations/0005_auto_20190513_1801.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 2.2 on 2019-05-13 18:01 | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('reports', '0004_auto_20190513_1758'), | ||
] | ||
|
||
operations = [ | ||
migrations.RenameField( | ||
model_name='reportmodel', | ||
old_name='reporter', | ||
new_name='user', | ||
), | ||
] |
21 changes: 21 additions & 0 deletions
21
authors/apps/reports/migrations/0006_reportmodel_author.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# Generated by Django 2.2 on 2019-05-14 09:59 | ||
|
||
from django.conf import settings | ||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
migrations.swappable_dependency(settings.AUTH_USER_MODEL), | ||
('reports', '0005_auto_20190513_1801'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name='reportmodel', | ||
name='author', | ||
field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='author', to=settings.AUTH_USER_MODEL), | ||
), | ||
] |
18 changes: 18 additions & 0 deletions
18
authors/apps/reports/migrations/0007_auto_20190514_1106.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 2.2 on 2019-05-14 11:06 | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('reports', '0006_reportmodel_author'), | ||
] | ||
|
||
operations = [ | ||
migrations.RenameField( | ||
model_name='reportmodel', | ||
old_name='author', | ||
new_name='reporter', | ||
), | ||
] |
17 changes: 17 additions & 0 deletions
17
authors/apps/reports/migrations/0008_remove_reportmodel_reporter.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# Generated by Django 2.2 on 2019-05-15 19:53 | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('reports', '0007_auto_20190514_1106'), | ||
] | ||
|
||
operations = [ | ||
migrations.RemoveField( | ||
model_name='reportmodel', | ||
name='reporter', | ||
), | ||
] |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
from django.db import models | ||
|
||
from authors.apps.articles.models import ArticleModel | ||
from django.contrib.auth import get_user_model | ||
|
||
|
||
class ReportModel(models.Model): | ||
""" | ||
The report model | ||
""" | ||
|
||
user = models.ForeignKey( | ||
get_user_model(), | ||
related_name='reporter', | ||
on_delete=models.CASCADE, | ||
null=True, | ||
blank=True, | ||
default=None | ||
) | ||
|
||
article = models.ForeignKey( | ||
ArticleModel, | ||
related_name='reported', | ||
on_delete=models.CASCADE | ||
) | ||
|
||
reason = models.TextField(max_length=700) | ||
createdAt = models.DateTimeField(auto_now_add=True, editable=False) | ||
updatedAt = models.DateTimeField(auto_now_add=True, editable=True) | ||
|
||
def __str__(self): | ||
return "{}".format(self.user.username) # pragma: no cover | ||
|
||
class Meta: | ||
ordering = ["-createdAt"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
from rest_framework import serializers | ||
from .models import ReportModel | ||
from django.apps import apps | ||
|
||
TABLE = apps.get_model('reports', 'ReportModel') | ||
|
||
|
||
class ReportSerializer(serializers.ModelSerializer): | ||
""" | ||
The report serializer. | ||
""" | ||
|
||
reporter = serializers.SerializerMethodField() | ||
reported_article = serializers.SerializerMethodField() | ||
|
||
class Meta: | ||
model = ReportModel | ||
fields = ( | ||
'id', | ||
'user', | ||
'article', | ||
'reporter', | ||
'reported_article', | ||
'reason', | ||
'createdAt', | ||
'updatedAt' | ||
) | ||
|
||
extra_kwargs = { | ||
'reason': {'required': True}, | ||
'user': {'write_only': True}, | ||
'article': {'write_only': True} | ||
} | ||
|
||
def get_reporter(self, obj): | ||
return { | ||
"id": obj.user.id, | ||
"username": obj.user.username, | ||
"email": obj.user.email, | ||
} | ||
|
||
def get_reported_article(self, obj): | ||
return { | ||
"id": obj.article.id, | ||
"slug": obj.article.slug, | ||
"title": obj.article.title, | ||
"description": obj.article.description, | ||
"author": obj.article.author | ||
} |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
from django.urls import path, include | ||
from rest_framework import routers | ||
from .views import ReportView, ReportList, DeleteView, ArticleDeleteView | ||
|
||
|
||
router = routers.DefaultRouter() | ||
router.register('reports', ReportView) | ||
|
||
urlpatterns = [ | ||
path('', include(router.urls)), | ||
path('report/get_all/', ReportList.as_view(), name='get_all'), | ||
path('report/delete/<id>/', DeleteView.as_view(), name='delete'), | ||
path('articles/delete/<slug>/', | ||
ArticleDeleteView.as_view(), name='article_delete'), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
|
||
from authors.apps.authentication.models import User | ||
|
||
|
||
def user_object(uid): | ||
""" | ||
Function for getting user object | ||
""" | ||
instance = User.objects.filter(id=uid)[0] | ||
user = { | ||
'id': instance.id, | ||
'email': instance.email, | ||
'username': instance.username, | ||
} | ||
|
||
try: | ||
user.bio = instance.bio | ||
except: | ||
pass | ||
try: | ||
user.following = instance.following | ||
except: | ||
pass | ||
try: | ||
user.image = instance.image | ||
except: | ||
pass | ||
return user |
Oops, something went wrong.