From bf6bdaac79d84a6734674b308285db78dab749cf Mon Sep 17 00:00:00 2001
From: flifloo <flifloo@gmail.com>
Date: Sat, 7 Nov 2020 14:41:31 +0100
Subject: [PATCH] Update address for PDF creation

---
 callbackQuery/create.py | 16 ++++++++--------
 message/edit.py         |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/callbackQuery/create.py b/callbackQuery/create.py
index cc6b65b..7635fdc 100644
--- a/callbackQuery/create.py
+++ b/callbackQuery/create.py
@@ -1,8 +1,8 @@
 from datetime import datetime
 from io import BytesIO
+from re import compile
 
 from PyPDF2 import PdfFileReader, PdfFileWriter
-from PyPDF2.pdf import PageObject
 from qrcode import make
 from reportlab.lib.pagesizes import letter
 from reportlab.lib.utils import ImageReader
@@ -12,7 +12,6 @@ from telegram.ext import CallbackContext
 
 from main import reasons, database
 
-
 local = {
     "work": "travail",
     "shopping": "achats",
@@ -24,24 +23,25 @@ local = {
     "missions": "missions",
     "children": "enfants"
 }
+address_re = compile(r"^(.*),? ([0-9]{5}) ([a-zA-Z]+(?:[\s-][a-zA-Z]+)*)$")
 
 
 def create(update: Update, context: CallbackContext):
     reason = reasons[update.effective_chat.id][update["_effective_user"]["id"]]
     del reasons[update.effective_chat.id][update["_effective_user"]["id"]]
     date = datetime.now()
-    first_name = database[update['_effective_user']['id']]['last_name']
-    last_name = database[update['_effective_user']['id']]['first_name']
+    first_name = database[update['_effective_user']['id']]['first_name']
+    last_name = database[update['_effective_user']['id']]['last_name']
     birth_date = database[update['_effective_user']['id']]['birth_date']
     birth_city = database[update['_effective_user']['id']]['birth_city']
-    address = database[update['_effective_user']['id']]['address']
+    address = address_re.fullmatch(database[update['_effective_user']['id']]['address']).groups()
 
     img = make(f"Cree le: {date.strftime('%d/%m/%Y a %Hh%M')};\n"
                f"Nom: {first_name};\n"
                f"Prenom: {last_name};\n"
                f"Naissance: {birth_date} a "
                f"{birth_city};\n"
-               f"Adresse: {address};\n"
+               f"Adresse: {address[0]} {address[1]} {address[2]};\n"
                f"Sortie: {date.strftime('%d/%m/%Y a %Hh%M')}\n"
                f"Motifs: {', '.join(map(lambda r: local[r], reason))};")
     photo = BytesIO()
@@ -56,7 +56,7 @@ def create(update: Update, context: CallbackContext):
     can.drawString(119, 696, f"{first_name} {last_name}")
     can.drawString(119, 674, birth_date)
     can.drawString(297, 674, birth_city)
-    can.drawString(133, 652, address)
+    can.drawString(133, 652, f"{address[0]} {address[1]} {address[2]}")
     can.setFontSize(18)
     for r in reason:
         y = 0
@@ -80,7 +80,7 @@ def create(update: Update, context: CallbackContext):
             y = 211
         can.drawString(78, y, "x")
     can.setFontSize(11)
-    can.drawString(105, 177, address)  # ToDo: City only !
+    can.drawString(105, 177, address[2])
     can.drawString(91, 153, date.strftime("%d/%m/%Y"))
     can.drawString(264, 153, date.strftime("%Hh%M"))
     existing_pdf = PdfFileReader(open("certificate.pdf", "rb"))
diff --git a/message/edit.py b/message/edit.py
index 67fdc99..bdf04be 100644
--- a/message/edit.py
+++ b/message/edit.py
@@ -4,15 +4,16 @@ from datetime import datetime
 from telegram import Update, ParseMode
 from telegram.ext import CallbackContext
 
+from callbackQuery.create import address_re
 from callbackQuery.data import data
 from main import local, messages, database
 
 rex = {
     "first_name": re.compile(r"^([a-zA-Z]| )+$"),
     "last_name": re.compile(r"^([a-zA-Z]| )+$"),
-    "birth_date": re.compile(r"[0-9]{1,2}/[0-9]{1,2}/[0-9]{4}"),
+    "birth_date": re.compile(r"^[0-9]{1,2}/[0-9]{1,2}/[0-9]{4}$"),
     "birth_city": re.compile(r"^[a-zA-Z]+(?:[\s-][a-zA-Z]+)*$"),
-    "address": re.compile(r"^.*$")
+    "address": address_re
 }