add trigger on alt names and improve layout with alt names

Resources/config/doctrine/Person.orm.yml

@@ -52,8 +52,8 @@ Chill\PersonBundle\Entity\Person:
             nullable: true
             length: 40
         fullnameCanonical:
-            type: string
-            length: 255
+            type: text
+            nullable: true
     manyToOne:
         countryOfBirth:
             targetEntity: Chill\MainBundle\Entity\Country

Resources/migrations/Version20200130213446.php

@@ -0,0 +1,154 @@
+<?php declare(strict_types=1);
+
+namespace Application\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Add triggers for canicalizing alt names
+ */
+final class Version20200130213446 extends AbstractMigration
+{
+    const CANONICALIZE_FULLNAME_ON_UPDATE = <<<'SQL'
+CREATE OR REPLACE FUNCTION public.canonicalize_fullname_on_update()
+    RETURNS trigger
+    LANGUAGE 'plpgsql'
+    COST 100
+    VOLATILE NOT LEAKPROOF
+AS $BODY$
+DECLARE
+    cur_alt_names CURSOR(pid INTEGER) FOR SELECT label FROM chill_person_alt_name WHERE person_id = pid;
+    alt_name RECORD;
+    fullname_canonicalized TEXT;
+BEGIN
+    fullname_canonicalized := LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)));
+    OPEN cur_alt_names(pid:=NEW.id);
+    LOOP
+        FETCH cur_alt_names INTO alt_name;
+
+        EXIT WHEN NOT FOUND;
+
+        fullname_canonicalized := CONCAT(fullname_canonicalized, ' ',
+            LOWER(UNACCENT(alt_name.label)));
+    END LOOP;
+    CLOSE cur_alt_names;
+
+    IF fullname_canonicalized <> OLD.fullnameCanonical
+    THEN
+       UPDATE chill_person_person
+       SET fullnameCanonical=fullname_canonicalized
+       WHERE id=NEW.id;
+    END IF;
+    RETURN NEW;
+END;
+$BODY$;
+SQL;
+    
+    const CANONICALIZE_FULLNAME_ON_ALT_NAME_ALTER = <<<'SQL'
+CREATE OR REPLACE FUNCTION public.canonicalize_fullname_on_alt_name_alter()
+    RETURNS trigger
+    LANGUAGE 'plpgsql'
+    COST 100
+    VOLATILE NOT LEAKPROOF
+AS $BODY$
+DECLARE
+    target_person_id INTEGER;
+    cur_person CURSOR(pid INTEGER) FOR SELECT firstname, lastname FROM chill_person_person WHERE id = pid;
+    person RECORD;
+    cur_alt_names CURSOR(pid INTEGER) FOR SELECT label FROM chill_person_alt_name WHERE person_id = pid;
+    alt_name RECORD;
+    fullname_canonicalized TEXT;
+BEGIN
+    IF TG_OP = 'INSERT' OR TG_OP = 'UPDATE'
+        THEN target_person_id := NEW.person_id;
+    ELSE target_person_id := OLD.person_id;
+    END IF;
+
+    OPEN cur_person(pid:=target_person_id);
+    FETCH cur_person INTO person;
+    fullname_canonicalized := LOWER(UNACCENT(CONCAT(person.firstname, ' ', person.lastname)));
+    -- loop over alt names
+    OPEN cur_alt_names(pid:=target_person_id);
+    LOOP
+        FETCH cur_alt_names INTO alt_name;
+
+        EXIT WHEN NOT FOUND;
+
+        fullname_canonicalized := CONCAT(fullname_canonicalized, ' ',
+            LOWER(UNACCENT(alt_name.label)));
+    END LOOP;
+    CLOSE cur_alt_names;
+    CLOSE cur_person;
+
+    UPDATE chill_person_person
+    SET fullnameCanonical=fullname_canonicalized
+    WHERE id=target_person_id;
+
+    RETURN NEW;
+END;
+$BODY$;
+SQL;
+    
+    const CANONICALIZE_FULLNAME_ON_ALT_NAME_INSERT = <<<SQL
+CREATE TRIGGER canonicalize_fullname_on_alt_name_insert
+    AFTER INSERT
+    ON chill_person_alt_name
+    FOR EACH ROW
+    EXECUTE PROCEDURE canonicalize_fullname_on_alt_name_alter();
+SQL;
+    
+    const CANONICALIZE_FULLNAME_ON_ALT_NAME_DELETE = <<<SQL
+CREATE TRIGGER canonicalize_fullname_on_alt_name_delete
+    AFTER DELETE
+    ON chill_person_alt_name
+    FOR EACH ROW
+    EXECUTE PROCEDURE canonicalize_fullname_on_alt_name_alter();
+SQL;
+
+    const CANONICALIZE_FULLNAME_ON_ALT_NAME_UPDATE = <<<SQL
+CREATE TRIGGER canonicalize_fullname_on_alt_name_update
+    AFTER UPDATE
+    ON chill_person_alt_name
+    FOR EACH ROW
+    EXECUTE PROCEDURE canonicalize_fullname_on_alt_name_alter();
+SQL;
+    
+    public function up(Schema $schema) : void
+    {
+        // update fullname
+        $this->addSql("ALTER TABLE chill_person_person ALTER fullnamecanonical TYPE TEXT;");
+        $this->addSql("ALTER TABLE chill_person_person ALTER fullnamecanonical DROP DEFAULT;");
+        // insert function and triggers
+        $this->addSql(self::CANONICALIZE_FULLNAME_ON_UPDATE);
+        $this->addSql(self::CANONICALIZE_FULLNAME_ON_ALT_NAME_ALTER);
+        $this->addSql(self::CANONICALIZE_FULLNAME_ON_ALT_NAME_INSERT);
+        $this->addSql(self::CANONICALIZE_FULLNAME_ON_ALT_NAME_DELETE);
+        $this->addSql(self::CANONICALIZE_FULLNAME_ON_ALT_NAME_UPDATE);
+        
+    }
+
+    public function down(Schema $schema) : void
+    {
+        $this->addSql("DROP TRIGGER canonicalize_fullname_on_alt_name_update ON chill_person_alt_name;");
+        $this->addSql("DROP TRIGGER canonicalize_fullname_on_alt_name_insert ON chill_person_alt_name;");
+        $this->addSql("DROP TRIGGER canonicalize_fullname_on_alt_name_delete ON chill_person_alt_name;");
+        $this->addSql("DROP FUNCTION canonicalize_fullname_on_alt_name_alter();");
+        $this->addSql(<<<'SQL'
+            CREATE OR REPLACE FUNCTION canonicalize_fullname_on_update() RETURNS TRIGGER AS
+            $BODY$
+            BEGIN
+                IF NEW.firstname <> OLD.firstname OR NEW.lastname <> OLD.lastname
+                THEN
+                   UPDATE chill_person_person
+                   SET fullnameCanonical=LOWER(UNACCENT(CONCAT(NEW.firstname, ' ', NEW.lastname)))
+                   WHERE id=NEW.id;
+                END IF;
+                RETURN NEW;
+            END;
+            $BODY$ LANGUAGE PLPGSQL;
+SQL
+        );
+    }
+            
+}

