Testing branch

.gitignore

@@ -1,6 +1,145 @@
+app/media/
 *.pyc
 __pycache
 .DS_Store
 .env.dev
 .env.prod
 .env.prod.db
+# Django #
+*.log
+*.pot
+*.pyc
+__pycache__
+db.sqlite3
+media
+
+# Backup files # 
+*.bak 
+
+# If you are using PyCharm # 
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Python # 
+*.py[cod] 
+*$py.class 
+
+# Distribution / packaging 
+.Python build/ 
+develop-eggs/ 
+dist/ 
+downloads/ 
+eggs/ 
+.eggs/ 
+lib/ 
+lib64/ 
+parts/ 
+sdist/ 
+var/ 
+wheels/ 
+*.whl
+*.egg-info/ 
+.installed.cfg 
+*.egg 
+*.manifest 
+*.spec 
+
+# Installer logs 
+pip-log.txt 
+pip-delete-this-directory.txt 
+
+# Unit test / coverage reports 
+htmlcov/ 
+.tox/ 
+.coverage 
+.coverage.* 
+.cache 
+.pytest_cache/ 
+nosetests.xml 
+coverage.xml 
+*.cover 
+.hypothesis/ 
+
+# Jupyter Notebook 
+.ipynb_checkpoints 
+
+# pyenv 
+.python-version 
+
+# celery 
+celerybeat-schedule.* 
+
+# SageMath parsed files 
+*.sage.py 
+
+# Environments 
+.env 
+.venv 
+env/ 
+venv/ 
+ENV/ 
+env.bak/ 
+venv.bak/ 
+
+# mkdocs documentation 
+/site 
+
+# mypy 
+.mypy_cache/ 
+
+# Sublime Text # 
+*.tmlanguage.cache 
+*.tmPreferences.cache 
+*.stTheme.cache 
+*.sublime-workspace 
+*.sublime-project 
+
+# sftp configuration file 
+sftp-config.json 
+
+# Package control specific files Package 
+Control.last-run 
+Control.ca-list 
+Control.ca-bundle 
+Control.system-ca-bundle 
+GitHub.sublime-settings 
+
+# Visual Studio Code # 
+.vscode/* 
+!.vscode/settings.json 
+!.vscode/tasks.json 
+!.vscode/launch.json 
+!.vscode/extensions.json 
+.history

app/Dockerfile

@@ -11,6 +11,8 @@ ENV PYTHONUNBUFFERED 1
 # install system dependencies
 RUN apt-get update && apt-get install -y netcat
 
+RUN apt-get install -qq tesseract-ocr libtesseract-dev libleptonica-dev python3-distutils poppler-utils
+
 # install dependencies
 RUN pip install --upgrade pip
 COPY ./requirements.txt .

app/catalog/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

app/catalog/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class CatalogConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'catalog'

app/catalog/models.py

@@ -0,0 +1,57 @@
+import os
+
+from django.core.files.storage import FileSystemStorage
+from django.db import models
+from django.contrib.postgres.fields import ArrayField
+from django.conf import settings
+
+#COVERS_STORAGE = FileSystemStorage(location="/media/covers")
+COVERS_STORAGE = FileSystemStorage(location=settings.MEDIA_ROOT)
+
+class MagazineIssue(models.Model):
+    publication_date = models.DateField()
+    issue_number = ArrayField(models.IntegerField(), blank=True, default=list)
+    front_cover = models.ImageField(storage=COVERS_STORAGE)
+
+    class Meta:
+        ordering = ['issue_number']
+
+    def get_publication_date(self):
+        return self.publication_date.strftime("%B/%Y")
+
+    def __str__(self):
+        issues = list(map(lambda x: str(x), self.issue_number))
+        return f"Issue: {','.join(issues)} - Publication_Date: {self.get_publication_date()}"
+
+
+class MagazineArticle(models.Model):
+    issue = models.ForeignKey('MagazineIssue', on_delete=models.CASCADE)
+    publication_year = models.DateField()
+    articles = models.ManyToManyField('Author', through='AuthorArticle')
+    tags = models.ManyToManyField('Tag', through='ArticleTag')
+
+
+class Author(models.Model):
+    name = models.CharField(max_length=50)
+    articles = models.ManyToManyField('MagazineArticle', through='AuthorArticle')
+
+class AuthorArticle(models.Model):
+    author = models.ForeignKey('Author', on_delete=models.CASCADE)
+    article = models.ForeignKey('MagazineArticle', on_delete=models.CASCADE)
+
+    def __str__(self):
+        return f"{self.author.__str__()} - {self.article.__str__()}"
+
+
+class ArticleTag(models.Model):
+    tag = models.ForeignKey('Tag', on_delete=models.CASCADE)
+    article = models.ForeignKey('MagazineArticle', on_delete=models.CASCADE)
+
+    def __str__(self):
+        return f"{self.tag.__str__()} - {self.article.__str__()}"
+
+
+class Tag(models.Model):
+    name = models.CharField(max_length=30)
+
+

app/catalog/serializers.py

@@ -0,0 +1,11 @@
+from catalog.models import MagazineIssue
+from rest_framework import serializers
+
+class MagazineIssueSerializer(serializers.HyperlinkedModelSerializer):
+    class Meta:
+        model = MagazineIssue
+        fields = '__all__'
+    def to_representation(self, instance):
+        representation = super(MagazineIssueSerializer, self).to_representation(instance)
+        representation["publication_date"] = instance.get_publication_date()
+        return representation

app/catalog/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

app/catalog/views.py

@@ -0,0 +1,97 @@
+from catalog.models import MagazineIssue
+from rest_framework.viewsets import ModelViewSet
+from rest_framework.response import Response
+from rest_framework.decorators import action
+from collections import defaultdict
+from django.db.models import Q
+
+from catalog.serializers import MagazineIssueSerializer
+
+def format_into_datetime(datetime_str):
+    from datetime import datetime
+    return datetime.strptime(datetime_str, '%B-%Y')
+
+def parse_issue_id(issue_id_str):
+    return {
+        "issue_number": int(issue_id_str.split("-")[0]),
+        "issue_year": int(issue_id_str.split("-")[1]),
+    }
+
+def get_q_object_for_issue_range(issue_range, parsed_issue_param):
+    return Q(issue_number__contained_by=issue_range,
+                           publication_date__year=parsed_issue_param["issue_year"])
+
+
+class MagazineIssueViewSet(ModelViewSet):
+    queryset = MagazineIssue.objects.all()
+    serializer_class = MagazineIssueSerializer
+
+    def list(self, request):
+        queryset = self.filter_queryset(self.get_queryset())
+        serializer_output = self.serializer_class(queryset, many=True, context={'request': request}).data
+
+        d=defaultdict(list)
+        for instance in serializer_output:
+            pub_year = instance['publication_date'].split('/')[1]
+            d[pub_year].append(instance)
+
+        return Response(d)
+
+    @action(detail=False, methods=['get'])
+    def decades(self, request):
+        data = self.list(request).data
+
+        d=defaultdict(list)
+        years = data.keys()
+        for year in years:
+            year=int(year)
+            d[int(year - (year%10))].append(year)
+
+        return Response(d)
+
+    @action(detail=False, methods=['get'])
+    def search(self, request):
+        date_begin = request.query_params.get('date_begin', None)
+        date_end = request.query_params.get('date_end', None)
+
+        issue_begin = request.query_params.get('issue_begin', None)
+        issue_end = request.query_params.get('issue_end', None)
+
+        if date_begin:
+            date_begin = format_into_datetime(date_begin)
+
+            if date_end:
+                date_end = format_into_datetime(date_end)
+                filter_query = Q(publication_date__range=(date_begin, date_end))
+            else:
+                filter_query=Q(publication_date=date_begin)
+
+            queryset = self.get_queryset().filter(filter_query)
+
+        if issue_begin:
+            parsed_issue_param = parse_issue_id(issue_begin)
+
+            if issue_end:
+                issue_begin_range = list(range(parsed_issue_param["issue_number"], 5))
+                filter_query_begin = get_q_object_for_issue_range(issue_begin_range,
+                                                                  parsed_issue_param)
+
+                parsed_issue_param_end = parse_issue_id(issue_end)
+                issue_end_range = list(range(1, parsed_issue_param_end["issue_number"]+1))
+                filter_query_end = get_q_object_for_issue_range(issue_end_range,
+                                                                parsed_issue_param_end)
+
+                queryset_begin = self.get_queryset().filter(filter_query_begin)
+                queryset_end = self.get_queryset().filter(filter_query_end)
+                queryset = queryset_begin.union(queryset_end)
+
+            else:
+                filter_query=get_q_object_for_issue_range([parsed_issue_param["issue_number"]],
+                                                          parsed_issue_param)
+                queryset = self.get_queryset().filter(filter_query)
+
+        queryset = queryset.order_by('publication_date')
+
+        serializer_output = self.serializer_class(queryset, many=True, context={'request': request}).data
+
+        return Response(serializer_output)

app/entrypoint.sh

@@ -11,7 +11,7 @@ then
     echo "PostgreSQL started"
 fi
 
-python manage.py flush --no-input
+#python manage.py flush --no-input
 python manage.py migrate
 
 exec "$@"

app/hello_django/settings.py

@@ -17,16 +17,16 @@
 BASE_DIR = Path(__file__).resolve().parent.parent
 
 
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
+## Quick-start development settings - unsuitable for production
+## See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
 
 SECRET_KEY = os.environ.get("SECRET_KEY")
 
 DEBUG = bool(os.environ.get("DEBUG", default=0))
 
 # 'DJANGO_ALLOWED_HOSTS' should be a single string of hosts with a space between each.
 # For example: 'DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1]'
-ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS").split(" ")
+ALLOWED_HOSTS = ['localhost'] #os.environ.get("DJANGO_ALLOWED_HOSTS").split(" ")
 
 CSRF_TRUSTED_ORIGINS = ["http://localhost:1337"]
 
@@ -39,8 +39,10 @@
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
+    "catalog.apps.CatalogConfig",
+    "django_extensions",
+    "rest_framework"
 
-    "upload",
 ]
 
 MIDDLEWARE = [
@@ -126,8 +128,11 @@
 STATIC_URL = "/static/"
 STATIC_ROOT = BASE_DIR / "staticfiles"
 
-MEDIA_URL = "/media/"
-MEDIA_ROOT = BASE_DIR / "mediafiles"
+#MEDIA_URL = "/media/"
+#MEDIA_ROOT = BASE_DIR / "mediafiles"
+
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
+MEDIA_URL = 'media/'
 
 
 # Default primary key field type