database.files_db:FilesDB.log_paths - join access and statutory files

aarhusstadsarkiv · Dec 18, 2024 · bd7021c · bd7021c
1 parent 33f4b5c
commit bd7021c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/acacore/database/files_db.py b/acacore/database/files_db.py
@@ -156,9 +156,11 @@ def __init__(
             EventPath,
             "log_paths",
             f"""
-            select coalesce(fo.relative_path, fm.relative_path) as file_relative_path, l.* from {self.log.name} l
+            select coalesce(fo.relative_path, fm.relative_path, fa.relative_path, fs.relative_path) as file_relative_path, l.* from {self.log.name} l
                 left join {self.original_files.name} fo on l.file_type = 'original' and fo.uuid = l.file_uuid
                 left join {self.master_files.name} fm on l.file_type = 'master' and fm.uuid = l.file_uuid
+                left join {self.access_files.name} fa on l.file_type = 'access' and fa.uuid = l.file_uuid
+                left join {self.statutory_files.name} fs on l.file_type = 'statutory' and fs.uuid = l.file_uuid
             """,
         )
 

diff --git a/acacore/database/upgrade.py b/acacore/database/upgrade.py
@@ -115,10 +115,12 @@ def upgrade_4to4_1(con: Connection) -> Version:
     """)
     con.execute("""
     create view log_paths as
-    select coalesce(fo.relative_path, fm.relative_path) as file_relative_path, l.*
+    select coalesce(fo.relative_path, fm.relative_path, fa.relative_path, fs.relative_path) as file_relative_path, l.*
     from log l
-             left join files_original fo on l.file_type = 'original' and fo.uuid = l.file_uuid
-             left join files_master fm on l.file_type = 'master' and fm.uuid = l.file_uuid
+        left join files_original  fo on l.file_type = 'original'  and fo.uuid = l.file_uuid
+        left join files_master    fm on l.file_type = 'master'    and fm.uuid = l.file_uuid
+        left join files_access    fa on l.file_type = 'access'    and fa.uuid = l.file_uuid
+        left join files_statutory fs on l.file_type = 'statutory' and fs.uuid = l.file_uuid
     """)
     con.commit()