feat: join v_ahbesser with newly introduced ahb_expressions table (#125)

* expressions WIP

* chore: include AHB PK in materialized AHB view

* wip

* wip

* wip

* wip

* args

* linter pain

* Delete src/fundamend/sqlmodels/create_ahb_expressions_table.sql

* isort

* spell check

* formating linter conflict

* Update src/fundamend/sqlmodels/expression_view.py

* enable type checking again

* use order by in snapshot test for reproducible, stable results

* linters

* wip

* wip

* don't include pruefi, drop empty rows

* arg. this turned out to be more complicated than i thought ;)

* feat: join `v_ahbesser` with newly introduced `ahb_expressions` table

* linter

* ooooooooooooooook

* Update src/fundamend/sqlmodels/create_ahbtabellen_view.sql

---------

Co-authored-by: Konstantin <[email protected]>

Author: hf-kklein

src/fundamend/sqlmodels/ahbtabellen_view.py

@@ -8,7 +8,7 @@
 from pathlib import Path
 from uuid import UUID
 
-from efoli import EdifactFormatVersion
+from efoli import EdifactFormat, EdifactFormatVersion
 from sqlalchemy.sql.functions import func
 from sqlmodel import Field, Session, SQLModel, select
 
@@ -42,6 +42,7 @@ class AhbTabellenLine(SQLModel, table=True):
     __tablename__ = "v_ahbtabellen"
     id: UUID = Field(primary_key=True)
     format_version: EdifactFormatVersion = Field()
+    format: EdifactFormat = Field()
     pruefidentifikator: str = Field()
     path: str = Field()
     id_path: str = Field()
@@ -53,6 +54,8 @@ class AhbTabellenLine(SQLModel, table=True):
     qualifier: str | None = Field()
     line_ahb_status: str | None = Field()
     line_name: str | None = Field()
+    bedingung: str | None = Field()
+    bedingungsfehler: str | None = Field()
     sort_path: str = Field()
 
 

src/fundamend/sqlmodels/create_ahbtabellen_view.sql

@@ -4,27 +4,53 @@
 
 DROP TABLE IF EXISTS v_ahbtabellen; -- this is because sqlmodel tries to create a table first... it doesn't know that this is just a view. bit dirty but ok.
 DROP VIEW IF EXISTS v_ahbtabellen;
-CREATE VIEW v_ahbtabellen as
-SELECT id                                                                                                   as id,
-       edifact_format_version                                                                               as format_version,
-       pruefidentifikator                                                                                   as pruefidentifikator,
-       path,
-       id_path,
-       kommunikation_von                                                                                    as direction,
-       beschreibung                                                                                         as description,
-       'SG' || segmentgroup_id                                                                              as segmentgroup_key, -- eg 'SG6'
-       segment_id                                                                                           as segment_code,     -- e.g 'NAD'
-       dataelement_id                                                                                       as data_element,     -- e.g 'D_3035'
+
+CREATE VIEW v_ahbtabellen AS
+WITH consolidated_ahm AS (SELECT id,
+                                 edifact_format_version,
+                                 format,
+                                 pruefidentifikator,
+                                 path,
+                                 id_path,
+                                 kommunikation_von,
+                                 beschreibung,
+                                 segmentgroup_id,
+                                 segment_id,
+                                 dataelement_id,
+                                 code_value,
+                                 sort_path,
+                                 trim(coalesce(code_ahb_status, coalesce(dataelement_ahb_status,
+                                                                         coalesce(segment_ahb_status, segmentgroup_ahb_status))))     AS line_ahb_status,
+                                 coalesce(code_name, coalesce(dataelement_name, coalesce(dataelementgroup_name,
+                                                                                         coalesce(segment_name, segmentgroup_name)))) AS line_name
+                          FROM ahb_hierarchy_materialized ahm
+                          WHERE ahm.TYPE != 'dataelementgroup'
+                            AND (ahm.TYPE != 'dataelement' OR ahm.dataelement_ahb_status IS NOT NULL))
+
+SELECT c.id                                  as id,
+       c.edifact_format_version              as format_version,
+       c.format                              as format,
+       c.pruefidentifikator                  as pruefidentifikator,
+       c.path,
+       c.id_path,
+       c.kommunikation_von                   as direction,
+       c.beschreibung                        as description,
+       'SG' || c.segmentgroup_id             as segmentgroup_key, -- eg 'SG6'
+       c.segment_id                          as segment_code,     -- e.g 'NAD'
+       c.dataelement_id                      as data_element,     -- e.g 'D_3035'
        --CASE
        --    WHEN dataelement_id IS NOT NULL THEN SUBSTR(dataelement_id, 3)
        --    END                                                                                              AS dataelement_without_leading_d_, -- e.g '3035'
-       code_value                                                                                           as qualifier,
+       c.code_value                          as qualifier,
+       c.line_ahb_status                     as line_ahb_status,  -- e.g. 'Muss [28] ∧ [64]'
+       c.line_name                           as line_name,        -- e.g. 'Datums- oder Uhrzeit- oder Zeitspannen-Format, Code' or 'Produkt-Daten für Lieferant relevant'
+       c.sort_path                           as sort_path,
+       NULLIF(ahe.node_texts, '')            as bedingung,
+       NULLIF(ahe.ahbicht_error_message, '') as bedingungsfehler
+FROM consolidated_ahm as c
+         LEFT JOIN ahb_expressions as ahe -- if this table is missing, call create_and_fill_ahb_expression_table(...) first
+                   ON ahe.edifact_format_version = c.edifact_format_version
+                       AND ahe.format = c.format
+                       AND ahe.expression = c.line_ahb_status;
+
 
-       coalesce(code_ahb_status, coalesce(dataelement_ahb_status,
-                                          coalesce(segment_ahb_status, segmentgroup_ahb_status)))           as line_ahb_status,  -- e.g. 'Muss [28] ∧ [64]'
-       coalesce(code_name, coalesce(dataelement_name, coalesce(dataelementgroup_name,
-                                                               coalesce(segment_name, segmentgroup_name)))) as line_name,        -- e.g. 'Datums- oder Uhrzeit- oder Zeitspannen-Format, Code' or 'Produkt-Daten für Lieferant relevant'
-       sort_path                                                                                            as sort_path
--- the bedingung column is still missing, but we'll solve this one separately
-FROM ahb_hierarchy_materialized
-WHERE TYPE != 'dataelementgroup' AND (TYPE != 'dataelement' OR dataelement_ahb_status IS NOT Null) ;