From d885005f6b4642bde9cf8466eaa4333c2c5ada66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1?= <git@imaniti.org>
Date: Fri, 3 Feb 2023 14:02:20 +0900
Subject: [PATCH] local signer defaults, fix conflicts
---
Makefile | 2 +-
env.example | 10 +++-
registry/settings/base.py | 13 ++--
...contractlocalsigner_department_and_more.py | 59 +++++++++++++++++++
shared/models.py | 29 +++++++++
5 files changed, 107 insertions(+), 6 deletions(-)
create mode 100644 shared/migrations/0002_contractlocalsigner_department_and_more.py
diff --git a/Makefile b/Makefile
index d6613eb..c530d3d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
PYTHON = python
VENV = .venv
-PORT = 8012
+PORT = 8013
SETTINGS = registry.settings.dev
.PHONY: help venv install build run shell migrations migrate
diff --git a/env.example b/env.example
index 9f408e5..c771c2f 100644
--- a/env.example
+++ b/env.example
@@ -1,2 +1,10 @@
+DATABASE_URL="postgresql://contracts:contracts@localhost:5432/contracts"
+
SECRET_KEY=supersecret
-DEFAULT_SIGNING_PARTY_REPRESENTATIVE="Česká pirátská strana\nNa Moráni 360/3\n128 00 Praha 2\nIČ: 71339698\nDIČ: CZ71339698"
+
+DEFAULT_LOCAL_SIGNER_NAME="Česká pirátská strana"
+DEFAULT_LCOAL_SIGNER_STREET="Na Moráni 360/3"
+DEFAULT_LOCAL_SIGNER_ZIP="128 00"
+DEFAULT_LOCAL_SIGNER_DISTRICT="Praha 2"
+DEFAULT_LOCAL_SIGNER_COUNTRY="CZ"
+DEFAULT_LOCAL_SIGNER_ICO_NUMBER="71339698"
diff --git a/registry/settings/base.py b/registry/settings/base.py
index 45262c8..a7b7745 100644
--- a/registry/settings/base.py
+++ b/registry/settings/base.py
@@ -84,10 +84,7 @@ WSGI_APPLICATION = "registry.wsgi.application"
# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
DATABASES = {
- "default": {
- "ENGINE": "django.db.backends.sqlite3",
- "NAME": BASE_DIR / "db.sqlite3",
- }
+ "default": dj_database_url.config(conn_max_age=600)
}
@@ -132,3 +129,11 @@ STATIC_URL = "static/"
# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
+
+DEFAULT_LOCAL_SIGNER_NAME = env.str("DEFAULT_LOCAL_SIGNER_NAME")
+DEFAULT_LCOAL_SIGNER_STREET = env.str("DEFAULT_LCOAL_SIGNER_STREET")
+DEFAULT_LOCAL_SIGNER_ZIP = env.str("DEFAULT_LOCAL_SIGNER_ZIP")
+DEFAULT_LOCAL_SIGNER_DISTRICT = env.str("DEFAULT_LOCAL_SIGNER_DISTRICT")
+DEFAULT_LOCAL_SIGNER_COUNTRY = env.str("DEFAULT_LOCAL_SIGNER_COUNTRY")
+DEFAULT_LOCAL_SIGNER_ICO_NUMBER = env.str("DEFAULT_LOCAL_SIGNER_ICO_NUMBER")
diff --git a/shared/migrations/0002_contractlocalsigner_department_and_more.py b/shared/migrations/0002_contractlocalsigner_department_and_more.py
new file mode 100644
index 0000000..83f3534
--- /dev/null
+++ b/shared/migrations/0002_contractlocalsigner_department_and_more.py
@@ -0,0 +1,59 @@
+# Generated by Django 4.1.4 on 2023-02-03 05:01
+
+from django.db import migrations, models
+import django_countries.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('shared', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='contractlocalsigner',
+ name='department',
+ field=models.CharField(blank=True, max_length=128, null=True, verbose_name='Organizační složka'),
+ ),
+ migrations.AddField(
+ model_name='contractlocalsigner',
+ name='representative_name',
+ field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Zástupce'),
+ ),
+ migrations.AddField(
+ model_name='contractlocalsigner',
+ name='representative_role',
+ field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Funkce zástupce'),
+ ),
+ migrations.AlterField(
+ model_name='contractlocalsigner',
+ name='address_country',
+ field=django_countries.fields.CountryField(default='CZ', max_length=2, verbose_name='Země'),
+ ),
+ migrations.AlterField(
+ model_name='contractlocalsigner',
+ name='address_district',
+ field=models.CharField(default='Praha 2', max_length=256, verbose_name='Obec'),
+ ),
+ migrations.AlterField(
+ model_name='contractlocalsigner',
+ name='address_street_with_number',
+ field=models.CharField(default='Na Moráni 360/3', max_length=256, verbose_name='Ulice, č.p.'),
+ ),
+ migrations.AlterField(
+ model_name='contractlocalsigner',
+ name='address_zip',
+ field=models.CharField(default='128 00', max_length=16, verbose_name='PSČ'),
+ ),
+ migrations.AlterField(
+ model_name='contractlocalsigner',
+ name='ico_number',
+ field=models.CharField(blank=True, default='71339698', max_length=16, null=True, verbose_name='IČO'),
+ ),
+ migrations.AlterField(
+ model_name='contractlocalsigner',
+ name='name',
+ field=models.CharField(default='Česká pirátská strana', max_length=256, verbose_name='Jméno'),
+ ),
+ ]
diff --git a/shared/models.py b/shared/models.py
index 55273bc..c1dd879 100644
--- a/shared/models.py
+++ b/shared/models.py
@@ -87,26 +87,31 @@ class ContractExternalSigner(models.Model):
class ContractLocalSigner(models.Model):
name = models.CharField(
max_length=256,
+ default=settings.DEFAULT_LOCAL_SIGNER_NAME,
verbose_name="Jméno",
)
address_street_with_number = models.CharField(
max_length=256,
+ default=settings.DEFAULT_LCOAL_SIGNER_STREET,
verbose_name="Ulice, č.p.",
)
address_district = models.CharField(
max_length=256,
+ default=settings.DEFAULT_LOCAL_SIGNER_DISTRICT,
verbose_name="Obec",
)
address_zip = models.CharField(
max_length=16,
+ default=settings.DEFAULT_LOCAL_SIGNER_ZIP,
verbose_name="PSČ",
)
address_country = CountryField(
+ default=settings.DEFAULT_LOCAL_SIGNER_COUNTRY,
verbose_name="Země",
)
@@ -115,10 +120,34 @@ class ContractLocalSigner(models.Model):
max_length=16,
blank=True,
null=True,
+ default=settings.DEFAULT_LOCAL_SIGNER_ICO_NUMBER,
verbose_name="IČO",
)
+ representative_name = models.CharField(
+ max_length=256,
+ blank=True,
+ null=True,
+ verbose_name="Zástupce",
+ )
+
+ representative_role = models.CharField(
+ max_length=256,
+ blank=True,
+ null=True,
+ verbose_name="Funkce zástupce",
+ )
+
+
+ department = models.CharField(
+ max_length=128,
+ blank=True,
+ null=True,
+ verbose_name="Organizační složka",
+ )
+
+
# TODO: Input validation
color = models.CharField(
max_length=6, # e.g. "ffffff"
--
GitLab