Merge branch 'main' of https://github.com/pythoncanarias/pycan-web

Author: euribates

.gitignore

@@ -101,4 +101,6 @@ tags
 certificates/media
 .prettierignore
 .parcel-cache/
+fixtures/*
+backup.zip
 exported.zip

apps/about/models.py

@@ -4,6 +4,11 @@
 class Ally(models.Model):
     '''Organizaciones/Asociaciones aliadas'''
 
+    class Meta:
+        ordering = ['name']
+        verbose_name = 'Aliado'
+        verbose_name_plural = 'Aliados'
+
     name = models.CharField('Nombre', max_length=120)
     description = models.CharField('Descripción', max_length=220)
     logo = models.ImageField(upload_to='about/allies/', blank=True)
@@ -14,11 +19,6 @@ class Ally(models.Model):
     def __str__(self):
         return self.name
 
-    class Meta:
-        ordering = ['name']
-        verbose_name = 'Aliado'
-        verbose_name_plural = 'Aliados'
-
 
 class FAQItem(models.Model):
     '''Preguntas frecuentes'''

apps/commons/menu.py

@@ -1,7 +1,6 @@
 import collections
 
 from django.urls import reverse_lazy
-from django.utils.safestring import mark_safe
 
 
 class MenuItem:

apps/events/forms.py

@@ -100,7 +100,7 @@ def clean_uuid(self):
         if len(uuid) < UUID_LAST_DIGITS:
             raise forms.ValidationError(
                 "Necesito los últimos () letras o dígitos "
-                "del código".format(UUID_LAST_DIGITS)
+                "del código"
             )
         uuid = uuid[-UUID_LAST_DIGITS:]
         tickets = list(

apps/events/models.py

@@ -325,7 +325,7 @@ def render_all_badges(self, pdf_only=False, remove_badges=True):
 
 class Badge(models.Model):
     event = models.ForeignKey("events.Event", on_delete=models.CASCADE)
-    base_image = models.ImageField(upload_to=f"events/badges/", blank=False)
+    base_image = models.ImageField(upload_to="events/badges/", blank=False)
     # Coordinates start from the top-left corner
     name_coordinates = models.CharField(
         max_length=255,

apps/invoices/models/__init__.py

@@ -1,3 +1,5 @@
-from .client import Client
-from .concept import Concept
-from .invoice import Invoice
+from .client import Client as Client
+from .concept import Concept as Concept
+from .invoice import Invoice as Invoice
+
+__all__ = [Client, Concept, Invoice]

apps/jobs/models.py

@@ -6,7 +6,6 @@
 from django.urls import reverse
 
 from apps.commons.filters import date_from_now
-from apps.commons.twitter import Twitter
 from apps.organizations.models import Organization
 
 # Create your models here.
@@ -95,12 +94,3 @@ def get_full_url(self):
         path = reverse('jobs:index') + f'#job{self.pk}'
         organization = Organization.load_main_organization()
         return urllib.parse.urljoin(organization.url, path)
-
-    def save(self, *args, **kwargs):
-        already_exists = self.pk is not None
-        super().save(*args, **kwargs)
-        ''' tweepy.error.TweepError: [{'message': 'You currently have access to a subset of Twitter API v2 endpoints and limited v1.1 endpoints (e.g. media post, oauth) only. If you need access to this endpoint, you may need a different access level. You can learn more here: https://developer.twitter.com/en/portal/product', 'code': 453}]
-        if not already_exists and self.approved:
-            t = Twitter()
-            msg = f'💼  Oferta de empleo: {self} {self.get_full_url()}'
-            t.post(msg)'''

apps/learn/tests.py

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

apps/tickets/services/ticket_maker.py

@@ -112,7 +112,7 @@ def draw(self):
         start_x += 5 * mm
         self.canvas.setFont('bold', 10)
         self.canvas.drawString(start_x, start_y,
-                               f'Comparte el evento con:')
+                               'Comparte el evento con:')
         # hashtag
         start_x += 38 * mm
         self.canvas.setFont('fira', 9)

export_database.sh

@@ -1,24 +1,38 @@
-#/bin/bash
+#!/usr/bin/env bash
 
 source ~/.pyenv/versions/pycanweb/bin/activate
 
-# pg_dump --username pythoncanarias_user --dbname pythoncanarias_web --password > pythoncanarias.db
+function dump () {
+    echo -n "Dumping $1";
+    ./manage.py dumpdata --verbosity 1 --indent 4 $1 > ./fixtures/$1.json
+}
 
-./manage.py dumpdata about --indent 4  > exported/about.json
-./manage.py dumpdata certificates --indent 4  > exported/certificates.json
-./manage.py dumpdata certificates --indent 4  > exported/certificates.json
-./manage.py dumpdata events --indent 4  > exported/events.json
-./manage.py dumpdata invoices --indent 4  > exported/invoices.json
-./manage.py dumpdata jobs --indent 4  > exported/jobs.json
-./manage.py dumpdata learn --indent 4  > exported/learn.json
-./manage.py dumpdata locations --indent 4  > exported/locations.json
-./manage.py dumpdata members.member members.membership --indent 4 > exported/members.json
-./manage.py dumpdata notices --indent 4  > exported/notices.json
-./manage.py dumpdata organizations --indent 4  > exported/organizations.json
-./manage.py dumpdata quotes --indent 4  > exported/quotes.json
-./manage.py dumpdata schedule --indent 4  > exported/schedule.json
-./manage.py dumpdata speakers --indent 4  > exported/speakers.json
-./manage.py dumpdata tickets --indent 4  > exported/tickets.json
 
-zip -r exported.zip exported
+dumpdata('auth')
+dumpdata('about')
+dumpdata('api')
+dumpdata('admin')
+dumpdata('certificates')
+dumpdata('contenttypes')
+dumpdata('staticfiles')
+dumpdata('flatpages')
+dumpdata('commons')
+dumpdata('events')
+dumpdata('homepage')
+dumpdata('invoices')
+dumpdata('jobs')
+dumpdata('learn')
+dumpdata('legal')
+dumpdata('locations')
+dumpdata('members')
+dumpdata('messages')
+dumpdata('notices')
+dumpdata('organizations')
+dumpdata('quotes')
+dumpdata('schedule')
+dumpdata('sessions')
+dumpdata('sites')
+dumpdata('speakers')
+dumpdata('tickets')
 
+zip -r backup.zip fixtures/*.json