Resources/views/layout.html.twig

@@ -29,10 +29,7 @@
     <div class="grid-12 parent" id="header-person-name" >
         <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
             <div class="grid-3">
-                <span class="open_sansbold">{{ 'Last name'|trans|upper  }}&nbsp;:</span> {{ person.lastName|upper }}
-            </div>
-            <div class="grid-3">
-                <span class="open_sansbold">{{ 'First name'|trans|upper}}&nbsp;:</span> {{  person.firstName|upper }}
+                <span class="open_sansbold">{{ 'Name'|trans|upper  }}&nbsp;:</span> {{ person|chill_entity_render_string }}
             </div>
             <div class="grid-3">
                 <span class="open_sansbold">{{ 'File number'|trans|upper}}&nbsp;:</span> {{  person.id|upper }}
@@ -47,6 +44,12 @@
                     {% endif %}
                 {% endspaceless %}"></i>
             </div> 
+            <div class="grid-3">
+                <span class="open_sansbold">{{ 'Phonenumber'|trans|upper  }}&nbsp;:</span> 
+                {% set phone = person.mobilenumber|default(person.phonenumber) %}
+                {% if phone is not empty %}{{ phone|chill_format_phonenumber }}{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}
+            </div>
+                
         </div>
     </div>
 

Templating/Entity/PersonRender.php

@@ -96,9 +96,10 @@ class PersonRender extends AbstractChillEntityRender
                         $str .= "</span>";
                     }
                 }
-                if (!$isFirst) {
-                    $str .= ")";
-                }
+            }
+            
+            if (!$isFirst) {
+                $str .= ")";
             }
         }