Development changes

.github/workflows/songbook.yml

@@ -1,4 +1,4 @@
-name: Song Book
+name: Acceptance
 
 on:
   pull_request:
@@ -10,27 +10,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v3
+      - name: Install poetry
+        run: pip install poetry
+      - name: Setup Python
+        id: setup-python
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
-      - name: Week number
-        id: weeknum
-        run: |
-          echo "::set-output name=weeknum::$(/bin/date -u "+%g.%V")"
-        shell: bash
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.local/share/virtualenvs
-            Pipfile.lock
-          key: ${{ runner.os }}-w${{ steps.weeknum.outputs.weeknum }}-python-${{ steps.setup-python.outputs.python-version }}-pipenv-${{ hashFiles('Pipfile') }}
+          python-version: '3.11'
+          cache: "poetry"
+          cache-dependency-path: "pyproject.toml"
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install pipenv # Install all dependencies.
-          pipenv update --dev
-      - name: Lint with Pylint
+          poetry install
+      - name: Acceptance check
         run: |
-          ./pylint-check.sh
+          make commit-acceptance

Makefile

@@ -0,0 +1,33 @@
+.PHONY: commit-acceptance pylint black reformat pre-commit locale migrations deploy
+
+commit-acceptance: black pylint
+pre-commit: locale migrations
+
+pylint:
+	poetry run pylint backend/ chords/ pdf/ frontend/ category/ analytics/ --django-settings-module=chords.settings.development
+
+black:
+	poetry run black --check . --diff
+
+reformat:
+	poetry run black .
+
+locale:
+	poetry run python manage.py makemessages -l cs
+
+migrations:
+	poetry run python manage.py makemigrations
+
+deploy:
+	poetry run python manage.py migrate
+	poetry run python manage.py compilescss
+	poetry run python manage.py prerender
+	poetry run python manage.py compilemessages
+	poetry run python manage.py collectstatic --noinput
+
+# Check http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
+help: ## Print this help
+	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+
+# this ensures dependent target is run everytime
+FORCE:

analytics/apps.py

@@ -4,5 +4,6 @@
 
 class AnalyticsConfig(AppConfig):
     """Analytics app"""
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'analytics'
+
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "analytics"

analytics/locale/cs/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-12 07:19+0000\n"
+"POT-Creation-Date: 2023-09-09 19:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n "
 "<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: analytics/models.py:8
+#: analytics/models.py:9
 msgid "Key"
 msgstr "Klíč"
 
-#: analytics/models.py:9
+#: analytics/models.py:10
 msgid "Hits"
 msgstr "Kliknutí"
 
@@ -59,6 +59,6 @@ msgstr "Měsíc"
 msgid "Year"
 msgstr "Rok"
 
-#: analytics/views.py:31
+#: analytics/views.py:30
 msgid "General"
 msgstr "Obecné"

analytics/migrations/0001_initial.py

@@ -4,20 +4,26 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='DayStatistic',
+            name="DayStatistic",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('key', models.CharField(max_length=25, verbose_name='Key')),
-                ('amount', models.IntegerField(default=0, verbose_name='Amount')),
-                ('date', models.DateField(auto_now_add=True)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("key", models.CharField(max_length=25, verbose_name="Key")),
+                ("amount", models.IntegerField(default=0, verbose_name="Amount")),
+                ("date", models.DateField(auto_now_add=True)),
             ],
         ),
     ]

analytics/migrations/0002_auto_20211212_0917.py

@@ -4,19 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('analytics', '0001_initial'),
+        ("analytics", "0001_initial"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='daystatistic',
-            name='amount',
+            model_name="daystatistic",
+            name="amount",
         ),
         migrations.AddField(
-            model_name='daystatistic',
-            name='hits',
-            field=models.IntegerField(default=0, verbose_name='Hits'),
+            model_name="daystatistic",
+            name="hits",
+            field=models.IntegerField(default=0, verbose_name="Hits"),
         ),
     ]

analytics/models.py

@@ -5,6 +5,7 @@
 
 class DayStatistic(Model):
     """Statistic data for given day/key combination"""
+
     key = CharField(verbose_name=_("Key"), max_length=25)
     hits = IntegerField(verbose_name=_("Hits"), default=0)
     date = DateField(auto_now_add=True, editable=False)

analytics/urls.py

@@ -4,6 +4,6 @@
 from analytics.views import AnalyticsShowView, AnalyticsRestView
 
 urlpatterns = [
-    path('', AnalyticsShowView.as_view(), name="index"),
-    path('data', AnalyticsRestView.as_view(), name="data"),
+    path("", AnalyticsShowView.as_view(), name="index"),
+    path("data", AnalyticsRestView.as_view(), name="data"),
 ]

analytics/views.py

@@ -5,6 +5,7 @@
 from django.db import transaction
 from django.db.models import Sum
 from django.http import HttpResponseBadRequest, HttpRequest, JsonResponse
+
 # Create your views here.
 from django.utils.decorators import method_decorator
 from django.utils.timezone import now
@@ -18,16 +19,14 @@
 def analytics(key):
     """Adds hit"""
     with transaction.atomic():
-        statistic, _ = DayStatistic.objects.get_or_create(
-            key=key,
-            date=now()
-        )
+        statistic, _ = DayStatistic.objects.get_or_create(key=key, date=now())
         statistic.hits += 1
         statistic.save()
 
 
 class AnalyticsMixin(View):
     """Mixin for gathering number of hits per day analytics"""
+
     KEY = gettext_noop("General")
 
     def get_key(self):
@@ -40,14 +39,15 @@ def dispatch(self, request, *args, **kwargs):
         return result
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class AnalyticsShowView(TemplateView):
     """Shows analytics graphs"""
+
     template_name = "analytics/show.html"
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
-        ctx["keys"] = DayStatistic.objects.order_by('key').values_list('key', flat=True).distinct()
+        ctx["keys"] = DayStatistic.objects.order_by("key").values_list("key", flat=True).distinct()
         ctx["now"] = datetime.now().date()
         ctx["week"] = (datetime.now() - timedelta(days=6)).date()
         # ctx["day"] = (datetime.now() - timedelta(days=1)).date()
@@ -56,7 +56,7 @@ def get_context_data(self, **kwargs):
         return ctx
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class AnalyticsRestView(View):
     """Returns analytics data for given dates and key"""
 
@@ -74,5 +74,5 @@ def get(self, request: HttpRequest, *args, **kwargs):
             days = DayStatistic.objects.filter(date__gte=start_date, date__lte=end_date, key=key)
         else:
             days = DayStatistic.objects.filter(date__gte=start_date, date__lte=end_date)
-        days = days.values("date").annotate(total=Sum('hits')).values("date", "total").order_by("date")
+        days = days.values("date").annotate(total=Sum("hits")).values("date", "total").order_by("date")
         return JsonResponse({entry["date"].isoformat(): entry["total"] for entry in days})

backend/apps.py

@@ -4,4 +4,5 @@
 
 class BackendConfig(AppConfig):
     """Backend AppConfig"""
-    name = 'backend'
+
+    name = "backend"

backend/forms.py

@@ -7,6 +7,7 @@
 
 class SongForm(ModelForm):
     """Song form"""
+
     categories = ModelMultipleChoiceField(widget=CheckboxSelectMultiple, queryset=Category.objects.all())
 
     class Meta: