From 630379d6990798014861de6ed9c4acec6418f2bc Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Wed, 4 Feb 2026 06:05:37 -0500 Subject: [PATCH 01/86] Convert database to JSON document storage Replace traditional relational columns with JSON document storage pattern. Each table now stores data as JSON blobs with SQLite handling ID generation. Changes: - Add JsonDocumentRepository base class for JSON serialization - Consolidate 11 migrations into single _0000_InitialCreate with JSON schema - Convert all 9 repositories to use JSON document storage - Add JSON indexes for credential number and assignment lookups - Remove old Aporta.sqlite file from repo - Delete unused BaseRepository.cs All 72 tests pass with the new storage model. Co-Authored-By: Claude Opus 4.5 --- src/Aporta.Core/DataAccess/Aporta.sqlite | Bin 122880 -> 0 bytes .../Migrations/_0000_InitialCreate.cs | 96 ++++++- .../Migrations/_0001_AddExtensionTable.cs | 31 --- .../Migrations/_0002_AddEndpointTable.cs | 34 --- .../Migrations/_0003_AddOutputTable.cs | 33 --- .../Migrations/_0004_AddInputTable.cs | 33 --- .../Migrations/_0005_AddDoorTable.cs | 49 ---- .../Migrations/_0006_AddGlobalSettingTable.cs | 29 --- .../Migrations/_0007_AddCredentialTable.cs | 30 --- .../Migrations/_0008_AddPersonTable.cs | 45 ---- .../Migrations/_0009_AddEventTable.cs | 38 --- .../_0010_AddLastEventToCredentialTable.cs | 43 ---- .../DataAccess/Repositories/BaseRepository.cs | 150 ----------- .../Repositories/CredentialRepository.cs | 236 +++++++++++------- .../DataAccess/Repositories/DoorRepository.cs | 49 +--- .../Repositories/EndpointRepository.cs | 79 +++--- .../Repositories/EventRepository.cs | 43 +--- .../Repositories/ExtensionRepository.cs | 82 +++--- .../Repositories/GlobalSettingRepository.cs | 53 ++-- .../Repositories/InputRepository.cs | 52 ++-- .../Repositories/JsonDocumentRepository.cs | 132 ++++++++++ .../Repositories/OutputRepository.cs | 53 ++-- .../Repositories/PersonRepository.cs | 41 +-- .../DataAccess/SqLiteDataAccess.cs | 14 +- .../DataAccess/MigrationTests.cs | 2 +- 25 files changed, 551 insertions(+), 896 deletions(-) delete mode 100644 src/Aporta.Core/DataAccess/Aporta.sqlite delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0001_AddExtensionTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0002_AddEndpointTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0003_AddOutputTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0004_AddInputTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0005_AddDoorTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0006_AddGlobalSettingTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0007_AddCredentialTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0008_AddPersonTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0009_AddEventTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0010_AddLastEventToCredentialTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Repositories/BaseRepository.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/JsonDocumentRepository.cs diff --git a/src/Aporta.Core/DataAccess/Aporta.sqlite b/src/Aporta.Core/DataAccess/Aporta.sqlite deleted file mode 100644 index f76813d3b431ef5cdfbfc35e9b9231baee7ab2c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122880 zcmeI5O^h2ycE`JipFJZ^%h8T|C-PXW(IFxvTI6sz9LjdEGehbtvNZY_*=w)C^pMR_ zTV#`JHl>k-g?D7jh7ZYJ_7ot89QK^UCifu7A&t`rk9Zi0o+>Cz_|4Hoi=r4p{ z3qMUg9Z}Vd*|?IP6Ym>lUEi&@+g8=6S9|W2ym7s_?mad*O>giAQR6?1X6Mvkswe6-(%hT6vzp|Ta>z6C6bYJ#l|6MZbDyz&eZGA_# zRLN}Hs@ZEcc>$@`HoLZ^kphkxojY!p)Uk|~W<5~v=nqt_XSWTrX6Y^6v`_OghFR5W zHND%d>Snz|3fQE%64%B{`IUr9R2x36mfp}U-6XZDyi&I!hNai3Ya|Y8TDPXvb(MnB zo4S|cTG#H`Bg}Iv^&tqCn2>qQ?L@h))$FnP4HKG>jh245r+4kD-LC4pMyQ!#97l*v z$WX?GM6z*553uCH7-r=VnaNnFlEc(mI_ZzLzH8HN$vdOeH!l75p}2BN5g)PP!Z14| ze%;Z7U8cf@kAZ^y%1F0h8EgP~d}}75D2n)Gh7BMrgPjfqh7gw2mme5Ic%Sx}9fp+E zP<^&Rg!gj)&@q-8pWvi@Hs~_$vG=CqN@iaCka>)Z9s!p**E3;08!YNM&B<}R_5&%Q z%+HHYjxet|InH@H;5R4jYdOxTV)CBr>-inJ&h2gYlL;laAns+D^ZXV$_iLUag*lLC zdL1-1O}lv5LAoL@&iuNWAl>|w_g3w^dm>N^PYpMi^!uw&`ZqXq!yw zpvK{rQUm=HC0@;F2`WW`alZ*vcqQo%V+kdHOx!Cu{e`RadVt%QcxaFLszA6RY9&2r zx8X9Z-+Xi?l2DEv6F+gL!EUDeAsUQxE<9Y#h+wA{kU(HA;f@?$5iLy*f0%RiW5qcY z_Qm>$Af+W)ga=I9M?g2(!odyAy57)wO5(=Dh*(y)fH)3Y?21nam|(z$3{sT>mp z7BT(N%UMZ~)e)Id^5D<8A7gPj&X!kuiK&EAJR$C_Il{HudP}PsW~1!|T-QsCgoT_h z-xC_`MAA5)loNI_F`=9|AwIe04A`DhU&*OJ==m~+tJ^>LD0p%Vjwi#bbjk<9&}Yh| z0+DHbmT0t%7Fkqit&U1pa`eg#!|=9|i1@t}UF6TC{y~ucN&a*B1Gywivp=8xi`mxf z8?%Qy{TDeE|6ji&eZdiI< zHw~?+vX%Byb}669u4b}DHJ3Y^T{*j4cx|;*$}Sg6uSrqi)W%x9&V}jYjqvite43|!v$7~xk7F!5fut+RDolZy^mFe($aD<9u?kXO3pXi+oTmYblWz} zol(jPxs_r*6N?IICRirhx}%CO=a;g%*P^`fY`bMt`Fx?2FPw?+#yd~nM+q#g7IVei zR8+_@d-#LRks`T#zO*Dpg}fuepX!W~$*vZ1g$&uFPj6f_4F;F&Et7`P9*3#9;fG6jGm)WdX7Zsd1@*Wk)%i@nWX#wQ8^>Xe<%N` zTqPfHfB*=900@8p2!H?xfB*=900@A_>y4B2LyCjY7Gy zvYM%6bEVAkYI!BIwq97x6j#nIujdLIRPg5x|Rh|q%LJRO+&gUFUN&I19g|G!-!iPnMu z2!H?xfB*=900@8p2!H?xOn|_1u>NA%dB{x<;V{=aaTo^XHw2!H?xfB*=900@8p2!H?xfB*=*s08T#Ki2;* zs&~;Y5C8!X009sH0T2KI5C8!X009ti2w?vokpKc900JNY0w4eaAOHd&00JNY0xv!R z?Ek;`K1K^c00ck)1V8`;KmY_l00ck)1V8}$|A+w)009sH0T2KI5C8!X009sH0T6ic z31I*K#rH8<2m&Ag0w4eaAOHd&00JNY0w4eabpKzJF9_s+93TJ!AOHd&00JNY0w4ea zAOHd&00R3E*ei(9(&LRA-R6dF*+#>tX|}$pb-VZ5R(+#UzO=fb?HbnQTE@QhN1aPX zuWc`%yVUCLUU=v3^27C|+g5vf=hkN9cCK|vyL7*pdAM?Ex6>#Y=a%0x8xNQ5{JlzL zyJqFDHQv5kc#tdh?yi_u*FI?Nme1W;x_0i~yT$Vt-nGtkK6tQst(Yr4IDh@-h0WWS z3%%Z@?prs@@6@Z;&bO+?TNmDL-7B;z4@>W!Z|q#SL-+qh`Kdtu#{mK$00JNY0w4ea zAOHd&00JNY0wC~Q6PS;br0_=*snk;;CHz{L-A(=1Au;u{nIB0)R z3zGFy;Wqhi*l}YvuB7M0`-WN9ckAu8RW<6>o_i&4T(7L%tf;A{@z1WNMS*2>?=}rv zuWCKJ&919E&Gxp|taf$VHq4!BE_nUYm^!wuT)ehbQ7>L8SKd*Brlh7NdbCZJuAVgN z=}+}kLYbQrf1I(k?WRu4)7Na@;G1jfmn*DvU-o4GT{7w_tIRNMeMh%c$!y!I*=sg= z0jbtDySAl~0*)D-J8qWLv5b~xJy7rH4^#(0&C*-CX`kk046~}$YI?U@)y;Z`5V8qU ziEHDf{7OP4stuo3OK<3wZjxG6Ua4CV!_w>2$pb63rgdvtT~{e6y{UUCu66C6J;FS< zQXhhFi3yp<+)k9+TFoAt-!P#G*=Xr^dwSQd+U=^oYlNB^#&Lw$gbZa|NF*C~^Z-j9 zjA2#|k(rEzDmhH8rIY?>>$^7Xmb^1cedE$^ABrod6!8%oX$-SN;@2Ia*k!8U;{(IT zK*4@xq+75IHh?_7HIq;jMSL>D1`w9PPKN?R2uteA4~!waPy5UcL&|EXKHDI|d%1t; z7)y;$aMC^-bQ$;9d(&|xGcSI~JVr*3fXkfgnJ}LX7WJIwnN9c(J|gf@Y`7d1^4(;)eim%L3PV4RnuCN2kVJ~b%cEVF zUU56g^uWsueyUr>J)O=9S@JUox=pelbaXQAIFToJXB9<dNeyir(k1?`% zOVS10UScYt6i#l(bi;)M9* znloT~miS6e1wzl4F$60oZM4XuLThzYx{{+; zZWs=4TRIj0YqI|TQjq>C`7g;oOTHBQJl2f968U4XCVUzHKlxAO+1Y>VFa5jy_ix~h z1tZb?=*{Ee-fuUfxH6nnAEE?)^#Hc)UlRyxYkN}W)D_+7S6`1FP|kDwVW_h=xzSyFhFBZ8WY zraY4UtDo?CLL%8|5?x#H%wg}ofpo}&3-^ZYdtBkJ$GAiM&ni!b48|9OfJTfBi&1L2J8Kar}s)qLeYxi-p*i@lkWx@J0^YdQ}rU$i$Y(TSMvA6qB68( zXr11IC{#v0=}RV0$R5A-GPzq6#g9uYaDADcMWKoFfxr$e;+R4Ln=+I-y47{2Ydn~} z*#Rpc`Q~L#Vd7Yp9e(YeIJaQ`X@FBr`n@^dy4G!S zf1Go!zZ>S@!J>Vu$ROk7uu*2u_zqjwe&o#KoE+z@1l-}IIdyRUp^ z9(1`gD~_zGg{6)Sa#|8D708|ArNKVsKG^ZR^zs1F#|uXj%9%6bM+Ob*$1=G(e!PFB zdt%hfac$AH!mq=Z6QS_ne29qwl_;3@6Q$JGVC`H@NKK=vg_& zpN)U~?!nuV-iyDKP}b7o-Wdir_#~crvLCR)obL=^X3yY*Mf}2jb<|Q4#=&yrE=|^& z>DLd(mEU^DVDDWyp`_E|<2D<*f(n9HhXei%=Jn0w4yNWh>)^n|%-0xN!spgtZC=lz z#rWa#EcX%3x~DaJ`rw*?jdx4YNKI<*nX4A-_p<_TN~0SD~HHT#zH!7(D8{lfDTYJnE6D=eL(x|*$#QU*uT@0 zRWaG%^={nN`cBnub-t4D>c$Tj5(-_CrUxe$Lzbk2lM8m&^VJ&=<55SwMEZwU%w3k= zeI=pLdCmNw`jC0eT-XiQtJ7OZj8IGF`1t<+H}E(ERe%5pfB*=900@8p2!H?xfB*=9 zz=0qz{QLj-_x}%sgJ1**fB*=900@8p2!H?xfB*=900>N!0M`E##f!>800ck)1V8`; zKmY_l00ck)1VG?G5TJkmPdI!aOo0&~00JNY0w4eaAOHd&00JNY0w4ea6C!~9{|SLb zwIBcjAOHd&00JNY0w4eaAOHd&aDWJ4|Nj6v1Ezog2!H?xfB*=900@8p2!H?xfWU+Z zVE=zYU{NgyfB*=900@8p2!H?xfB*=900 0; - - public string Name => "Initial create"; + + public string Name => "Initial create with JSON document storage"; public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) { await connection.ExecuteAsync( - @"create table schema_info - ( - id integer not null - constraint schema_info_pk - primary key, - name text not null, - timestamp datetime not null - ); - - create unique index schema_info_id_uindex - on schema_info (id);", + @" + -- Schema info table (unchanged) + CREATE TABLE schema_info ( + id INTEGER NOT NULL PRIMARY KEY, + name TEXT NOT NULL, + timestamp DATETIME NOT NULL + ); + CREATE UNIQUE INDEX schema_info_id_uindex ON schema_info (id); + + -- Extension table (GUID primary key) + CREATE TABLE extension ( + id TEXT NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + CREATE UNIQUE INDEX extension_id_uindex ON extension (id); + + -- Endpoint table + CREATE TABLE endpoint ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + data TEXT NOT NULL + ); + CREATE UNIQUE INDEX endpoint_id_uindex ON endpoint (id); + + -- Output table + CREATE TABLE output ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + data TEXT NOT NULL + ); + CREATE UNIQUE INDEX output_id_uindex ON output (id); + + -- Input table + CREATE TABLE input ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + data TEXT NOT NULL + ); + CREATE UNIQUE INDEX input_id_uindex ON input (id); + + -- Door table + CREATE TABLE door ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + data TEXT NOT NULL + ); + CREATE UNIQUE INDEX door_id_uindex ON door (id); + + -- Global setting table (string primary key) + CREATE TABLE global_setting ( + name TEXT NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + CREATE UNIQUE INDEX global_setting_name_uindex ON global_setting (name); + + -- Credential table + CREATE TABLE credential ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + data TEXT NOT NULL + ); + CREATE UNIQUE INDEX credential_id_uindex ON credential (id); + CREATE UNIQUE INDEX credential_number_uindex ON credential (json_extract(data, '$.number')); + + -- Person table + CREATE TABLE person ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + data TEXT NOT NULL + ); + CREATE UNIQUE INDEX person_id_uindex ON person (id); + + -- Credential assignment table (junction table as document) + CREATE TABLE credential_assignment ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + data TEXT NOT NULL + ); + CREATE INDEX idx_ca_credential ON credential_assignment (json_extract(data, '$.credentialId')); + CREATE INDEX idx_ca_person ON credential_assignment (json_extract(data, '$.personId')); + + -- Event table + CREATE TABLE event ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + data TEXT NOT NULL + ); + CREATE UNIQUE INDEX event_id_uindex ON event (id); + ", transaction: transaction); } } diff --git a/src/Aporta.Core/DataAccess/Migrations/_0001_AddExtensionTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0001_AddExtensionTable.cs deleted file mode 100644 index befb4a7..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0001_AddExtensionTable.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations -{ - public class _0001_AddExtensionTable : IMigration - { - public int Version => 1; - - public string Name => "Add extension table"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @"create table extension - ( - id text not null - constraint extension_pk - primary key, - name text not null, - enabled integer default 0 not null, - configuration text not null - ); - - create unique index extension_id_uindex - on extension (id);", - transaction: transaction); - } - } -} \ No newline at end of file diff --git a/src/Aporta.Core/DataAccess/Migrations/_0002_AddEndpointTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0002_AddEndpointTable.cs deleted file mode 100644 index 65ebcde..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0002_AddEndpointTable.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations -{ - public class _0002_AddEndpointTable : IMigration - { - public int Version => 2; - - public string Name => "Add endpoint table"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @"create table endpoint - ( - id integer not null - constraint endpoint_pk - primary key autoincrement, - name text not null, - driver_id text not null, - endpoint_type integer not null, - extension_id text not null - references extension - on update cascade on delete cascade - ); - - create unique index endpoint_id_uindex - on endpoint (id);", - transaction: transaction); - } - } -} \ No newline at end of file diff --git a/src/Aporta.Core/DataAccess/Migrations/_0003_AddOutputTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0003_AddOutputTable.cs deleted file mode 100644 index 3cfc7b9..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0003_AddOutputTable.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations -{ - public class _0003_AddOutputTable : IMigration - { - public int Version => 3; - - public string Name => "Add output table"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @"create table output - ( - id integer not null - constraint output_pk - primary key autoincrement, - endpoint_id integer not null - constraint output_endpoint_id_fk - references endpoint - on update cascade on delete cascade, - name text not null - ); - - create unique index output_id_uindex - on output (id);", - transaction: transaction); - } - } -} \ No newline at end of file diff --git a/src/Aporta.Core/DataAccess/Migrations/_0004_AddInputTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0004_AddInputTable.cs deleted file mode 100644 index bf4b04a..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0004_AddInputTable.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations -{ - public class _0004_AddInputTable : IMigration - { - public int Version => 4; - - public string Name => "Add input table"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @"create table input - ( - id integer not null - constraint input_pk - primary key autoincrement, - endpoint_id integer not null - constraint input_endpoint_id_fk - references endpoint - on update cascade on delete cascade, - name text not null - ); - - create unique index input_id_uindex - on input (id);", - transaction: transaction); - } - } -} \ No newline at end of file diff --git a/src/Aporta.Core/DataAccess/Migrations/_0005_AddDoorTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0005_AddDoorTable.cs deleted file mode 100644 index cc39e6e..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0005_AddDoorTable.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations -{ - public class _0005_AddDoorTable : IMigration - { - public int Version => 5; - - public string Name => "Add Door table"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @"create table door - ( - id integer not null - constraint door_pk - primary key autoincrement, - in_access_endpoint_id integer - constraint in_access_endpoint_id_fk - references endpoint - on update cascade on delete cascade, - out_access_endpoint_id integer - constraint out_access_endpoint_id_fk - references endpoint - on update cascade on delete cascade, - door_contact_endpoint_id integer - constraint door_contact_endpoint_id_fk - references endpoint - on update cascade on delete cascade, - request_to_exit_endpoint_id integer - constraint request_to_exit_endpoint_id_fk - references endpoint - on update cascade on delete cascade, - door_strike_endpoint_id integer - constraint door_strike_endpoint_id_fk - references endpoint - on update cascade on delete cascade, - name text not null - ); - - create unique index door_id_uindex - on door (id);", - transaction: transaction); - } - } -} \ No newline at end of file diff --git a/src/Aporta.Core/DataAccess/Migrations/_0006_AddGlobalSettingTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0006_AddGlobalSettingTable.cs deleted file mode 100644 index e60a112..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0006_AddGlobalSettingTable.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations -{ - public class _0006_AddGlobalSettingTable : IMigration - { - public int Version => 6; - - public string Name => "Add Global Setting table"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @"create table global_setting - ( - name text not null - constraint global_setting_pk - primary key, - value text not null - ); - - create unique index global_setting_name_uindex - on global_setting (name);", - transaction: transaction); - } - } -} \ No newline at end of file diff --git a/src/Aporta.Core/DataAccess/Migrations/_0007_AddCredentialTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0007_AddCredentialTable.cs deleted file mode 100644 index c7f8b19..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0007_AddCredentialTable.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations -{ - public class _0007_AddCredentialTable : IMigration - { - public int Version => 7; - - public string Name => "Add Credential table"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @"create table credential - ( - id integer not null - constraint credential_pk - primary key autoincrement, - number text not null, - enroll_date datetime not null - ); - - create unique index credential_id_uindex - on credential (id);", - transaction: transaction); - } - } -} \ No newline at end of file diff --git a/src/Aporta.Core/DataAccess/Migrations/_0008_AddPersonTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0008_AddPersonTable.cs deleted file mode 100644 index ffd04a9..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0008_AddPersonTable.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations -{ - public class _0008_AddPersonTable : IMigration - { - public int Version => 8; - - public string Name => "Add Person table"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @"create table person - ( - id integer not null - constraint person_pk - primary key autoincrement, - first_name text, - last_name text, - enabled integer default 0 not null - ); - - create unique index person_id_uindex - on person (id); - - create table credential_assignment - ( - person_id integer not null - references person, - credential_id integer not null - constraint credential_assignment_pk - primary key - references credential, - enabled integer default 0 not null - ); - - create unique index credential_assignment_credential_id_uindex - on credential_assignment (credential_id);", - transaction: transaction); - } - } -} \ No newline at end of file diff --git a/src/Aporta.Core/DataAccess/Migrations/_0009_AddEventTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0009_AddEventTable.cs deleted file mode 100644 index d4d4476..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0009_AddEventTable.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations -{ - public class _0009_AddEventTable : IMigration - { - public int Version => 9; - - public string Name => "Add Event table"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @"create table event - ( - id integer not null - constraint event_pk - primary key autoincrement, - endpoint_id integer not null - constraint endpoint_id_fk - references endpoint, - timestamp datetime not null, - event_type integer not null, - data text not null - ); - - create unique index event_id_uindex - on event (id); - - create unique index credential_number_uindex - on credential (number); - ", - transaction: transaction); - } - } -} \ No newline at end of file diff --git a/src/Aporta.Core/DataAccess/Migrations/_0010_AddLastEventToCredentialTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0010_AddLastEventToCredentialTable.cs deleted file mode 100644 index 2f66916..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0010_AddLastEventToCredentialTable.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations -{ - public class _0010_AddLastEventToCredentialTable : IMigration - { - public int Version => 10; - - public string Name => "All Last Event to Credenial table"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @"create table credential_dg_tmp - ( - id integer not null - constraint credential_pk - primary key autoincrement, - number text not null, - last_event integer - ); - - insert into credential_dg_tmp(id, number) - select id, number - from credential; - - drop table credential; - - alter table credential_dg_tmp - rename to credential; - - create unique index credential_id_uindex - on credential (id); - - create unique index credential_number_uindex - on credential (number); - ", - transaction: transaction); - } - } -} \ No newline at end of file diff --git a/src/Aporta.Core/DataAccess/Repositories/BaseRepository.cs b/src/Aporta.Core/DataAccess/Repositories/BaseRepository.cs deleted file mode 100644 index 297609a..0000000 --- a/src/Aporta.Core/DataAccess/Repositories/BaseRepository.cs +++ /dev/null @@ -1,150 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -using Dapper; - -using Aporta.Shared.Models; - -namespace Aporta.Core.DataAccess.Repositories; - -public abstract class BaseRepository -{ - /// - /// Represents a base repository for accessing data from persistent storage. - /// - /// The type of the data entity. - protected abstract IDataAccess DataAccess { get; } - - /// - /// Represents the SQL SELECT query that is used to select data from the persistent storage. - /// - protected abstract string SqlSelect { get; } - - /// - /// Represents the SQL INSERT statement for inserting a record into the database. - /// - protected abstract string SqlInsert { get; } - - /// - /// Represents a SQL UPDATE statement for updating a record in a database table. - /// - protected abstract string SqlUpdate { get; } - - /// - /// Represents the SQL DELETE statement for a specific entity in the database. - /// - protected abstract string SqlDelete { get; } - - /// - /// Represents the SQL query for retrieving the total number of rows in the associated table. - /// - protected abstract string SqlRowCount { get; } - - /// - /// Retrieves an entity by its ID. - /// - /// The ID of the entity to retrieve. - /// The entity with the specified ID. - public async Task Get(int id) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - return await connection.QuerySingleOrDefaultAsync($@"{SqlSelect} where id = @id", new {id}); - } - - /// - /// Retrieves all entities of type T. - /// - /// A task that represents the asynchronous operation. The task result contains an enumerable collection of entities of type T. - public async Task> GetAll() - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - return await connection.QueryAsync(SqlSelect); - } - - public async Task> GetAll(int pageNumber, int pageSize, string orderBy) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - int offset = (pageNumber - 1) * pageSize; - var results = await connection.QueryAsync($@"{SqlSelect} order by {orderBy} desc limit @offset, @pageSize", - new { offset, pageSize }); - - return new PaginatedItemsDto - { - Items = results, - PageNumber = pageNumber, - PageSize = pageSize, - TotalItems = await connection.ExecuteScalarAsync(SqlRowCount) - }; - } - - /// - /// Inserts a record into the database and returns the inserted record's ID. - /// - /// The record to insert. - /// The ID of the inserted record. - public async Task Insert(T record) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - int id = await connection.QueryFirstAsync($"{SqlInsert}; select last_insert_rowid()", - InsertParameters(record)); - - InsertId(record, id); - - return id; - } - - /// - /// Updates an entity in the database. - /// - /// The entity to be updated. - public async Task Update(T record) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - await connection.ExecuteAsync(SqlUpdate, UpdateParameters(record)); - } - - /// - /// Parameters for SQL INSERT command. - /// - /// The record to be inserted. - /// An anonymous type object with properties to be inserted. - protected abstract object InsertParameters(T record); - - /// - /// Parameters for SQL UPDATE command. - /// - /// The record to be updated. - /// An anonymous type object with properties to be updated. - protected abstract object UpdateParameters(T record); - - /// - /// Sets the new created ID value on an exsiting record. - /// - /// The record to insert into the database. - /// The new created ID of the inserted record. - protected abstract void InsertId(T record, int id); - - /// - /// Deletes a record with the specified ID. - /// - /// The ID of the record to delete. - /// A task representing the asynchronous delete operation. - public async Task Delete(int id) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - await connection.ExecuteAsync(SqlDelete, - new {id}); - } -} \ No newline at end of file diff --git a/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs b/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs index beec3c6..c1b5892 100644 --- a/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs @@ -1,69 +1,79 @@ -using System; using System.Collections.Generic; +using System.Linq; +using System.Text.Json; using System.Threading.Tasks; using Aporta.Shared.Models; using Dapper; namespace Aporta.Core.DataAccess.Repositories; -public class CredentialRepository : BaseRepository +public class CredentialRepository : JsonDocumentRepository { public CredentialRepository(IDataAccess dataAccess) { DataAccess = dataAccess; } - + protected override IDataAccess DataAccess { get; } - - protected override string SqlSelect => @"select credential.id, - credential.number, - credential.last_event lastEvent, - credential_assignment.person_id assignedPersonId, - credential_assignment.enabled - from credential - left join credential_assignment on credential.id = credential_assignment.credential_id"; - - protected override string SqlInsert => @"insert into credential - (number, last_event) values - (@number, @lastEvent)"; - - protected override string SqlUpdate => throw new NotImplementedException(); - - private string SqlAssignmentInsert => @"insert into credential_assignment - (person_id, credential_id, enabled) values - (@personId, @credentialId, @enabled)"; - - private string SqlAssignmentDelete => @"delete from credential_assignment - where person_id = @personId and credential_id = @credentialId"; - - private string SqlUpdateLastEvent => @"update credential - set last_event = @lastEventId - where id = @credentialId"; - - private string SqlAssignedCredentials => SqlSelect + @" where credential.id IN (SELECT credential_id FROM credential_assignment)"; - private string SqlUnassignedCredentials => SqlSelect + @" where credential.id NOT IN (SELECT credential_id FROM credential_assignment)"; - - protected override string SqlDelete => @"delete from credential where id = @id"; - - protected override string SqlRowCount => @"select count(*) from credential"; - - protected override object InsertParameters(Credential credential) + + protected override string TableName => "credential"; + + protected override string SqlRowCount => "SELECT COUNT(*) FROM credential"; + + protected override void SetId(Credential entity, int id) { - return new - { - number = credential.Number, - lastEvent = credential.LastEvent - }; + entity.Id = id; } - protected override object UpdateParameters(Credential record) + protected override int GetId(Credential entity) { - throw new NotImplementedException(); + return entity.Id; + } + + public new async Task Get(int id) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var result = await connection.QuerySingleOrDefaultAsync<(int Id, string Data, int? AssignedPersonId, int? Enabled)>( + @"SELECT c.id, c.data, + (SELECT json_extract(ca.data, '$.personId') FROM credential_assignment ca + WHERE json_extract(ca.data, '$.credentialId') = c.id) as AssignedPersonId, + (SELECT json_extract(ca.data, '$.enabled') FROM credential_assignment ca + WHERE json_extract(ca.data, '$.credentialId') = c.id) as Enabled + FROM credential c WHERE c.id = @id", + new { id }); + + if (result.Data == null) return null; + + var credential = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); + credential.Id = result.Id; + credential.AssignedPersonId = result.AssignedPersonId; + credential.Enabled = result.Enabled.HasValue ? result.Enabled > 0 : (bool?)null; + return credential; } - protected override void InsertId(Credential credential, int id) + public new async Task> GetAll() { - credential.Id = id; + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var results = await connection.QueryAsync<(int Id, string Data, int? AssignedPersonId, int? Enabled)>( + @"SELECT c.id, c.data, + (SELECT json_extract(ca.data, '$.personId') FROM credential_assignment ca + WHERE json_extract(ca.data, '$.credentialId') = c.id) as AssignedPersonId, + (SELECT json_extract(ca.data, '$.enabled') FROM credential_assignment ca + WHERE json_extract(ca.data, '$.credentialId') = c.id) as Enabled + FROM credential c"); + + return results.Select(r => + { + var credential = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); + credential.Id = r.Id; + credential.AssignedPersonId = r.AssignedPersonId; + credential.Enabled = r.Enabled.HasValue ? r.Enabled > 0 : (bool?)null; + return credential; + }); } public async Task AssignedCredential(string cardNumber) @@ -71,30 +81,37 @@ public async Task AssignedCredential(string cardNumber) using var connection = DataAccess.CreateDbConnection(); connection.Open(); - var credential = await connection.QuerySingleOrDefaultAsync( - $@"{SqlSelect} where number = @number", - new {number = cardNumber}); + var result = await connection.QuerySingleOrDefaultAsync<(int Id, string Data)>( + @"SELECT id, data FROM credential + WHERE json_extract(data, '$.number') = @number", + new { number = cardNumber }); - if (credential == null) + if (result.Data == null) { return null; } - var personAssignment = await connection.QuerySingleOrDefaultAsync( - "select person_id as personId, enabled from credential_assignment where credential_id = @credentialId", - new {credentialId = credential.Id}); + var credential = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); + credential.Id = result.Id; + + var personAssignment = await connection.QuerySingleOrDefaultAsync<(int PersonId, int Enabled)>( + @"SELECT json_extract(data, '$.personId') as PersonId, + json_extract(data, '$.enabled') as Enabled + FROM credential_assignment + WHERE json_extract(data, '$.credentialId') = @credentialId", + new { credentialId = credential.Id }); - if (personAssignment != null) + if (personAssignment.PersonId > 0) { var personRepository = new PersonRepository(DataAccess); - credential.Person = await personRepository.Get((int)personAssignment.personId); - credential.Enabled = personAssignment.enabled > 0 && credential.Person.Enabled; + credential.Person = await personRepository.Get(personAssignment.PersonId); + credential.Enabled = personAssignment.Enabled > 0 && credential.Person.Enabled; } else { credential.Enabled = false; } - + return credential; } @@ -103,9 +120,21 @@ public async Task> CredentialsAssignedToPerson(int perso using var connection = DataAccess.CreateDbConnection(); connection.Open(); - return await connection.QueryAsync( - $@"{SqlSelect} where credential_assignment.person_id = @personId", + var results = await connection.QueryAsync<(int Id, string Data, int? Enabled)>( + @"SELECT c.id, c.data, json_extract(ca.data, '$.enabled') as Enabled + FROM credential c + INNER JOIN credential_assignment ca ON json_extract(ca.data, '$.credentialId') = c.id + WHERE json_extract(ca.data, '$.personId') = @personId", new { personId }); + + return results.Select(r => + { + var credential = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); + credential.Id = r.Id; + credential.AssignedPersonId = personId; + credential.Enabled = r.Enabled.HasValue ? r.Enabled > 0 : (bool?)null; + return credential; + }); } public async Task> Assigned() @@ -113,42 +142,69 @@ public async Task> Assigned() using var connection = DataAccess.CreateDbConnection(); connection.Open(); - return await connection.QueryAsync(SqlAssignedCredentials); + var results = await connection.QueryAsync<(int Id, string Data, int PersonId, int Enabled)>( + @"SELECT c.id, c.data, + json_extract(ca.data, '$.personId') as PersonId, + json_extract(ca.data, '$.enabled') as Enabled + FROM credential c + INNER JOIN credential_assignment ca ON json_extract(ca.data, '$.credentialId') = c.id"); + + return results.Select(r => + { + var credential = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); + credential.Id = r.Id; + credential.AssignedPersonId = r.PersonId; + credential.Enabled = r.Enabled > 0; + return credential; + }); } - + public async Task> Unassigned() { using var connection = DataAccess.CreateDbConnection(); connection.Open(); - return await connection.QueryAsync(SqlUnassignedCredentials); + var results = await connection.QueryAsync<(int Id, string Data)>( + @"SELECT c.id, c.data FROM credential c + WHERE c.id NOT IN ( + SELECT json_extract(ca.data, '$.credentialId') + FROM credential_assignment ca)"); + + return results.Select(r => + { + var credential = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); + credential.Id = r.Id; + return credential; + }); } - + public async Task AssignPerson(int credentialId, int personId, bool enabled = true) { using var connection = DataAccess.CreateDbConnection(); connection.Open(); - - await connection.ExecuteAsync(SqlAssignmentInsert, - new - { - credentialId, - personId, - enabled - }); + + var json = JsonSerializer.Serialize(new + { + credentialId, + personId, + enabled = enabled ? 1 : 0 + }, GetJsonOptions()); + + await connection.ExecuteAsync( + "INSERT INTO credential_assignment (data) VALUES (@data)", + new { data = json }); } - + public async Task RevokePerson(int credentialId, int personId) { using var connection = DataAccess.CreateDbConnection(); connection.Open(); - - await connection.ExecuteAsync(SqlAssignmentDelete, - new - { - credentialId, - personId, - }); + + await connection.ExecuteAsync( + @"DELETE FROM credential_assignment + WHERE json_extract(data, '$.credentialId') = @credentialId + AND json_extract(data, '$.personId') = @personId", + new { credentialId, personId }); } public async Task UpdateLastEvent(int credentialId, int lastEventId) @@ -156,10 +212,20 @@ public async Task UpdateLastEvent(int credentialId, int lastEventId) using var connection = DataAccess.CreateDbConnection(); connection.Open(); - await connection.ExecuteAsync(SqlUpdateLastEvent, - new - { - credentialId, lastEventId - }); + // Get the current credential data + var currentData = await connection.QuerySingleOrDefaultAsync( + "SELECT data FROM credential WHERE id = @credentialId", + new { credentialId }); + + if (currentData != null) + { + var credential = JsonSerializer.Deserialize(currentData, GetJsonOptions()); + credential.LastEvent = lastEventId; + var newJson = JsonSerializer.Serialize(credential, GetJsonOptions()); + + await connection.ExecuteAsync( + "UPDATE credential SET data = @data WHERE id = @credentialId", + new { data = newJson, credentialId }); + } } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/DataAccess/Repositories/DoorRepository.cs b/src/Aporta.Core/DataAccess/Repositories/DoorRepository.cs index 3e606c4..d3284d8 100644 --- a/src/Aporta.Core/DataAccess/Repositories/DoorRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/DoorRepository.cs @@ -2,57 +2,26 @@ namespace Aporta.Core.DataAccess.Repositories; -public class DoorRepository : BaseRepository +public class DoorRepository : JsonDocumentRepository { public DoorRepository(IDataAccess dataAccess) { DataAccess = dataAccess; } - - protected override IDataAccess DataAccess { get; } - - protected override string SqlSelect => @"select door.id, - door.in_access_endpoint_id as inAccessEndpointId, - door.out_access_endpoint_id as outAccessEndpointId, - door.door_contact_endpoint_id as doorContactEndpointId, - door.request_to_exit_endpoint_id as requestToExitEndpointId, - door.door_strike_endpoint_id as doorStrikeEndpointId, - door.name - from door"; - - protected override string SqlInsert => @"insert into door - (in_access_endpoint_id, out_access_endpoint_id, - door_contact_endpoint_id, request_to_exit_endpoint_id, - door_strike_endpoint_id, name) values - (@inAccessEndpointId, @outAccessEndpointId, @doorContactEndpointId, - @requestToExitEndpointId, @doorStrikeEndpointId, @name)"; - protected override string SqlUpdate =>throw new System.NotImplementedException(); + protected override IDataAccess DataAccess { get; } - protected override string SqlDelete => @"delete from door where id = @id"; - - protected override string SqlRowCount => @"select count(*) from door"; + protected override string TableName => "door"; - protected override object InsertParameters(Door door) - { - return new - { - inAccessEndpointId = door.InAccessEndpointId, - outAccessEndpointId = door.OutAccessEndpointId, - doorContactEndpointId = door.DoorContactEndpointId, - requestToExitEndpointId = door.RequestToExitEndpointId, - doorStrikeEndpointId = door.DoorStrikeEndpointId, - name = door.Name - }; - } + protected override string SqlRowCount => "SELECT COUNT(*) FROM door"; - protected override object UpdateParameters(Door record) + protected override void SetId(Door entity, int id) { - throw new System.NotImplementedException(); + entity.Id = id; } - protected override void InsertId(Door door, int id) + protected override int GetId(Door entity) { - door.Id = id; + return entity.Id; } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs b/src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs index ccece7d..934337f 100644 --- a/src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs @@ -1,74 +1,69 @@ using System; using System.Collections.Generic; +using System.Linq; +using System.Text.Json; using System.Threading.Tasks; using Aporta.Shared.Models; using Dapper; namespace Aporta.Core.DataAccess.Repositories; -public class EndpointRepository : BaseRepository +public class EndpointRepository : JsonDocumentRepository { public EndpointRepository(IDataAccess dataAccess) { DataAccess = dataAccess; - - SqlMapper.AddTypeHandler(new GuidHandler()); } - - protected override IDataAccess DataAccess { get; } - - protected override string SqlSelect => @"select id, name, endpoint_type as type, driver_id as driverEndpointId, extension_id as extensionId - from endpoint"; - - protected override string SqlInsert => @"insert into endpoint - (name, endpoint_type, driver_id, extension_id) values - (@name, @endpointType, @driverEndpointId, @extensionId)"; - protected override string SqlUpdate => @"update endpoint - set name = @name - where driver_id = @driverEndpointId and extension_id = @extensionId"; + protected override IDataAccess DataAccess { get; } + protected override string TableName => "endpoint"; - protected override string SqlDelete => @"delete from endpoint - where id = @id"; - - protected override string SqlRowCount => @"select count(*) from endpoint"; + protected override string SqlRowCount => "SELECT COUNT(*) FROM endpoint"; public async Task> GetForExtension(Guid extensionId) { using var connection = DataAccess.CreateDbConnection(); connection.Open(); - return await connection.QueryAsync(SqlSelect + @" where extension_id = @extensionId", - new {extensionId}); + var results = await connection.QueryAsync<(int Id, string Data)>( + @"SELECT id, data FROM endpoint + WHERE json_extract(data, '$.extensionId') = @extensionId", + new { extensionId = extensionId.ToString() }); + + return results.Select(r => + { + var endpoint = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); + endpoint.Id = r.Id; + return endpoint; + }); } - /// - protected override object InsertParameters(Endpoint endpoint) + public new async Task Update(Endpoint endpoint) { - return new - { - name = endpoint.Name, - endpointType = endpoint.Type, - driverEndpointId = endpoint.DriverEndpointId, - extensionId = endpoint.ExtensionId - }; + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var json = JsonSerializer.Serialize(endpoint, GetJsonOptions()); + await connection.ExecuteAsync( + @"UPDATE endpoint SET data = @data + WHERE json_extract(data, '$.driverEndpointId') = @driverEndpointId + AND json_extract(data, '$.extensionId') = @extensionId", + new + { + data = json, + driverEndpointId = endpoint.DriverEndpointId, + extensionId = endpoint.ExtensionId.ToString() + }); } - /// - protected override object UpdateParameters(Endpoint endpoint) + protected override void SetId(Endpoint entity, int id) { - return new - { - name = endpoint.Name, - driverEndpointId = endpoint.DriverEndpointId, - extensionId = endpoint.ExtensionId - }; + entity.Id = id; } - /// - protected override void InsertId(Endpoint endpoint, int id) + protected override int GetId(Endpoint entity) { - endpoint.Id = id; + return entity.Id; } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/DataAccess/Repositories/EventRepository.cs b/src/Aporta.Core/DataAccess/Repositories/EventRepository.cs index 2d7b87a..5fb1008 100644 --- a/src/Aporta.Core/DataAccess/Repositories/EventRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/EventRepository.cs @@ -1,52 +1,27 @@ -using System; using Aporta.Shared.Models; namespace Aporta.Core.DataAccess.Repositories; -public class EventRepository : BaseRepository +public class EventRepository : JsonDocumentRepository { public EventRepository(IDataAccess dataAccess) { DataAccess = dataAccess; } - - protected override IDataAccess DataAccess { get; } - - protected override string SqlSelect => @"select event.id, - event.endpoint_id as endpointId, - event.timestamp, - event.event_type as type, - event.data - from event"; - - protected override string SqlInsert => @"insert into event - (endpoint_id, timestamp, event_type, data) values - (@endpointId, @timestamp, @type, @data)"; - protected override string SqlUpdate => throw new NotImplementedException(); + protected override IDataAccess DataAccess { get; } - protected override string SqlDelete => @"delete from event where id = @id"; + protected override string TableName => "event"; - protected override string SqlRowCount => @"select count(*) from event"; - - protected override object InsertParameters(Event @event) - { - return new - { - endpointId = @event.EndpointId, - timestamp = @event.Timestamp, - type = @event.Type, - data = @event.Data - }; - } + protected override string SqlRowCount => "SELECT COUNT(*) FROM event"; - protected override object UpdateParameters(Event record) + protected override void SetId(Event entity, int id) { - throw new NotImplementedException(); + entity.Id = id; } - protected override void InsertId(Event @event, int id) + protected override int GetId(Event entity) { - @event.Id = id; + return entity.Id; } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/DataAccess/Repositories/ExtensionRepository.cs b/src/Aporta.Core/DataAccess/Repositories/ExtensionRepository.cs index 5ab907d..4bc8953 100644 --- a/src/Aporta.Core/DataAccess/Repositories/ExtensionRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/ExtensionRepository.cs @@ -1,5 +1,8 @@ using System; using System.Collections.Generic; +using System.Linq; +using System.Text.Json; +using System.Text.Json.Serialization; using System.Threading.Tasks; using Aporta.Core.Models; using Dapper; @@ -8,34 +11,33 @@ namespace Aporta.Core.DataAccess.Repositories; public class ExtensionRepository { - private const string SqlSelect = @"select id, name, enabled, configuration - from extension"; - - private const string SqlInsert = @"insert into extension - (id, name, enabled, configuration) values - (@id, @name, @enabled, @configuration);"; - - private const string SqlUpdate = @"update extension - set enabled = @enabled, - configuration = @configuration - where id = @id;"; - + private static readonly JsonSerializerOptions JsonOptions = new() + { + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull + }; + private readonly IDataAccess _dataAccess; public ExtensionRepository(IDataAccess dataAccess) { _dataAccess = dataAccess; - - SqlMapper.AddTypeHandler(new GuidHandler()); } - + public async Task Get(Guid id) { using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - return await connection.QueryFirstOrDefaultAsync(SqlSelect + - @" where id = @id", new {id}); + var data = await connection.QueryFirstOrDefaultAsync( + "SELECT data FROM extension WHERE id = @id", + new { id = id.ToString() }); + + if (data == null) return null; + + var extension = JsonSerializer.Deserialize(data, JsonOptions); + extension.Id = id; + return extension; } public async Task> GetAll() @@ -43,7 +45,15 @@ public async Task> GetAll() using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - return await connection.QueryAsync(SqlSelect); + var results = await connection.QueryAsync<(string Id, string Data)>( + "SELECT id, data FROM extension"); + + return results.Select(r => + { + var extension = JsonSerializer.Deserialize(r.Data, JsonOptions); + extension.Id = Guid.Parse(r.Id); + return extension; + }); } public async Task Insert(ExtensionHost extension) @@ -51,12 +61,16 @@ public async Task Insert(ExtensionHost extension) using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - await connection.ExecuteAsync(SqlInsert, - new - { - id = extension.Id, name = extension.Name, enabled = extension.Enabled, - configuration = extension.Configuration - }); + var json = JsonSerializer.Serialize(new + { + name = extension.Name, + enabled = extension.Enabled, + configuration = extension.Configuration + }, JsonOptions); + + await connection.ExecuteAsync( + "INSERT INTO extension (id, data) VALUES (@id, @data)", + new { id = extension.Id.ToString(), data = json }); } public async Task Update(ExtensionHost extension) @@ -64,13 +78,15 @@ public async Task Update(ExtensionHost extension) using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - await connection.ExecuteAsync(SqlUpdate, - new - { - id = extension.Id, - name = extension.Name, - enabled = extension.Enabled, - configuration = extension.Configuration - }); + var json = JsonSerializer.Serialize(new + { + name = extension.Name, + enabled = extension.Enabled, + configuration = extension.Configuration + }, JsonOptions); + + await connection.ExecuteAsync( + "UPDATE extension SET data = @data WHERE id = @id", + new { id = extension.Id.ToString(), data = json }); } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/DataAccess/Repositories/GlobalSettingRepository.cs b/src/Aporta.Core/DataAccess/Repositories/GlobalSettingRepository.cs index 195f8af..e784974 100644 --- a/src/Aporta.Core/DataAccess/Repositories/GlobalSettingRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/GlobalSettingRepository.cs @@ -1,3 +1,5 @@ +using System.Text.Json; +using System.Text.Json.Serialization; using System.Threading.Tasks; using Aporta.Shared.Models; using Dapper; @@ -6,33 +8,32 @@ namespace Aporta.Core.DataAccess.Repositories; public class GlobalSettingRepository { - private const string SqlSelect = @"select name, value - from global_setting"; - - private const string SqlInsert = @"insert into global_setting - (name, value) values - (@name, @value);"; + private static readonly JsonSerializerOptions JsonOptions = new() + { + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull + }; - private const string SqlUpdate = @"update global_setting - set value = @value - where name = @name;"; - private readonly IDataAccess _dataAccess; public GlobalSettingRepository(IDataAccess dataAccess) { _dataAccess = dataAccess; } - + public async Task Get(string name) { using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - var globalSetting = await connection.QueryFirstOrDefaultAsync(SqlSelect + - @" where name = @name", new {name}); + var data = await connection.QueryFirstOrDefaultAsync( + "SELECT data FROM global_setting WHERE name = @name", + new { name }); + + if (data == null) return null; - return globalSetting?.Value; + var setting = JsonSerializer.Deserialize(data, JsonOptions); + return setting?.Value; } public async Task Insert(GlobalSetting globalSetting) @@ -40,22 +41,22 @@ public async Task Insert(GlobalSetting globalSetting) using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - await connection.ExecuteAsync(SqlInsert, - new - { - name = globalSetting.Name, value = globalSetting.Value - }); + var json = JsonSerializer.Serialize(new { value = globalSetting.Value }, JsonOptions); + + await connection.ExecuteAsync( + "INSERT INTO global_setting (name, data) VALUES (@name, @data)", + new { name = globalSetting.Name, data = json }); } - + public async Task Update(GlobalSetting globalSetting) { using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - await connection.ExecuteAsync(SqlUpdate, - new - { - name = globalSetting.Name, value = globalSetting.Value - }); + var json = JsonSerializer.Serialize(new { value = globalSetting.Value }, JsonOptions); + + await connection.ExecuteAsync( + "UPDATE global_setting SET data = @data WHERE name = @name", + new { name = globalSetting.Name, data = json }); } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/DataAccess/Repositories/InputRepository.cs b/src/Aporta.Core/DataAccess/Repositories/InputRepository.cs index d82df3a..5091fdf 100644 --- a/src/Aporta.Core/DataAccess/Repositories/InputRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/InputRepository.cs @@ -1,58 +1,48 @@ +using System.Text.Json; using System.Threading.Tasks; using Aporta.Shared.Models; using Dapper; namespace Aporta.Core.DataAccess.Repositories; -public class InputRepository : BaseRepository +public class InputRepository : JsonDocumentRepository { public InputRepository(IDataAccess dataAccess) { DataAccess = dataAccess; } - - protected override IDataAccess DataAccess { get; } - protected override string SqlSelect => @"select input.id, input.endpoint_id as endpointId, input.name - from input"; + protected override IDataAccess DataAccess { get; } - protected override string SqlInsert => @"insert into input - (endpoint_id, name) values - (@endpointId, @name)"; + protected override string TableName => "input"; - protected override string SqlUpdate =>throw new System.NotImplementedException(); + protected override string SqlRowCount => "SELECT COUNT(*) FROM input"; - protected override string SqlDelete => @"delete from input where id = @id"; - - protected override string SqlRowCount => @"select count(*) from input"; - public async Task GetForDriverId(string driverId) { using var connection = DataAccess.CreateDbConnection(); connection.Open(); - return await connection.QueryFirstAsync(SqlSelect + - @" inner join endpoint on input.endpoint_id = endpoint.id - where endpoint.driver_id = @driverId", - new {driverId}); - } - - protected override object InsertParameters(Input input) - { - return new - { - endpointId = input.EndpointId, - name = input.Name - }; + var result = await connection.QueryFirstOrDefaultAsync<(int Id, string Data)>( + @"SELECT i.id, i.data FROM input i + INNER JOIN endpoint e ON json_extract(i.data, '$.endpointId') = e.id + WHERE json_extract(e.data, '$.driverEndpointId') = @driverId", + new { driverId }); + + if (result.Data == null) return null; + + var input = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); + input.Id = result.Id; + return input; } - protected override object UpdateParameters(Input record) + protected override void SetId(Input entity, int id) { - throw new System.NotImplementedException(); + entity.Id = id; } - protected override void InsertId(Input input, int id) + protected override int GetId(Input entity) { - input.Id = id; + return entity.Id; } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/DataAccess/Repositories/JsonDocumentRepository.cs b/src/Aporta.Core/DataAccess/Repositories/JsonDocumentRepository.cs new file mode 100644 index 0000000..2fc3754 --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/JsonDocumentRepository.cs @@ -0,0 +1,132 @@ +using System.Collections.Generic; +using System.Linq; +using System.Text.Json; +using System.Text.Json.Serialization; +using System.Threading.Tasks; +using Aporta.Shared.Models; +using Dapper; + +namespace Aporta.Core.DataAccess.Repositories; + +public abstract class JsonDocumentRepository where T : class +{ + private static readonly JsonSerializerOptions JsonOptions = new() + { + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull + }; + + protected abstract IDataAccess DataAccess { get; } + + protected abstract string TableName { get; } + + protected abstract string SqlRowCount { get; } + + public async Task Get(int id) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var row = await connection.QuerySingleOrDefaultAsync<(int Id, string Data)>( + $"SELECT id, data FROM {TableName} WHERE id = @id", new { id }); + + if (row.Data == null) return default; + + var entity = JsonSerializer.Deserialize(row.Data, JsonOptions); + SetId(entity, row.Id); + return entity; + } + + public async Task> GetAll() + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var results = await connection.QueryAsync<(int Id, string Data)>( + $"SELECT id, data FROM {TableName}"); + + return results.Select(r => + { + var entity = JsonSerializer.Deserialize(r.Data, JsonOptions); + SetId(entity, r.Id); + return entity; + }); + } + + public async Task> GetAll(int pageNumber, int pageSize, string orderBy) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + int offset = (pageNumber - 1) * pageSize; + var results = await connection.QueryAsync<(int Id, string Data)>( + $"SELECT id, data FROM {TableName} ORDER BY {orderBy} DESC LIMIT @offset, @pageSize", + new { offset, pageSize }); + + var items = results.Select(r => + { + var entity = JsonSerializer.Deserialize(r.Data, JsonOptions); + SetId(entity, r.Id); + return entity; + }); + + return new PaginatedItemsDto + { + Items = items, + PageNumber = pageNumber, + PageSize = pageSize, + TotalItems = await connection.ExecuteScalarAsync(SqlRowCount) + }; + } + + public async Task Insert(T record) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var json = SerializeForInsert(record); + int id = await connection.QueryFirstAsync( + $"INSERT INTO {TableName} (data) VALUES (@data); SELECT last_insert_rowid()", + new { data = json }); + + SetId(record, id); + return id; + } + + public async Task Update(T record) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var json = SerializeForUpdate(record); + var id = GetId(record); + await connection.ExecuteAsync( + $"UPDATE {TableName} SET data = @data WHERE id = @id", + new { data = json, id }); + } + + public async Task Delete(int id) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + await connection.ExecuteAsync( + $"DELETE FROM {TableName} WHERE id = @id", new { id }); + } + + protected virtual string SerializeForInsert(T record) + { + return JsonSerializer.Serialize(record, JsonOptions); + } + + protected virtual string SerializeForUpdate(T record) + { + return JsonSerializer.Serialize(record, JsonOptions); + } + + protected abstract void SetId(T entity, int id); + + protected abstract int GetId(T entity); + + protected static JsonSerializerOptions GetJsonOptions() => JsonOptions; +} diff --git a/src/Aporta.Core/DataAccess/Repositories/OutputRepository.cs b/src/Aporta.Core/DataAccess/Repositories/OutputRepository.cs index 747411f..147cae7 100644 --- a/src/Aporta.Core/DataAccess/Repositories/OutputRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/OutputRepository.cs @@ -1,59 +1,48 @@ -using System; +using System.Text.Json; using System.Threading.Tasks; using Aporta.Shared.Models; using Dapper; namespace Aporta.Core.DataAccess.Repositories; -public class OutputRepository : BaseRepository +public class OutputRepository : JsonDocumentRepository { public OutputRepository(IDataAccess dataAccess) { DataAccess = dataAccess; } - - protected override IDataAccess DataAccess { get; } - protected override string SqlSelect => @"select output.id, output.endpoint_id as endpointId, output.name - from output"; + protected override IDataAccess DataAccess { get; } - protected override string SqlInsert => @"insert into output - (endpoint_id, name) values - (@endpointId, @name)"; + protected override string TableName => "output"; - protected override string SqlUpdate => throw new NotImplementedException(); + protected override string SqlRowCount => "SELECT COUNT(*) FROM output"; - protected override string SqlDelete => @"delete from output where id = @id"; - - protected override string SqlRowCount => @"select count(*) from output"; - public async Task GetForDriverId(string driverId) { using var connection = DataAccess.CreateDbConnection(); connection.Open(); - return await connection.QueryFirstAsync(SqlSelect + - @" inner join endpoint on output.endpoint_id = endpoint.id - where endpoint.driver_id = @driverId", - new {driverId}); - } - - protected override object InsertParameters(Output output) - { - return new - { - endpointId = output.EndpointId, - name = output.Name - }; + var result = await connection.QueryFirstOrDefaultAsync<(int Id, string Data)>( + @"SELECT o.id, o.data FROM output o + INNER JOIN endpoint e ON json_extract(o.data, '$.endpointId') = e.id + WHERE json_extract(e.data, '$.driverEndpointId') = @driverId", + new { driverId }); + + if (result.Data == null) return null; + + var output = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); + output.Id = result.Id; + return output; } - protected override object UpdateParameters(Output record) + protected override void SetId(Output entity, int id) { - throw new NotImplementedException(); + entity.Id = id; } - protected override void InsertId(Output output, int id) + protected override int GetId(Output entity) { - output.Id = id; + return entity.Id; } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/DataAccess/Repositories/PersonRepository.cs b/src/Aporta.Core/DataAccess/Repositories/PersonRepository.cs index 610bc38..b936b2f 100644 --- a/src/Aporta.Core/DataAccess/Repositories/PersonRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/PersonRepository.cs @@ -2,49 +2,26 @@ namespace Aporta.Core.DataAccess.Repositories; -public class PersonRepository : BaseRepository +public class PersonRepository : JsonDocumentRepository { public PersonRepository(IDataAccess dataAccess) { DataAccess = dataAccess; } - + protected override IDataAccess DataAccess { get; } - - protected override string SqlSelect => @"select person.id, - person.first_name as firstName, - person.last_name as lastName, - person.enabled - from person"; - - protected override string SqlInsert => @"insert into person - (first_name, last_name, enabled) values - (@firstName, @lastName, @enabled)"; - // ReSharper disable once UnassignedGetOnlyAutoProperty - protected override string SqlUpdate { get; } + protected override string TableName => "person"; - protected override string SqlDelete => @"delete from person where id = @id"; - - protected override string SqlRowCount => @"select count(*) from person"; - - protected override object InsertParameters(Person person) - { - return new - { - firstName = person.FirstName, - lastName = person.LastName, - enabled = person.Enabled - }; - } + protected override string SqlRowCount => "SELECT COUNT(*) FROM person"; - protected override object UpdateParameters(Person record) + protected override void SetId(Person entity, int id) { - throw new System.NotImplementedException(); + entity.Id = id; } - protected override void InsertId(Person person, int id) + protected override int GetId(Person entity) { - person.Id = id; + return entity.Id; } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs index 03923e8..5d75c8c 100644 --- a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs +++ b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs @@ -15,19 +15,9 @@ public class SqLiteDataAccess : IDataAccess private const string FileName = "Data/Aporta.sqlite"; private readonly bool _inMemory; - private readonly IMigration[] _migrations = + private readonly IMigration[] _migrations = { - new _0000_InitialCreate(), - new _0001_AddExtensionTable(), - new _0002_AddEndpointTable(), - new _0003_AddOutputTable(), - new _0004_AddInputTable(), - new _0005_AddDoorTable(), - new _0006_AddGlobalSettingTable(), - new _0007_AddCredentialTable(), - new _0008_AddPersonTable(), - new _0009_AddEventTable(), - new _0010_AddLastEventToCredentialTable() + new _0000_InitialCreate() }; /// diff --git a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs index c4ad698..1acf628 100644 --- a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs @@ -8,7 +8,7 @@ namespace Aporta.Core.Tests.DataAccess; [TestFixture] public class MigrationTests { - private const int CurrentVersion = 10; + private const int CurrentVersion = 0; private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); private IDbConnection _persistConnection; From 9a72d9c1e932da2c8d40e1b776d8df1d02c176e9 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Wed, 4 Feb 2026 07:06:20 -0500 Subject: [PATCH 02/86] Add support for explicit ID assignment Allow IDs to be assigned by code instead of auto-increment, enabling sync from upstream systems where IDs are pre-assigned. Changes: - Remove AUTOINCREMENT from schema (except event table) - Add optional explicitId parameter to Insert method - Add Upsert method for insert-or-update by ID - EventRepository overrides Insert to always use AUTOINCREMENT - Add tests for explicit IDs and upsert functionality In production, either auto-assign (Aporta standalone) or explicit (upstream sync) mode is used, not mixed. Co-Authored-By: Claude Opus 4.5 --- .../Migrations/_0000_InitialCreate.cs | 24 ++---- .../Repositories/EventRepository.cs | 17 ++++ .../Repositories/JsonDocumentRepository.cs | 35 +++++++- .../Repositories/PersonRepositoryTests.cs | 80 ++++++++++++++++++- 4 files changed, 134 insertions(+), 22 deletions(-) diff --git a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs index 4eeecc6..3a5b0f0 100644 --- a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs +++ b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs @@ -31,68 +31,60 @@ data TEXT NOT NULL -- Endpoint table CREATE TABLE endpoint ( - id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL ); - CREATE UNIQUE INDEX endpoint_id_uindex ON endpoint (id); -- Output table CREATE TABLE output ( - id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL ); - CREATE UNIQUE INDEX output_id_uindex ON output (id); -- Input table CREATE TABLE input ( - id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL ); - CREATE UNIQUE INDEX input_id_uindex ON input (id); -- Door table CREATE TABLE door ( - id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL ); - CREATE UNIQUE INDEX door_id_uindex ON door (id); -- Global setting table (string primary key) CREATE TABLE global_setting ( name TEXT NOT NULL PRIMARY KEY, data TEXT NOT NULL ); - CREATE UNIQUE INDEX global_setting_name_uindex ON global_setting (name); -- Credential table CREATE TABLE credential ( - id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL ); - CREATE UNIQUE INDEX credential_id_uindex ON credential (id); CREATE UNIQUE INDEX credential_number_uindex ON credential (json_extract(data, '$.number')); -- Person table CREATE TABLE person ( - id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL ); - CREATE UNIQUE INDEX person_id_uindex ON person (id); -- Credential assignment table (junction table as document) CREATE TABLE credential_assignment ( - id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL ); CREATE INDEX idx_ca_credential ON credential_assignment (json_extract(data, '$.credentialId')); CREATE INDEX idx_ca_person ON credential_assignment (json_extract(data, '$.personId')); - -- Event table + -- Event table (always local, uses AUTOINCREMENT) CREATE TABLE event ( id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, data TEXT NOT NULL ); - CREATE UNIQUE INDEX event_id_uindex ON event (id); ", transaction: transaction); } diff --git a/src/Aporta.Core/DataAccess/Repositories/EventRepository.cs b/src/Aporta.Core/DataAccess/Repositories/EventRepository.cs index 5fb1008..576d042 100644 --- a/src/Aporta.Core/DataAccess/Repositories/EventRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/EventRepository.cs @@ -1,4 +1,7 @@ +using System.Text.Json; +using System.Threading.Tasks; using Aporta.Shared.Models; +using Dapper; namespace Aporta.Core.DataAccess.Repositories; @@ -15,6 +18,20 @@ public EventRepository(IDataAccess dataAccess) protected override string SqlRowCount => "SELECT COUNT(*) FROM event"; + public async Task Insert(Event record) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var json = JsonSerializer.Serialize(record, GetJsonOptions()); + int id = await connection.QueryFirstAsync( + "INSERT INTO event (data) VALUES (@data); SELECT last_insert_rowid()", + new { data = json }); + + SetId(record, id); + return id; + } + protected override void SetId(Event entity, int id) { entity.Id = id; diff --git a/src/Aporta.Core/DataAccess/Repositories/JsonDocumentRepository.cs b/src/Aporta.Core/DataAccess/Repositories/JsonDocumentRepository.cs index 2fc3754..b396700 100644 --- a/src/Aporta.Core/DataAccess/Repositories/JsonDocumentRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/JsonDocumentRepository.cs @@ -79,20 +79,47 @@ public async Task> GetAll(int pageNumber, int pageSize, str }; } - public async Task Insert(T record) + public async Task Insert(T record, int? explicitId = null) { using var connection = DataAccess.CreateDbConnection(); connection.Open(); var json = SerializeForInsert(record); - int id = await connection.QueryFirstAsync( - $"INSERT INTO {TableName} (data) VALUES (@data); SELECT last_insert_rowid()", - new { data = json }); + int id; + + if (explicitId.HasValue && explicitId.Value > 0) + { + // Use provided ID + id = explicitId.Value; + await connection.ExecuteAsync( + $"INSERT INTO {TableName} (id, data) VALUES (@id, @data)", + new { id, data = json }); + } + else + { + // Auto-assign: MAX(id) + 1, or 1 if table is empty + id = await connection.QueryFirstAsync( + $"INSERT INTO {TableName} (id, data) VALUES ((SELECT COALESCE(MAX(id), 0) + 1 FROM {TableName}), @data); SELECT last_insert_rowid()", + new { data = json }); + } SetId(record, id); return id; } + public async Task Upsert(T record, int id) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var json = SerializeForInsert(record); + await connection.ExecuteAsync( + $"INSERT INTO {TableName} (id, data) VALUES (@id, @data) ON CONFLICT(id) DO UPDATE SET data = @data", + new { id, data = json }); + + SetId(record, id); + } + public async Task Update(T record) { using var connection = DataAccess.CreateDbConnection(); diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/PersonRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/PersonRepositoryTests.cs index 4c8c842..501f8d7 100644 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/PersonRepositoryTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/Repositories/PersonRepositoryTests.cs @@ -80,18 +80,94 @@ public async Task Delete() new Person {FirstName = "First1", LastName = "Last1", Enabled = false}, new Person {FirstName = "First2", LastName = "Last2", Enabled = true}, }; - + var personRepository = new PersonRepository(_dataAccess); foreach (var person in people) { await personRepository.Insert(person); } - // Act + // Act await personRepository.Delete(2); // Assert var actualPeople = await personRepository.GetAll(); Assert.That(1, Is.EqualTo(actualPeople.Count())); } + + [Test] + public async Task Insert_WithExplicitId() + { + // Arrange + var personRepository = new PersonRepository(_dataAccess); + var person = new Person { FirstName = "Explicit", LastName = "IdPerson", Enabled = true }; + + // Act + int id = await personRepository.Insert(person, explicitId: 100); + + // Assert + Assert.That(id, Is.EqualTo(100)); + Assert.That(person.Id, Is.EqualTo(100)); + + var retrieved = await personRepository.Get(100); + Assert.That(retrieved.FirstName, Is.EqualTo("Explicit")); + Assert.That(retrieved.LastName, Is.EqualTo("IdPerson")); + } + + [Test] + public async Task Insert_WithExplicitIds_OutOfOrder() + { + // Arrange - simulates upstream data arriving out of order + var personRepository = new PersonRepository(_dataAccess); + + // Act - insert IDs out of sequence + await personRepository.Insert(new Person { FirstName = "Third", LastName = "Person", Enabled = true }, explicitId: 300); + await personRepository.Insert(new Person { FirstName = "First", LastName = "Person", Enabled = true }, explicitId: 100); + await personRepository.Insert(new Person { FirstName = "Second", LastName = "Person", Enabled = true }, explicitId: 200); + + // Assert + var all = (await personRepository.GetAll()).ToList(); + Assert.That(all.Count, Is.EqualTo(3)); + Assert.That((await personRepository.Get(100)).FirstName, Is.EqualTo("First")); + Assert.That((await personRepository.Get(200)).FirstName, Is.EqualTo("Second")); + Assert.That((await personRepository.Get(300)).FirstName, Is.EqualTo("Third")); + } + + [Test] + public async Task Upsert_InsertsNewRecord() + { + // Arrange + var personRepository = new PersonRepository(_dataAccess); + var person = new Person { FirstName = "New", LastName = "Person", Enabled = true }; + + // Act + await personRepository.Upsert(person, 50); + + // Assert + var retrieved = await personRepository.Get(50); + Assert.That(retrieved, Is.Not.Null); + Assert.That(retrieved.FirstName, Is.EqualTo("New")); + Assert.That(person.Id, Is.EqualTo(50)); + } + + [Test] + public async Task Upsert_UpdatesExistingRecord() + { + // Arrange + var personRepository = new PersonRepository(_dataAccess); + var original = new Person { FirstName = "Original", LastName = "Name", Enabled = false }; + await personRepository.Insert(original, explicitId: 75); + + // Act + var updated = new Person { FirstName = "Updated", LastName = "Name", Enabled = true }; + await personRepository.Upsert(updated, 75); + + // Assert + var retrieved = await personRepository.Get(75); + Assert.That(retrieved.FirstName, Is.EqualTo("Updated")); + Assert.That(retrieved.Enabled, Is.True); + + var all = await personRepository.GetAll(); + Assert.That(all.Count(), Is.EqualTo(1)); + } } \ No newline at end of file From 3cfac62ecd101e207de558c1738330aa35b9ea20 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Wed, 4 Feb 2026 11:23:09 -0500 Subject: [PATCH 03/86] Add migration tool for upgrading existing databases Standalone tool to migrate from column-based schema (v0-10) to JSON document storage. Supports upgrading from any old schema version. Features: - Embeds old migrations to bring DB up to v10 first - Transforms all tables to JSON format - Creates backup before migration - Dry-run mode for preview - Automatic rollback on error Usage: dotnet Aporta.Migration.dll [--dry-run] Tests cover: - Full migration from v10 - Partial migration from v5 (applies missing migrations) - Dry-run mode - Already-migrated database (no-op) Co-Authored-By: Claude Opus 4.5 --- src/Aporta.Migration/Aporta.Migration.csproj | 15 + src/Aporta.Migration/Program.cs | 596 ++++++++++++++++++ src/Aporta.sln | 20 + .../Aporta.Migration.Tests.csproj | 22 + test/Aporta.Migration.Tests/MigrationTests.cs | 315 +++++++++ 5 files changed, 968 insertions(+) create mode 100644 src/Aporta.Migration/Aporta.Migration.csproj create mode 100644 src/Aporta.Migration/Program.cs create mode 100644 test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj create mode 100644 test/Aporta.Migration.Tests/MigrationTests.cs diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj new file mode 100644 index 0000000..b585e32 --- /dev/null +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -0,0 +1,15 @@ + + + + Exe + net8.0 + enable + enable + + + + + + + + diff --git a/src/Aporta.Migration/Program.cs b/src/Aporta.Migration/Program.cs new file mode 100644 index 0000000..212b37c --- /dev/null +++ b/src/Aporta.Migration/Program.cs @@ -0,0 +1,596 @@ +using System.Data; +using System.Text.Json; +using Dapper; +using Microsoft.Data.Sqlite; + +namespace Aporta.Migration; + +class Program +{ + static async Task Main(string[] args) + { + if (args.Length == 0) + { + Console.WriteLine("Aporta Database Migration Tool"); + Console.WriteLine("Migrates from column-based schema to JSON document storage."); + Console.WriteLine(); + Console.WriteLine("Usage: Aporta.Migration [--dry-run]"); + Console.WriteLine(); + Console.WriteLine("Options:"); + Console.WriteLine(" --dry-run Show what would be done without making changes"); + return 1; + } + + var dbPath = args[0]; + var dryRun = args.Contains("--dry-run"); + + if (!File.Exists(dbPath)) + { + Console.WriteLine($"Error: Database file not found: {dbPath}"); + return 1; + } + + // Create backup + var backupPath = $"{dbPath}.backup-{DateTime.Now:yyyyMMdd-HHmmss}"; + if (!dryRun) + { + Console.WriteLine($"Creating backup: {backupPath}"); + File.Copy(dbPath, backupPath); + } + + try + { + var connectionString = $"Data Source={dbPath}"; + await using var connection = new SqliteConnection(connectionString); + await connection.OpenAsync(); + + var migrator = new Migrator(connection, dryRun); + await migrator.MigrateAsync(); + + Console.WriteLine(); + Console.WriteLine(dryRun ? "Dry run complete. No changes made." : "Migration complete!"); + return 0; + } + catch (Exception ex) + { + Console.WriteLine($"Error during migration: {ex.Message}"); + Console.WriteLine(); + if (!dryRun) + { + Console.WriteLine($"Restoring from backup: {backupPath}"); + File.Copy(backupPath, dbPath, overwrite: true); + } + return 1; + } + } +} + +public class Migrator +{ + private const int OldSchemaVersion = 10; + + private readonly IDbConnection _connection; + private readonly bool _dryRun; + + public Migrator(IDbConnection connection, bool dryRun) + { + _connection = connection; + _dryRun = dryRun; + } + + public async Task MigrateAsync() + { + var currentVersion = await GetCurrentVersionAsync(); + Console.WriteLine($"Current schema version: {currentVersion}"); + + if (currentVersion == -1) + { + Console.WriteLine("Error: No schema_info table found. Is this an Aporta database?"); + throw new Exception("Invalid database"); + } + + // Check if already migrated to JSON schema + if (await IsJsonSchemaAsync()) + { + Console.WriteLine("Database is already using JSON schema. Nothing to do."); + return; + } + + // Step 1: Apply old migrations to get to version 10 + if (currentVersion < OldSchemaVersion) + { + Console.WriteLine($"Applying old migrations to reach version {OldSchemaVersion}..."); + await ApplyOldMigrationsAsync(currentVersion); + } + + // Step 2: Transform to JSON schema + Console.WriteLine("Transforming to JSON document storage..."); + await TransformToJsonSchemaAsync(); + } + + private async Task GetCurrentVersionAsync() + { + var tableExists = await _connection.ExecuteScalarAsync( + "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='schema_info'"); + + if (tableExists == 0) return -1; + + return await _connection.QueryFirstOrDefaultAsync( + "SELECT COALESCE(MAX(id), -1) FROM schema_info"); + } + + private async Task IsJsonSchemaAsync() + { + // Check if person table has 'data' column (JSON schema) vs 'first_name' column (old schema) + var columns = await _connection.QueryAsync( + "SELECT name FROM pragma_table_info('person')"); + return columns.Contains("data"); + } + + private async Task ApplyOldMigrationsAsync(int currentVersion) + { + var migrations = GetOldMigrations(); + + foreach (var (version, name, sql) in migrations.Where(m => m.Version > currentVersion)) + { + Console.WriteLine($" Applying migration {version}: {name}"); + if (!_dryRun) + { + using var transaction = _connection.BeginTransaction(); + await _connection.ExecuteAsync(sql, transaction: transaction); + await _connection.ExecuteAsync( + "INSERT INTO schema_info (id, name, timestamp) VALUES (@id, @name, @timestamp)", + new { id = version, name, timestamp = DateTime.UtcNow }, + transaction); + transaction.Commit(); + } + } + } + + private async Task TransformToJsonSchemaAsync() + { + using var transaction = _dryRun ? null : _connection.BeginTransaction(); + + // Transform each table + await TransformExtensionTableAsync(transaction); + await TransformEndpointTableAsync(transaction); + await TransformOutputTableAsync(transaction); + await TransformInputTableAsync(transaction); + await TransformDoorTableAsync(transaction); + await TransformGlobalSettingTableAsync(transaction); + await TransformPersonTableAsync(transaction); + await TransformCredentialTableAsync(transaction); + await TransformCredentialAssignmentTableAsync(transaction); + await TransformEventTableAsync(transaction); + + // Update schema_info + if (!_dryRun) + { + // Clear old schema records and insert new + await _connection.ExecuteAsync("DELETE FROM schema_info", transaction: transaction); + await _connection.ExecuteAsync( + "INSERT INTO schema_info (id, name, timestamp) VALUES (@id, @name, @timestamp)", + new { id = 0, name = "Initial create with JSON document storage", timestamp = DateTime.UtcNow }, + transaction: transaction); + } + + transaction?.Commit(); + } + + private async Task TransformExtensionTableAsync(IDbTransaction? transaction) + { + Console.WriteLine(" Transforming extension table..."); + if (_dryRun) return; + + // extension: id (text), name, enabled, configuration -> id (text), data (json) + var oldData = await _connection.QueryAsync<(string Id, string Name, int Enabled, string Configuration)>( + "SELECT id, name, enabled, configuration FROM extension", transaction: transaction); + + await _connection.ExecuteAsync( + @"CREATE TABLE extension_new (id TEXT NOT NULL PRIMARY KEY, data TEXT NOT NULL)", + transaction: transaction); + + foreach (var row in oldData) + { + var json = JsonSerializer.Serialize(new + { + name = row.Name, + enabled = row.Enabled != 0, + configuration = row.Configuration + }); + await _connection.ExecuteAsync( + "INSERT INTO extension_new (id, data) VALUES (@id, @data)", + new { id = row.Id, data = json }, + transaction: transaction); + } + + await _connection.ExecuteAsync("DROP TABLE extension", transaction: transaction); + await _connection.ExecuteAsync("ALTER TABLE extension_new RENAME TO extension", transaction: transaction); + } + + private async Task TransformEndpointTableAsync(IDbTransaction? transaction) + { + Console.WriteLine(" Transforming endpoint table..."); + if (_dryRun) return; + + var oldData = await _connection.QueryAsync<(int Id, string Name, string DriverId, int EndpointType, string ExtensionId)>( + "SELECT id, name, driver_id, endpoint_type, extension_id FROM endpoint", transaction: transaction); + + await _connection.ExecuteAsync( + @"CREATE TABLE endpoint_new (id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL)", + transaction: transaction); + + foreach (var row in oldData) + { + var json = JsonSerializer.Serialize(new + { + name = row.Name, + driverEndpointId = row.DriverId, + type = row.EndpointType, + extensionId = row.ExtensionId + }); + await _connection.ExecuteAsync( + "INSERT INTO endpoint_new (id, data) VALUES (@id, @data)", + new { id = row.Id, data = json }, + transaction: transaction); + } + + await _connection.ExecuteAsync("DROP TABLE endpoint", transaction: transaction); + await _connection.ExecuteAsync("ALTER TABLE endpoint_new RENAME TO endpoint", transaction: transaction); + } + + private async Task TransformOutputTableAsync(IDbTransaction? transaction) + { + Console.WriteLine(" Transforming output table..."); + if (_dryRun) return; + + var oldData = await _connection.QueryAsync<(int Id, int EndpointId, string Name)>( + "SELECT id, endpoint_id, name FROM output", transaction: transaction); + + await _connection.ExecuteAsync( + @"CREATE TABLE output_new (id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL)", + transaction: transaction); + + foreach (var row in oldData) + { + var json = JsonSerializer.Serialize(new + { + endpointId = row.EndpointId, + name = row.Name + }); + await _connection.ExecuteAsync( + "INSERT INTO output_new (id, data) VALUES (@id, @data)", + new { id = row.Id, data = json }, + transaction: transaction); + } + + await _connection.ExecuteAsync("DROP TABLE output", transaction: transaction); + await _connection.ExecuteAsync("ALTER TABLE output_new RENAME TO output", transaction: transaction); + } + + private async Task TransformInputTableAsync(IDbTransaction? transaction) + { + Console.WriteLine(" Transforming input table..."); + if (_dryRun) return; + + var oldData = await _connection.QueryAsync<(int Id, int EndpointId, string Name)>( + "SELECT id, endpoint_id, name FROM input", transaction: transaction); + + await _connection.ExecuteAsync( + @"CREATE TABLE input_new (id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL)", + transaction: transaction); + + foreach (var row in oldData) + { + var json = JsonSerializer.Serialize(new + { + endpointId = row.EndpointId, + name = row.Name + }); + await _connection.ExecuteAsync( + "INSERT INTO input_new (id, data) VALUES (@id, @data)", + new { id = row.Id, data = json }, + transaction: transaction); + } + + await _connection.ExecuteAsync("DROP TABLE input", transaction: transaction); + await _connection.ExecuteAsync("ALTER TABLE input_new RENAME TO input", transaction: transaction); + } + + private async Task TransformDoorTableAsync(IDbTransaction? transaction) + { + Console.WriteLine(" Transforming door table..."); + if (_dryRun) return; + + var oldData = await _connection.QueryAsync<(int Id, int? InAccessEndpointId, int? OutAccessEndpointId, + int? DoorContactEndpointId, int? RequestToExitEndpointId, int? DoorStrikeEndpointId, string Name)>( + @"SELECT id, in_access_endpoint_id, out_access_endpoint_id, door_contact_endpoint_id, + request_to_exit_endpoint_id, door_strike_endpoint_id, name FROM door", transaction: transaction); + + await _connection.ExecuteAsync( + @"CREATE TABLE door_new (id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL)", + transaction: transaction); + + foreach (var row in oldData) + { + var json = JsonSerializer.Serialize(new + { + name = row.Name, + inAccessEndpointId = row.InAccessEndpointId, + outAccessEndpointId = row.OutAccessEndpointId, + doorContactEndpointId = row.DoorContactEndpointId, + requestToExitEndpointId = row.RequestToExitEndpointId, + doorStrikeEndpointId = row.DoorStrikeEndpointId + }); + await _connection.ExecuteAsync( + "INSERT INTO door_new (id, data) VALUES (@id, @data)", + new { id = row.Id, data = json }, + transaction: transaction); + } + + await _connection.ExecuteAsync("DROP TABLE door", transaction: transaction); + await _connection.ExecuteAsync("ALTER TABLE door_new RENAME TO door", transaction: transaction); + } + + private async Task TransformGlobalSettingTableAsync(IDbTransaction? transaction) + { + Console.WriteLine(" Transforming global_setting table..."); + if (_dryRun) return; + + var oldData = await _connection.QueryAsync<(string Name, string Value)>( + "SELECT name, value FROM global_setting", transaction: transaction); + + await _connection.ExecuteAsync( + @"CREATE TABLE global_setting_new (name TEXT NOT NULL PRIMARY KEY, data TEXT NOT NULL)", + transaction: transaction); + + foreach (var row in oldData) + { + var json = JsonSerializer.Serialize(new { value = row.Value }); + await _connection.ExecuteAsync( + "INSERT INTO global_setting_new (name, data) VALUES (@name, @data)", + new { name = row.Name, data = json }, + transaction: transaction); + } + + await _connection.ExecuteAsync("DROP TABLE global_setting", transaction: transaction); + await _connection.ExecuteAsync("ALTER TABLE global_setting_new RENAME TO global_setting", transaction: transaction); + } + + private async Task TransformPersonTableAsync(IDbTransaction? transaction) + { + Console.WriteLine(" Transforming person table..."); + if (_dryRun) return; + + var oldData = await _connection.QueryAsync<(int Id, string? FirstName, string? LastName, int Enabled)>( + "SELECT id, first_name, last_name, enabled FROM person", transaction: transaction); + + await _connection.ExecuteAsync( + @"CREATE TABLE person_new (id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL)", + transaction: transaction); + + foreach (var row in oldData) + { + var json = JsonSerializer.Serialize(new + { + firstName = row.FirstName, + lastName = row.LastName, + enabled = row.Enabled != 0 + }); + await _connection.ExecuteAsync( + "INSERT INTO person_new (id, data) VALUES (@id, @data)", + new { id = row.Id, data = json }, + transaction: transaction); + } + + await _connection.ExecuteAsync("DROP TABLE person", transaction: transaction); + await _connection.ExecuteAsync("ALTER TABLE person_new RENAME TO person", transaction: transaction); + } + + private async Task TransformCredentialTableAsync(IDbTransaction? transaction) + { + Console.WriteLine(" Transforming credential table..."); + if (_dryRun) return; + + var oldData = await _connection.QueryAsync<(int Id, string Number, int? LastEvent)>( + "SELECT id, number, last_event FROM credential", transaction: transaction); + + await _connection.ExecuteAsync( + @"CREATE TABLE credential_new (id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL)", + transaction: transaction); + + foreach (var row in oldData) + { + var json = JsonSerializer.Serialize(new + { + number = row.Number, + lastEvent = row.LastEvent + }); + await _connection.ExecuteAsync( + "INSERT INTO credential_new (id, data) VALUES (@id, @data)", + new { id = row.Id, data = json }, + transaction: transaction); + } + + await _connection.ExecuteAsync("DROP TABLE credential", transaction: transaction); + await _connection.ExecuteAsync("ALTER TABLE credential_new RENAME TO credential", transaction: transaction); + await _connection.ExecuteAsync( + "CREATE UNIQUE INDEX credential_number_uindex ON credential (json_extract(data, '$.number'))", + transaction: transaction); + } + + private async Task TransformCredentialAssignmentTableAsync(IDbTransaction? transaction) + { + Console.WriteLine(" Transforming credential_assignment table..."); + if (_dryRun) return; + + var oldData = await _connection.QueryAsync<(int PersonId, int CredentialId, int Enabled)>( + "SELECT person_id, credential_id, enabled FROM credential_assignment", transaction: transaction); + + await _connection.ExecuteAsync( + @"CREATE TABLE credential_assignment_new (id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL)", + transaction: transaction); + + var id = 1; + foreach (var row in oldData) + { + var json = JsonSerializer.Serialize(new + { + credentialId = row.CredentialId, + personId = row.PersonId, + enabled = row.Enabled + }); + await _connection.ExecuteAsync( + "INSERT INTO credential_assignment_new (id, data) VALUES (@id, @data)", + new { id = id++, data = json }, + transaction: transaction); + } + + await _connection.ExecuteAsync("DROP TABLE credential_assignment", transaction: transaction); + await _connection.ExecuteAsync("ALTER TABLE credential_assignment_new RENAME TO credential_assignment", transaction: transaction); + await _connection.ExecuteAsync( + "CREATE INDEX idx_ca_credential ON credential_assignment (json_extract(data, '$.credentialId'))", + transaction: transaction); + await _connection.ExecuteAsync( + "CREATE INDEX idx_ca_person ON credential_assignment (json_extract(data, '$.personId'))", + transaction: transaction); + } + + private async Task TransformEventTableAsync(IDbTransaction? transaction) + { + Console.WriteLine(" Transforming event table..."); + if (_dryRun) return; + + var oldData = await _connection.QueryAsync<(int Id, int EndpointId, DateTime Timestamp, int EventType, string Data)>( + "SELECT id, endpoint_id, timestamp, event_type, data FROM event", transaction: transaction); + + await _connection.ExecuteAsync( + @"CREATE TABLE event_new (id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, data TEXT NOT NULL)", + transaction: transaction); + + foreach (var row in oldData) + { + var json = JsonSerializer.Serialize(new + { + endpointId = row.EndpointId, + timestamp = row.Timestamp, + type = row.EventType, + data = row.Data + }); + await _connection.ExecuteAsync( + "INSERT INTO event_new (id, data) VALUES (@id, @data)", + new { id = row.Id, data = json }, + transaction: transaction); + } + + await _connection.ExecuteAsync("DROP TABLE event", transaction: transaction); + await _connection.ExecuteAsync("ALTER TABLE event_new RENAME TO event", transaction: transaction); + } + + private static List<(int Version, string Name, string Sql)> GetOldMigrations() + { + return new List<(int, string, string)> + { + (1, "Add extension table", @" + CREATE TABLE extension ( + id TEXT NOT NULL PRIMARY KEY, + name TEXT NOT NULL, + enabled INTEGER DEFAULT 0 NOT NULL, + configuration TEXT NOT NULL + ); + CREATE UNIQUE INDEX extension_id_uindex ON extension (id);"), + + (2, "Add endpoint table", @" + CREATE TABLE endpoint ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + name TEXT NOT NULL, + driver_id TEXT NOT NULL, + endpoint_type INTEGER NOT NULL, + extension_id TEXT NOT NULL REFERENCES extension ON UPDATE CASCADE ON DELETE CASCADE + ); + CREATE UNIQUE INDEX endpoint_id_uindex ON endpoint (id);"), + + (3, "Add output table", @" + CREATE TABLE output ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + endpoint_id INTEGER NOT NULL REFERENCES endpoint ON UPDATE CASCADE ON DELETE CASCADE, + name TEXT NOT NULL + ); + CREATE UNIQUE INDEX output_id_uindex ON output (id);"), + + (4, "Add input table", @" + CREATE TABLE input ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + endpoint_id INTEGER NOT NULL REFERENCES endpoint ON UPDATE CASCADE ON DELETE CASCADE, + name TEXT NOT NULL + ); + CREATE UNIQUE INDEX input_id_uindex ON input (id);"), + + (5, "Add door table", @" + CREATE TABLE door ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + in_access_endpoint_id INTEGER REFERENCES endpoint ON UPDATE CASCADE ON DELETE CASCADE, + out_access_endpoint_id INTEGER REFERENCES endpoint ON UPDATE CASCADE ON DELETE CASCADE, + door_contact_endpoint_id INTEGER REFERENCES endpoint ON UPDATE CASCADE ON DELETE CASCADE, + request_to_exit_endpoint_id INTEGER REFERENCES endpoint ON UPDATE CASCADE ON DELETE CASCADE, + door_strike_endpoint_id INTEGER REFERENCES endpoint ON UPDATE CASCADE ON DELETE CASCADE, + name TEXT NOT NULL + ); + CREATE UNIQUE INDEX door_id_uindex ON door (id);"), + + (6, "Add global_setting table", @" + CREATE TABLE global_setting ( + name TEXT NOT NULL PRIMARY KEY, + value TEXT NOT NULL + ); + CREATE UNIQUE INDEX global_setting_name_uindex ON global_setting (name);"), + + (7, "Add credential table", @" + CREATE TABLE credential ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + number TEXT NOT NULL, + enroll_date DATETIME NOT NULL + ); + CREATE UNIQUE INDEX credential_id_uindex ON credential (id);"), + + (8, "Add person table", @" + CREATE TABLE person ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + first_name TEXT, + last_name TEXT, + enabled INTEGER DEFAULT 0 NOT NULL + ); + CREATE UNIQUE INDEX person_id_uindex ON person (id); + + CREATE TABLE credential_assignment ( + person_id INTEGER NOT NULL REFERENCES person, + credential_id INTEGER NOT NULL PRIMARY KEY REFERENCES credential, + enabled INTEGER DEFAULT 0 NOT NULL + ); + CREATE UNIQUE INDEX credential_assignment_credential_id_uindex ON credential_assignment (credential_id);"), + + (9, "Add event table", @" + CREATE TABLE event ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + endpoint_id INTEGER NOT NULL REFERENCES endpoint, + timestamp DATETIME NOT NULL, + event_type INTEGER NOT NULL, + data TEXT NOT NULL + ); + CREATE UNIQUE INDEX event_id_uindex ON event (id); + CREATE UNIQUE INDEX credential_number_uindex ON credential (number);"), + + (10, "Add last_event to credential table", @" + CREATE TABLE credential_dg_tmp ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + number TEXT NOT NULL, + last_event INTEGER + ); + INSERT INTO credential_dg_tmp(id, number) SELECT id, number FROM credential; + DROP TABLE credential; + ALTER TABLE credential_dg_tmp RENAME TO credential; + CREATE UNIQUE INDEX credential_id_uindex ON credential (id); + CREATE UNIQUE INDEX credential_number_uindex ON credential (number);") + }; + } +} diff --git a/src/Aporta.sln b/src/Aporta.sln index 53a3be2..b6b02c1 100644 --- a/src/Aporta.sln +++ b/src/Aporta.sln @@ -98,6 +98,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aporta.Drivers.Virtual.WebC EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aporta.Drivers.Virtual.Tests", "Aporta.Drivers.Virtual.Tests\Aporta.Drivers.Virtual.Tests.csproj", "{1E07F94D-F040-4C9F-8236-39A679556D59}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aporta.Migration", "Aporta.Migration\Aporta.Migration.csproj", "{7024A0B0-6025-49BE-992D-27CE1EA3402A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aporta.Migration.Tests", "..\test\Aporta.Migration.Tests\Aporta.Migration.Tests.csproj", "{3C97ED4A-576C-4EC6-B002-A64351E046B7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -272,6 +276,22 @@ Global {1E07F94D-F040-4C9F-8236-39A679556D59}.Release|Any CPU.Build.0 = Release|Any CPU {1E07F94D-F040-4C9F-8236-39A679556D59}.Release|x86.ActiveCfg = Release|Any CPU {1E07F94D-F040-4C9F-8236-39A679556D59}.Release|x86.Build.0 = Release|Any CPU + {7024A0B0-6025-49BE-992D-27CE1EA3402A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7024A0B0-6025-49BE-992D-27CE1EA3402A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7024A0B0-6025-49BE-992D-27CE1EA3402A}.Debug|x86.ActiveCfg = Debug|Any CPU + {7024A0B0-6025-49BE-992D-27CE1EA3402A}.Debug|x86.Build.0 = Debug|Any CPU + {7024A0B0-6025-49BE-992D-27CE1EA3402A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7024A0B0-6025-49BE-992D-27CE1EA3402A}.Release|Any CPU.Build.0 = Release|Any CPU + {7024A0B0-6025-49BE-992D-27CE1EA3402A}.Release|x86.ActiveCfg = Release|Any CPU + {7024A0B0-6025-49BE-992D-27CE1EA3402A}.Release|x86.Build.0 = Release|Any CPU + {3C97ED4A-576C-4EC6-B002-A64351E046B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3C97ED4A-576C-4EC6-B002-A64351E046B7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C97ED4A-576C-4EC6-B002-A64351E046B7}.Debug|x86.ActiveCfg = Debug|Any CPU + {3C97ED4A-576C-4EC6-B002-A64351E046B7}.Debug|x86.Build.0 = Debug|Any CPU + {3C97ED4A-576C-4EC6-B002-A64351E046B7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3C97ED4A-576C-4EC6-B002-A64351E046B7}.Release|Any CPU.Build.0 = Release|Any CPU + {3C97ED4A-576C-4EC6-B002-A64351E046B7}.Release|x86.ActiveCfg = Release|Any CPU + {3C97ED4A-576C-4EC6-B002-A64351E046B7}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj new file mode 100644 index 0000000..1ac4524 --- /dev/null +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -0,0 +1,22 @@ + + + + net8.0 + enable + enable + false + + + + + + + + + + + + + + + diff --git a/test/Aporta.Migration.Tests/MigrationTests.cs b/test/Aporta.Migration.Tests/MigrationTests.cs new file mode 100644 index 0000000..d95696c --- /dev/null +++ b/test/Aporta.Migration.Tests/MigrationTests.cs @@ -0,0 +1,315 @@ +using System.Data; +using System.Text.Json; +using Dapper; +using Microsoft.Data.Sqlite; +using NUnit.Framework; + +namespace Aporta.Migration.Tests; + +[TestFixture] +public class MigrationTests +{ + private SqliteConnection _connection = null!; + + [SetUp] + public void Setup() + { + // Create in-memory database + _connection = new SqliteConnection("Data Source=:memory:"); + _connection.Open(); + } + + [TearDown] + public void TearDown() + { + _connection?.Close(); + _connection?.Dispose(); + } + + [Test] + public async Task Migrate_FromVersion10_TransformsAllTables() + { + // Arrange - Create old schema with test data + await CreateOldSchemaVersion10(); + await InsertTestData(); + + // Act - Run migration + var migrator = new Migrator(_connection, dryRun: false); + await migrator.MigrateAsync(); + + // Assert - Verify each table was transformed correctly + await VerifyExtensionTable(); + await VerifyEndpointTable(); + await VerifyOutputTable(); + await VerifyInputTable(); + await VerifyDoorTable(); + await VerifyGlobalSettingTable(); + await VerifyPersonTable(); + await VerifyCredentialTable(); + await VerifyCredentialAssignmentTable(); + await VerifyEventTable(); + await VerifySchemaInfo(); + } + + [Test] + public async Task Migrate_FromVersion5_AppliesRemainingMigrationsFirst() + { + // Arrange - Create partial old schema (version 5) + await CreateOldSchemaVersion5(); + + // Act - Run migration + var migrator = new Migrator(_connection, dryRun: false); + await migrator.MigrateAsync(); + + // Assert - All tables should exist with JSON schema + var tables = await _connection.QueryAsync( + "SELECT name FROM sqlite_master WHERE type='table' AND name != 'sqlite_sequence'"); + + Assert.That(tables, Does.Contain("person")); + Assert.That(tables, Does.Contain("credential")); + Assert.That(tables, Does.Contain("credential_assignment")); + Assert.That(tables, Does.Contain("event")); + } + + [Test] + public async Task Migrate_DryRun_MakesNoChanges() + { + // Arrange + await CreateOldSchemaVersion10(); + await InsertTestData(); + + // Act - Run migration in dry-run mode + var migrator = new Migrator(_connection, dryRun: true); + await migrator.MigrateAsync(); + + // Assert - Old schema should still exist (person has first_name column, not data) + var columns = await _connection.QueryAsync( + "SELECT name FROM pragma_table_info('person')"); + Assert.That(columns, Does.Contain("first_name")); + Assert.That(columns, Does.Not.Contain("data")); + } + + [Test] + public async Task Migrate_AlreadyJsonSchema_DoesNothing() + { + // Arrange - Create new JSON schema with test data + await CreateNewJsonSchema(); + var testData = "{\"firstName\":\"Test\",\"lastName\":\"User\",\"enabled\":true}"; + await _connection.ExecuteAsync( + "INSERT INTO person (id, data) VALUES (1, @data)", new { data = testData }); + + // Act + var migrator = new Migrator(_connection, dryRun: false); + await migrator.MigrateAsync(); + + // Assert - Data should be unchanged + var result = await _connection.QueryFirstAsync<(int Id, string Data)>( + "SELECT id, data FROM person WHERE id = 1"); + Assert.That(result.Data, Is.EqualTo(testData)); + + // Schema version should still be 0 + var version = await _connection.QueryFirstAsync("SELECT MAX(id) FROM schema_info"); + Assert.That(version, Is.EqualTo(0)); + } + + private async Task CreateOldSchemaVersion10() + { + await _connection.ExecuteAsync(@" + CREATE TABLE schema_info (id INTEGER PRIMARY KEY, name TEXT NOT NULL, timestamp DATETIME NOT NULL); + INSERT INTO schema_info VALUES (0, 'Initial', '2024-01-01'); + INSERT INTO schema_info VALUES (1, 'Extension', '2024-01-01'); + INSERT INTO schema_info VALUES (2, 'Endpoint', '2024-01-01'); + INSERT INTO schema_info VALUES (3, 'Output', '2024-01-01'); + INSERT INTO schema_info VALUES (4, 'Input', '2024-01-01'); + INSERT INTO schema_info VALUES (5, 'Door', '2024-01-01'); + INSERT INTO schema_info VALUES (6, 'GlobalSetting', '2024-01-01'); + INSERT INTO schema_info VALUES (7, 'Credential', '2024-01-01'); + INSERT INTO schema_info VALUES (8, 'Person', '2024-01-01'); + INSERT INTO schema_info VALUES (9, 'Event', '2024-01-01'); + INSERT INTO schema_info VALUES (10, 'LastEvent', '2024-01-01'); + + CREATE TABLE extension (id TEXT PRIMARY KEY, name TEXT NOT NULL, enabled INTEGER NOT NULL, configuration TEXT NOT NULL); + CREATE TABLE endpoint (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL, driver_id TEXT NOT NULL, endpoint_type INTEGER NOT NULL, extension_id TEXT NOT NULL); + CREATE TABLE output (id INTEGER PRIMARY KEY AUTOINCREMENT, endpoint_id INTEGER NOT NULL, name TEXT NOT NULL); + CREATE TABLE input (id INTEGER PRIMARY KEY AUTOINCREMENT, endpoint_id INTEGER NOT NULL, name TEXT NOT NULL); + CREATE TABLE door (id INTEGER PRIMARY KEY AUTOINCREMENT, in_access_endpoint_id INTEGER, out_access_endpoint_id INTEGER, door_contact_endpoint_id INTEGER, request_to_exit_endpoint_id INTEGER, door_strike_endpoint_id INTEGER, name TEXT NOT NULL); + CREATE TABLE global_setting (name TEXT PRIMARY KEY, value TEXT NOT NULL); + CREATE TABLE person (id INTEGER PRIMARY KEY AUTOINCREMENT, first_name TEXT, last_name TEXT, enabled INTEGER NOT NULL); + CREATE TABLE credential (id INTEGER PRIMARY KEY AUTOINCREMENT, number TEXT NOT NULL, last_event INTEGER); + CREATE TABLE credential_assignment (person_id INTEGER NOT NULL, credential_id INTEGER PRIMARY KEY, enabled INTEGER NOT NULL); + CREATE TABLE event (id INTEGER PRIMARY KEY AUTOINCREMENT, endpoint_id INTEGER NOT NULL, timestamp DATETIME NOT NULL, event_type INTEGER NOT NULL, data TEXT NOT NULL); + "); + } + + private async Task CreateOldSchemaVersion5() + { + await _connection.ExecuteAsync(@" + CREATE TABLE schema_info (id INTEGER PRIMARY KEY, name TEXT NOT NULL, timestamp DATETIME NOT NULL); + INSERT INTO schema_info VALUES (0, 'Initial', '2024-01-01'); + INSERT INTO schema_info VALUES (1, 'Extension', '2024-01-01'); + INSERT INTO schema_info VALUES (2, 'Endpoint', '2024-01-01'); + INSERT INTO schema_info VALUES (3, 'Output', '2024-01-01'); + INSERT INTO schema_info VALUES (4, 'Input', '2024-01-01'); + INSERT INTO schema_info VALUES (5, 'Door', '2024-01-01'); + + CREATE TABLE extension (id TEXT PRIMARY KEY, name TEXT NOT NULL, enabled INTEGER NOT NULL, configuration TEXT NOT NULL); + CREATE TABLE endpoint (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL, driver_id TEXT NOT NULL, endpoint_type INTEGER NOT NULL, extension_id TEXT NOT NULL); + CREATE TABLE output (id INTEGER PRIMARY KEY AUTOINCREMENT, endpoint_id INTEGER NOT NULL, name TEXT NOT NULL); + CREATE TABLE input (id INTEGER PRIMARY KEY AUTOINCREMENT, endpoint_id INTEGER NOT NULL, name TEXT NOT NULL); + CREATE TABLE door (id INTEGER PRIMARY KEY AUTOINCREMENT, in_access_endpoint_id INTEGER, out_access_endpoint_id INTEGER, door_contact_endpoint_id INTEGER, request_to_exit_endpoint_id INTEGER, door_strike_endpoint_id INTEGER, name TEXT NOT NULL); + "); + } + + private async Task CreateNewJsonSchema() + { + await _connection.ExecuteAsync(@" + CREATE TABLE schema_info (id INTEGER PRIMARY KEY, name TEXT NOT NULL, timestamp DATETIME NOT NULL); + INSERT INTO schema_info VALUES (0, 'Initial create with JSON document storage', '2024-01-01'); + + CREATE TABLE extension (id TEXT PRIMARY KEY, data TEXT NOT NULL); + CREATE TABLE endpoint (id INTEGER PRIMARY KEY, data TEXT NOT NULL); + CREATE TABLE output (id INTEGER PRIMARY KEY, data TEXT NOT NULL); + CREATE TABLE input (id INTEGER PRIMARY KEY, data TEXT NOT NULL); + CREATE TABLE door (id INTEGER PRIMARY KEY, data TEXT NOT NULL); + CREATE TABLE global_setting (name TEXT PRIMARY KEY, data TEXT NOT NULL); + CREATE TABLE person (id INTEGER PRIMARY KEY, data TEXT NOT NULL); + CREATE TABLE credential (id INTEGER PRIMARY KEY, data TEXT NOT NULL); + CREATE TABLE credential_assignment (id INTEGER PRIMARY KEY, data TEXT NOT NULL); + CREATE TABLE event (id INTEGER PRIMARY KEY AUTOINCREMENT, data TEXT NOT NULL); + "); + } + + private async Task InsertTestData() + { + await _connection.ExecuteAsync(@" + INSERT INTO extension VALUES ('550e8400-e29b-41d4-a716-446655440000', 'Virtual Driver', 1, '{""readers"":[]}'); + INSERT INTO endpoint VALUES (1, 'Reader 1', 'R1', 0, '550e8400-e29b-41d4-a716-446655440000'); + INSERT INTO endpoint VALUES (2, 'Output 1', 'O1', 1, '550e8400-e29b-41d4-a716-446655440000'); + INSERT INTO output VALUES (1, 2, 'Door Strike'); + INSERT INTO input VALUES (1, 1, 'Door Contact'); + INSERT INTO door VALUES (1, 1, NULL, NULL, NULL, 2, 'Front Door'); + INSERT INTO global_setting VALUES ('timezone', 'America/New_York'); + INSERT INTO person VALUES (1, 'John', 'Doe', 1); + INSERT INTO person VALUES (2, 'Jane', 'Smith', 0); + INSERT INTO credential VALUES (1, '12345678', NULL); + INSERT INTO credential VALUES (2, '87654321', 5); + INSERT INTO credential_assignment VALUES (1, 1, 1); + INSERT INTO credential_assignment VALUES (2, 2, 0); + INSERT INTO event VALUES (1, 1, '2024-01-15 10:30:00', 1, '{""card"":""12345678""}'); + "); + } + + private async Task VerifyExtensionTable() + { + var result = await _connection.QueryFirstAsync<(string Id, string Data)>( + "SELECT id, data FROM extension WHERE id = @id", + new { id = "550e8400-e29b-41d4-a716-446655440000" }); + + var json = JsonDocument.Parse(result.Data); + Assert.That(json.RootElement.GetProperty("name").GetString(), Is.EqualTo("Virtual Driver")); + Assert.That(json.RootElement.GetProperty("enabled").GetBoolean(), Is.True); + } + + private async Task VerifyEndpointTable() + { + var result = await _connection.QueryFirstAsync<(int Id, string Data)>( + "SELECT id, data FROM endpoint WHERE id = 1"); + + var json = JsonDocument.Parse(result.Data); + Assert.That(json.RootElement.GetProperty("name").GetString(), Is.EqualTo("Reader 1")); + Assert.That(json.RootElement.GetProperty("driverEndpointId").GetString(), Is.EqualTo("R1")); + Assert.That(json.RootElement.GetProperty("type").GetInt32(), Is.EqualTo(0)); + } + + private async Task VerifyOutputTable() + { + var result = await _connection.QueryFirstAsync<(int Id, string Data)>( + "SELECT id, data FROM output WHERE id = 1"); + + var json = JsonDocument.Parse(result.Data); + Assert.That(json.RootElement.GetProperty("name").GetString(), Is.EqualTo("Door Strike")); + Assert.That(json.RootElement.GetProperty("endpointId").GetInt32(), Is.EqualTo(2)); + } + + private async Task VerifyInputTable() + { + var result = await _connection.QueryFirstAsync<(int Id, string Data)>( + "SELECT id, data FROM input WHERE id = 1"); + + var json = JsonDocument.Parse(result.Data); + Assert.That(json.RootElement.GetProperty("name").GetString(), Is.EqualTo("Door Contact")); + Assert.That(json.RootElement.GetProperty("endpointId").GetInt32(), Is.EqualTo(1)); + } + + private async Task VerifyDoorTable() + { + var result = await _connection.QueryFirstAsync<(int Id, string Data)>( + "SELECT id, data FROM door WHERE id = 1"); + + var json = JsonDocument.Parse(result.Data); + Assert.That(json.RootElement.GetProperty("name").GetString(), Is.EqualTo("Front Door")); + Assert.That(json.RootElement.GetProperty("inAccessEndpointId").GetInt32(), Is.EqualTo(1)); + Assert.That(json.RootElement.GetProperty("doorStrikeEndpointId").GetInt32(), Is.EqualTo(2)); + } + + private async Task VerifyGlobalSettingTable() + { + var result = await _connection.QueryFirstAsync<(string Name, string Data)>( + "SELECT name, data FROM global_setting WHERE name = 'timezone'"); + + var json = JsonDocument.Parse(result.Data); + Assert.That(json.RootElement.GetProperty("value").GetString(), Is.EqualTo("America/New_York")); + } + + private async Task VerifyPersonTable() + { + var result = await _connection.QueryFirstAsync<(int Id, string Data)>( + "SELECT id, data FROM person WHERE id = 1"); + + var json = JsonDocument.Parse(result.Data); + Assert.That(json.RootElement.GetProperty("firstName").GetString(), Is.EqualTo("John")); + Assert.That(json.RootElement.GetProperty("lastName").GetString(), Is.EqualTo("Doe")); + Assert.That(json.RootElement.GetProperty("enabled").GetBoolean(), Is.True); + } + + private async Task VerifyCredentialTable() + { + var result = await _connection.QueryFirstAsync<(int Id, string Data)>( + "SELECT id, data FROM credential WHERE id = 2"); + + var json = JsonDocument.Parse(result.Data); + Assert.That(json.RootElement.GetProperty("number").GetString(), Is.EqualTo("87654321")); + Assert.That(json.RootElement.GetProperty("lastEvent").GetInt32(), Is.EqualTo(5)); + } + + private async Task VerifyCredentialAssignmentTable() + { + // Old schema: credential_id was PK, now we have our own id + var results = await _connection.QueryAsync<(int Id, string Data)>( + "SELECT id, data FROM credential_assignment"); + + Assert.That(results.Count(), Is.EqualTo(2)); + + var first = results.First(); + var json = JsonDocument.Parse(first.Data); + Assert.That(json.RootElement.GetProperty("credentialId").GetInt32(), Is.EqualTo(1)); + Assert.That(json.RootElement.GetProperty("personId").GetInt32(), Is.EqualTo(1)); + Assert.That(json.RootElement.GetProperty("enabled").GetInt32(), Is.EqualTo(1)); + } + + private async Task VerifyEventTable() + { + var result = await _connection.QueryFirstAsync<(int Id, string Data)>( + "SELECT id, data FROM event WHERE id = 1"); + + var json = JsonDocument.Parse(result.Data); + Assert.That(json.RootElement.GetProperty("endpointId").GetInt32(), Is.EqualTo(1)); + Assert.That(json.RootElement.GetProperty("type").GetInt32(), Is.EqualTo(1)); + } + + private async Task VerifySchemaInfo() + { + var version = await _connection.QueryFirstAsync("SELECT MAX(id) FROM schema_info"); + Assert.That(version, Is.EqualTo(0)); // New JSON schema is version 0 + } +} From 759247fda3741e40f64fd8c7b76fa99c2996017e Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Wed, 4 Feb 2026 11:30:51 -0500 Subject: [PATCH 04/86] Use version 100 for JSON schema, detect old schema on startup - JSON schema uses version 100 (old column-based schema was 0-10) - App refuses to start with old schema, directs user to migration tool - Migration tool sets version to 100 after migrating Co-Authored-By: Claude Opus 4.5 --- .../DataAccess/Migrations/_0000_InitialCreate.cs | 3 ++- src/Aporta.Core/DataAccess/SqLiteDataAccess.cs | 11 ++++++++++- src/Aporta.Migration/Program.cs | 4 ++-- test/Aporta.Core.Tests/DataAccess/MigrationTests.cs | 2 +- test/Aporta.Migration.Tests/MigrationTests.cs | 6 +++--- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs index 3a5b0f0..3bbf68d 100644 --- a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs +++ b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs @@ -6,7 +6,8 @@ namespace Aporta.Core.DataAccess.Migrations { public class _0000_InitialCreate : IMigration { - public int Version => 0; + // Version 100 to distinguish from old column-based schema (versions 0-10) + public int Version => 100; public string Name => "Initial create with JSON document storage"; diff --git a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs index 5d75c8c..7d558a8 100644 --- a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs +++ b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs @@ -82,7 +82,16 @@ public async Task UpdateSchema() } else { - currentVersion = await CurrentVersion(); + currentVersion = await CurrentVersion(); + } + + // Detect old column-based schema (versions 0-10) and require migration tool + if (currentVersion >= 0 && currentVersion <= 10) + { + throw new InvalidOperationException( + $"Database is using old schema (version {currentVersion}). " + + "Please run the Aporta.Migration tool to upgrade to JSON document storage before starting the application. " + + "Usage: dotnet Aporta.Migration.dll "); } using var connection = CreateDbConnection(); diff --git a/src/Aporta.Migration/Program.cs b/src/Aporta.Migration/Program.cs index 212b37c..2d7045c 100644 --- a/src/Aporta.Migration/Program.cs +++ b/src/Aporta.Migration/Program.cs @@ -166,11 +166,11 @@ private async Task TransformToJsonSchemaAsync() // Update schema_info if (!_dryRun) { - // Clear old schema records and insert new + // Clear old schema records and insert new (version 100 = JSON schema) await _connection.ExecuteAsync("DELETE FROM schema_info", transaction: transaction); await _connection.ExecuteAsync( "INSERT INTO schema_info (id, name, timestamp) VALUES (@id, @name, @timestamp)", - new { id = 0, name = "Initial create with JSON document storage", timestamp = DateTime.UtcNow }, + new { id = 100, name = "Initial create with JSON document storage", timestamp = DateTime.UtcNow }, transaction: transaction); } diff --git a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs index 1acf628..5f04896 100644 --- a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs @@ -8,7 +8,7 @@ namespace Aporta.Core.Tests.DataAccess; [TestFixture] public class MigrationTests { - private const int CurrentVersion = 0; + private const int CurrentVersion = 100; private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); private IDbConnection _persistConnection; diff --git a/test/Aporta.Migration.Tests/MigrationTests.cs b/test/Aporta.Migration.Tests/MigrationTests.cs index d95696c..3186ec8 100644 --- a/test/Aporta.Migration.Tests/MigrationTests.cs +++ b/test/Aporta.Migration.Tests/MigrationTests.cs @@ -109,7 +109,7 @@ await _connection.ExecuteAsync( // Schema version should still be 0 var version = await _connection.QueryFirstAsync("SELECT MAX(id) FROM schema_info"); - Assert.That(version, Is.EqualTo(0)); + Assert.That(version, Is.EqualTo(100)); } private async Task CreateOldSchemaVersion10() @@ -164,7 +164,7 @@ private async Task CreateNewJsonSchema() { await _connection.ExecuteAsync(@" CREATE TABLE schema_info (id INTEGER PRIMARY KEY, name TEXT NOT NULL, timestamp DATETIME NOT NULL); - INSERT INTO schema_info VALUES (0, 'Initial create with JSON document storage', '2024-01-01'); + INSERT INTO schema_info VALUES (100, 'Initial create with JSON document storage', '2024-01-01'); CREATE TABLE extension (id TEXT PRIMARY KEY, data TEXT NOT NULL); CREATE TABLE endpoint (id INTEGER PRIMARY KEY, data TEXT NOT NULL); @@ -310,6 +310,6 @@ private async Task VerifyEventTable() private async Task VerifySchemaInfo() { var version = await _connection.QueryFirstAsync("SELECT MAX(id) FROM schema_info"); - Assert.That(version, Is.EqualTo(0)); // New JSON schema is version 0 + Assert.That(version, Is.EqualTo(100)); // New JSON schema is version 0 } } From 213b0de4b0259b540ecd19f5a04626676f560515 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Wed, 4 Feb 2026 23:57:54 -0500 Subject: [PATCH 05/86] Add Z9/Open Community protocol service with loopback tests Aporta now listens as a Z9/Open panel for host connections. The service handles identification handshake, DbChange, and DevActionReq messages with dummy responses as a foundation for data mapping. Co-Authored-By: Claude Opus 4.5 --- src/Aporta.Core/Aporta.Core.csproj | 1 + .../Z9OpenCommunityProtocolService.cs | 219 ++++++++++++++++++ src/Aporta/Aporta.csproj | 1 + src/Aporta/Startup.cs | 1 + src/Aporta/Workers/StartupWorker.cs | 9 +- .../Aporta.Core.Tests.csproj | 1 + .../Z9OpenCommunityProtocolServiceTests.cs | 201 ++++++++++++++++ 7 files changed, 431 insertions(+), 2 deletions(-) create mode 100644 src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs create mode 100644 test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 9ed755b..f7c6bdc 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,6 +11,7 @@ + diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs new file mode 100644 index 0000000..7e5ac01 --- /dev/null +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -0,0 +1,219 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Net; +using System.Net.Sockets; +using System.Threading; +using Microsoft.Extensions.Logging; +using Z9.Protobuf; +using Z9.Spcore.Proto; + +namespace Aporta.Core.Services; + +public class Z9OpenCommunityProtocolService : IDisposable +{ + private readonly ILogger _logger; + private TcpListener _listener; + private Thread _thread; + private volatile bool _stopping; + private TcpClient _client; + private SpCoreMessageInputStream _mis; + private SpCoreMessageOutputStream _mos; + private readonly object _writeLock = new(); + + public int Port { get; private set; } + public bool IsClientConnected { get; private set; } + public bool IsIdentified { get; private set; } + public List ReceivedDbChanges { get; } = new(); + public List ReceivedDevActions { get; } = new(); + public Exception LastException { get; private set; } + + public Z9OpenCommunityProtocolService(ILogger logger) + { + _logger = logger; + } + + public void Start(int port = 7000) + { + _listener = new TcpListener(IPAddress.Any, port); + _listener.Start(); + Port = ((IPEndPoint)_listener.LocalEndpoint).Port; + + _logger.LogInformation("Z9/Open Community protocol service started on port {Port}", Port); + + _thread = new Thread(Run) { IsBackground = true, Name = "Z9OpenCommunityProtocolService" }; + _thread.Start(); + } + + public void Stop() + { + _stopping = true; + _listener?.Stop(); + _client?.Close(); + _thread?.Join(TimeSpan.FromSeconds(5)); + + _logger.LogInformation("Z9/Open Community protocol service stopped"); + } + + public void Dispose() + { + Stop(); + } + + private void Run() + { + try + { + _client = _listener.AcceptTcpClient(); + IsClientConnected = true; + _logger.LogInformation("Z9/Open Community host connected"); + + var stream = _client.GetStream(); + _mis = new SpCoreMessageInputStream(stream); + _mos = new SpCoreMessageOutputStream(stream); + + while (!_stopping) + { + SpCoreMessage message; + try + { + message = _mis.Read(); + } + catch (IOException) + { + if (_stopping) break; + throw; + } + + if (message != null) + { + HandleMessage(message); + } + } + } + catch (SocketException) when (_stopping) + { + // Expected when stopping + } + catch (ObjectDisposedException) when (_stopping) + { + // Expected when stopping + } + catch (EndOfStreamException) + { + _logger.LogInformation("Z9/Open Community host disconnected"); + } + catch (IOException ex) when (ex.InnerException is SocketException) + { + _logger.LogInformation("Z9/Open Community host disconnected"); + } + catch (Exception ex) + { + LastException = ex; + _logger.LogError(ex, "Z9/Open Community protocol service error"); + } + finally + { + IsClientConnected = false; + } + } + + private void HandleMessage(SpCoreMessage message) + { + switch (message.Type) + { + case SpCoreMessage.Types.Type.Ping: + break; + + case SpCoreMessage.Types.Type.Identification: + IsIdentified = true; + _logger.LogInformation("Z9/Open Community host identified"); + SendIdentification(); + break; + + case SpCoreMessage.Types.Type.DbChange: + lock (ReceivedDbChanges) + { + ReceivedDbChanges.Add(message.DbChange); + } + _logger.LogDebug("Received DbChange (requestId={RequestId})", message.DbChange.RequestId); + SendDbChangeResp(message.DbChange.RequestId); + break; + + case SpCoreMessage.Types.Type.DevActionReq: + lock (ReceivedDevActions) + { + ReceivedDevActions.Add(message.DevActionReq); + } + _logger.LogDebug("Received DevActionReq (requestId={RequestId})", message.DevActionReq.RequestId); + SendDevActionResp(message.DevActionReq.RequestId); + break; + + case SpCoreMessage.Types.Type.EvtControl: + break; + + default: + _logger.LogDebug("Ignoring message type {Type}", message.Type); + break; + } + } + + private void SendIdentification() + { + var message = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.Identification, + Identification = new Identification + { + Id = "aporta-panel", + SoftwareVersion = "1.0.0", + ProtocolVersion = "0.1", + MaxBodyLength = SpCoreMessageHeader.MAX_LENGTH, + SpCoreDevMod = DevMod.IoControllerZ9Spcore, + ProtocolCapabilities = new ProtocolCapabilities + { + SupportsIdentificationPassword = false, + SupportsIdentificationPasswordUpstream = false + } + } + }; + + WriteMessage(message); + } + + private void SendDbChangeResp(long requestId) + { + var message = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.DbChangeResp, + DbChangeResp = new DbChangeResp + { + RequestId = requestId + } + }; + + WriteMessage(message); + } + + private void SendDevActionResp(long requestId) + { + var message = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.DevActionResp, + DevActionResp = new DevActionResp + { + RequestId = requestId + } + }; + + WriteMessage(message); + } + + private void WriteMessage(SpCoreMessage message) + { + lock (_writeLock) + { + _mos?.Write(message); + } + } +} diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 1bdcd24..4e14870 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -20,6 +20,7 @@ + diff --git a/src/Aporta/Startup.cs b/src/Aporta/Startup.cs index 6e8fe42..e746031 100644 --- a/src/Aporta/Startup.cs +++ b/src/Aporta/Startup.cs @@ -41,6 +41,7 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSignalR(); services.AddControllersWithViews(); diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index c27dbaa..6de0c4b 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -15,15 +15,18 @@ public class StartupWorker : BackgroundService private readonly IDataAccess _dataAccess; private readonly ExtensionService _extensionService; private readonly AccessService _accessService; + private readonly Z9OpenCommunityProtocolService _z9OpenCommunityProtocolService; - public StartupWorker(IDataAccess dataAccess, - ExtensionService extensionService, + public StartupWorker(IDataAccess dataAccess, + ExtensionService extensionService, AccessService accessService, + Z9OpenCommunityProtocolService z9PanelService, ILogger logger, IHostApplicationLifetime applicationLifetime) { _dataAccess = dataAccess; _extensionService = extensionService; _accessService = accessService; + _z9OpenCommunityProtocolService = z9PanelService; _logger = logger; _applicationLifetime = applicationLifetime; } @@ -36,6 +39,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) await _dataAccess.UpdateSchema(); await _extensionService.Startup(); _accessService.Startup(); + _z9OpenCommunityProtocolService.Start(); } catch (Exception exception) { @@ -48,6 +52,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) stoppingToken.Register(() => { _logger.LogWarning("Application is shutting down"); + _z9OpenCommunityProtocolService.Stop(); _accessService.Shutdown(); _extensionService.Shutdown(); }); diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 45a74fa..7af714e 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,6 +12,7 @@ + diff --git a/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs new file mode 100644 index 0000000..f809d54 --- /dev/null +++ b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs @@ -0,0 +1,201 @@ +using System.Net.Sockets; +using System.Threading; +using Aporta.Core.Services; +using Microsoft.Extensions.Logging.Abstractions; +using NUnit.Framework; +using Z9.Protobuf; +using Z9.Spcore.Proto; + +namespace Aporta.Core.Tests.Services; + +[TestFixture] +public class Z9OpenCommunityProtocolServiceTests +{ + private Z9OpenCommunityProtocolService _z9OpenCommunityProtocolService; + + [SetUp] + public void Setup() + { + _z9OpenCommunityProtocolService = new Z9OpenCommunityProtocolService(NullLogger.Instance); + _z9OpenCommunityProtocolService.Start(0); // OS-assigned port + } + + [TearDown] + public void TearDown() + { + _z9OpenCommunityProtocolService?.Dispose(); + } + + private (TcpClient client, SpCoreMessageInputStream mis, SpCoreMessageOutputStream mos) ConnectAsHost() + { + var client = new TcpClient("127.0.0.1", _z9OpenCommunityProtocolService.Port); + var stream = client.GetStream(); + var mis = new SpCoreMessageInputStream(stream); + var mos = new SpCoreMessageOutputStream(stream); + return (client, mis, mos); + } + + private static void SendIdentification(SpCoreMessageOutputStream mos) + { + var message = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.Identification, + Identification = new Identification + { + Id = "test-host", + SoftwareVersion = "1.0.0-test", + ProtocolVersion = "0.1", + MaxBodyLength = SpCoreMessageHeader.MAX_LENGTH, + SpCoreDevMod = DevMod.IoControllerZ9Spcore, + ProtocolCapabilities = new ProtocolCapabilities + { + SupportsIdentificationPassword = false, + SupportsIdentificationPasswordUpstream = false + } + } + }; + mos.Write(message); + } + + [Test] + public void Identification_HostConnects_BothSidesIdentify() + { + var (client, mis, mos) = ConnectAsHost(); + + try + { + // Send identification from host + SendIdentification(mos); + + // Read panel's identification response + var response = mis.Read(); + Assert.That(response, Is.Not.Null); + Assert.That(response.Type, Is.EqualTo(SpCoreMessage.Types.Type.Identification)); + Assert.That(response.Identification.Id, Is.EqualTo("aporta-panel")); + + // Panel should track state + Thread.Sleep(100); // Allow panel thread to update state + Assert.That(_z9OpenCommunityProtocolService.IsClientConnected, Is.True); + Assert.That(_z9OpenCommunityProtocolService.IsIdentified, Is.True); + } + finally + { + client.Close(); + } + + Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); + } + + [Test] + public void DbChange_HostSendsSchedule_PanelRespondsSuccess() + { + var (client, mis, mos) = ConnectAsHost(); + + try + { + // Identify first + SendIdentification(mos); + var identResponse = mis.Read(); + Assert.That(identResponse.Type, Is.EqualTo(SpCoreMessage.Types.Type.Identification)); + + // Send DbChange + var dbChange = new DbChange(); + dbChange.Sched.Add(new Sched { Unid = 1, Name = "Test Schedule" }); + var dbChangeMsg = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.DbChange, + DbChange = dbChange + }; + dbChangeMsg.DbChange.RequestId = 42; + mos.Write(dbChangeMsg); + + // Read response + var response = mis.Read(); + Assert.That(response, Is.Not.Null); + Assert.That(response.Type, Is.EqualTo(SpCoreMessage.Types.Type.DbChangeResp)); + Assert.That(response.DbChangeResp.RequestId, Is.EqualTo(42)); + Assert.That(response.DbChangeResp.ExceptionCase, Is.EqualTo(DbChangeResp.ExceptionOneofCase.None)); + + lock (_z9OpenCommunityProtocolService.ReceivedDbChanges) + { + Assert.That(_z9OpenCommunityProtocolService.ReceivedDbChanges.Count, Is.EqualTo(1)); + } + } + finally + { + client.Close(); + } + + Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); + } + + [Test] + public void DevActionReq_HostSendsDoorUnlock_PanelRespondsSuccess() + { + var (client, mis, mos) = ConnectAsHost(); + + try + { + // Identify first + SendIdentification(mos); + var identResponse = mis.Read(); + Assert.That(identResponse.Type, Is.EqualTo(SpCoreMessage.Types.Type.Identification)); + + // Send DevActionReq + var devActionMsg = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.DevActionReq, + DevActionReq = new DevActionReq + { + DevUnid = 1, + DevActionType = DevActionType.DoorMomentaryUnlock, + RequestId = 99 + } + }; + mos.Write(devActionMsg); + + // Read response + var response = mis.Read(); + Assert.That(response, Is.Not.Null); + Assert.That(response.Type, Is.EqualTo(SpCoreMessage.Types.Type.DevActionResp)); + Assert.That(response.DevActionResp.RequestId, Is.EqualTo(99)); + Assert.That(response.DevActionResp.ExceptionCase, Is.EqualTo(DevActionResp.ExceptionOneofCase.None)); + + lock (_z9OpenCommunityProtocolService.ReceivedDevActions) + { + Assert.That(_z9OpenCommunityProtocolService.ReceivedDevActions.Count, Is.EqualTo(1)); + } + } + finally + { + client.Close(); + } + + Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); + } + + [Test] + public void ConnectAndDisconnect_CleanLifecycle() + { + var (client, mis, mos) = ConnectAsHost(); + + try + { + SendIdentification(mos); + var identResponse = mis.Read(); + Assert.That(identResponse.Type, Is.EqualTo(SpCoreMessage.Types.Type.Identification)); + + Thread.Sleep(100); + Assert.That(_z9OpenCommunityProtocolService.IsClientConnected, Is.True); + } + finally + { + client.Close(); + } + + // Give the panel time to detect the disconnect + Thread.Sleep(500); + Assert.That(_z9OpenCommunityProtocolService.IsClientConnected, Is.False); + Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); + } +} From 08b1cf7e0e56730173a95d0f1d73e5dad5751a20 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 00:29:04 -0500 Subject: [PATCH 06/86] Map Z9/Open Community Cred to Aporta credentials and persons Uses SpCoreProtoUtil.ToBigInteger() for proper card number conversion, auto-creates Person for each credential, falls back to card number as name when Cred.Name is blank, and skips credentials with no card number. Co-Authored-By: Claude Opus 4.5 --- .../Z9OpenCommunityProtocolService.cs | 90 +++++++- src/Aporta/Workers/StartupWorker.cs | 4 +- .../Z9OpenCommunityProtocolServiceTests.cs | 200 ++++++++++++++++-- 3 files changed, 268 insertions(+), 26 deletions(-) diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 7e5ac01..2f4a04a 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -3,7 +3,11 @@ using System.IO; using System.Net; using System.Net.Sockets; +using System.Numerics; using System.Threading; +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Shared.Models; using Microsoft.Extensions.Logging; using Z9.Protobuf; using Z9.Spcore.Proto; @@ -12,7 +16,11 @@ namespace Aporta.Core.Services; public class Z9OpenCommunityProtocolService : IDisposable { + private const bool AutoCreatePersonForCredential = true; + private readonly ILogger _logger; + private readonly CredentialRepository _credentialRepository; + private readonly PersonRepository _personRepository; private TcpListener _listener; private Thread _thread; private volatile bool _stopping; @@ -28,9 +36,13 @@ public class Z9OpenCommunityProtocolService : IDisposable public List ReceivedDevActions { get; } = new(); public Exception LastException { get; private set; } - public Z9OpenCommunityProtocolService(ILogger logger) + public Z9OpenCommunityProtocolService( + ILogger logger, + IDataAccess dataAccess) { _logger = logger; + _credentialRepository = new CredentialRepository(dataAccess); + _personRepository = new PersonRepository(dataAccess); } public void Start(int port = 7000) @@ -136,7 +148,7 @@ private void HandleMessage(SpCoreMessage message) { ReceivedDbChanges.Add(message.DbChange); } - _logger.LogDebug("Received DbChange (requestId={RequestId})", message.DbChange.RequestId); + HandleDbChange(message.DbChange); SendDbChangeResp(message.DbChange.RequestId); break; @@ -158,6 +170,80 @@ private void HandleMessage(SpCoreMessage message) } } + private void HandleDbChange(DbChange dbChange) + { + _logger.LogDebug("Processing DbChange (requestId={RequestId})", dbChange.RequestId); + + // Not yet supported by Aporta, accepted silently: + // Sched, HolCal, HolType, CredTemplate, DataLayout, DataFormat, Priv + + foreach (var cred in dbChange.Cred) + { + ProcessCredential(cred); + } + + foreach (var credDelete in dbChange.CredDelete) + { + _logger.LogInformation("Deleting credential {Unid}", credDelete); + _credentialRepository.Delete(credDelete).GetAwaiter().GetResult(); + } + + // TODO: Dev - map to Aporta devices/doors + } + + private void ProcessCredential(Cred cred) + { + SpCoreProtoUtil.InitRequired(cred); + + var credNumber = ""; + if (cred.CardPin?.CredNum != null && cred.CardPin.CredNum.BytesCase != BigIntegerData.BytesOneofCase.None) + { + credNumber = SpCoreProtoUtil.ToBigInteger(cred.CardPin.CredNum).ToString(); + } + + if (string.IsNullOrEmpty(credNumber)) + { + _logger.LogWarning( + "Credential Unid={Unid} has no card number, deleting from Aporta if it exists", cred.Unid); + _credentialRepository.RevokePerson(cred.Unid, cred.Unid).GetAwaiter().GetResult(); + _credentialRepository.Delete(cred.Unid).GetAwaiter().GetResult(); + if (AutoCreatePersonForCredential) + { + _personRepository.Delete(cred.Unid).GetAwaiter().GetResult(); + } + return; + } + + var personName = !string.IsNullOrWhiteSpace(cred.Name) ? cred.Name : credNumber; + + _logger.LogInformation("Processing credential Unid={Unid} Number={Number} Name={Name}", + cred.Unid, credNumber, personName); + + if (AutoCreatePersonForCredential) + { + var person = new Person + { + FirstName = personName, + Enabled = cred.Enabled + }; + _personRepository.Upsert(person, cred.Unid).GetAwaiter().GetResult(); + } + + var credential = new Credential + { + Number = credNumber, + Enabled = cred.Enabled + }; + _credentialRepository.Upsert(credential, cred.Unid).GetAwaiter().GetResult(); + + if (AutoCreatePersonForCredential) + { + _credentialRepository.RevokePerson(cred.Unid, cred.Unid).GetAwaiter().GetResult(); + _credentialRepository.AssignPerson(cred.Unid, cred.Unid, cred.Enabled) + .GetAwaiter().GetResult(); + } + } + private void SendIdentification() { var message = new SpCoreMessage diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 6de0c4b..5084d9a 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -20,13 +20,13 @@ public class StartupWorker : BackgroundService public StartupWorker(IDataAccess dataAccess, ExtensionService extensionService, AccessService accessService, - Z9OpenCommunityProtocolService z9PanelService, + Z9OpenCommunityProtocolService z9OpenCommunityProtocolService, ILogger logger, IHostApplicationLifetime applicationLifetime) { _dataAccess = dataAccess; _extensionService = extensionService; _accessService = accessService; - _z9OpenCommunityProtocolService = z9PanelService; + _z9OpenCommunityProtocolService = z9OpenCommunityProtocolService; _logger = logger; _applicationLifetime = applicationLifetime; } diff --git a/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs index f809d54..8d8ff7a 100644 --- a/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs @@ -1,5 +1,10 @@ +using System.Data; using System.Net.Sockets; +using System.Numerics; using System.Threading; +using System.Threading.Tasks; +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; using Aporta.Core.Services; using Microsoft.Extensions.Logging.Abstractions; using NUnit.Framework; @@ -11,19 +16,29 @@ namespace Aporta.Core.Tests.Services; [TestFixture] public class Z9OpenCommunityProtocolServiceTests { + private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); + private IDbConnection _persistConnection; private Z9OpenCommunityProtocolService _z9OpenCommunityProtocolService; [SetUp] - public void Setup() + public async Task Setup() { - _z9OpenCommunityProtocolService = new Z9OpenCommunityProtocolService(NullLogger.Instance); - _z9OpenCommunityProtocolService.Start(0); // OS-assigned port + _persistConnection = _dataAccess.CreateDbConnection(); + _persistConnection.Open(); + await _dataAccess.UpdateSchema(); + + _z9OpenCommunityProtocolService = new Z9OpenCommunityProtocolService( + NullLogger.Instance, + _dataAccess); + _z9OpenCommunityProtocolService.Start(0); } [TearDown] public void TearDown() { _z9OpenCommunityProtocolService?.Dispose(); + _persistConnection?.Close(); + _persistConnection?.Dispose(); } private (TcpClient client, SpCoreMessageInputStream mis, SpCoreMessageOutputStream mos) ConnectAsHost() @@ -64,17 +79,14 @@ public void Identification_HostConnects_BothSidesIdentify() try { - // Send identification from host SendIdentification(mos); - // Read panel's identification response var response = mis.Read(); Assert.That(response, Is.Not.Null); Assert.That(response.Type, Is.EqualTo(SpCoreMessage.Types.Type.Identification)); Assert.That(response.Identification.Id, Is.EqualTo("aporta-panel")); - // Panel should track state - Thread.Sleep(100); // Allow panel thread to update state + Thread.Sleep(100); Assert.That(_z9OpenCommunityProtocolService.IsClientConnected, Is.True); Assert.That(_z9OpenCommunityProtocolService.IsIdentified, Is.True); } @@ -93,12 +105,10 @@ public void DbChange_HostSendsSchedule_PanelRespondsSuccess() try { - // Identify first SendIdentification(mos); var identResponse = mis.Read(); Assert.That(identResponse.Type, Is.EqualTo(SpCoreMessage.Types.Type.Identification)); - // Send DbChange var dbChange = new DbChange(); dbChange.Sched.Add(new Sched { Unid = 1, Name = "Test Schedule" }); var dbChangeMsg = new SpCoreMessage @@ -109,17 +119,54 @@ public void DbChange_HostSendsSchedule_PanelRespondsSuccess() dbChangeMsg.DbChange.RequestId = 42; mos.Write(dbChangeMsg); - // Read response var response = mis.Read(); Assert.That(response, Is.Not.Null); Assert.That(response.Type, Is.EqualTo(SpCoreMessage.Types.Type.DbChangeResp)); Assert.That(response.DbChangeResp.RequestId, Is.EqualTo(42)); Assert.That(response.DbChangeResp.ExceptionCase, Is.EqualTo(DbChangeResp.ExceptionOneofCase.None)); + } + finally + { + client.Close(); + } + + Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); + } + + [Test] + public void DbChange_HostSendsCredential_CredentialAndPersonCreatedInDb() + { + var (client, mis, mos) = ConnectAsHost(); - lock (_z9OpenCommunityProtocolService.ReceivedDbChanges) + try + { + SendIdentification(mos); + var identResponse = mis.Read(); + Assert.That(identResponse.Type, Is.EqualTo(SpCoreMessage.Types.Type.Identification)); + + var dbChange = new DbChange(); + dbChange.Cred.Add(new Cred { - Assert.That(_z9OpenCommunityProtocolService.ReceivedDbChanges.Count, Is.EqualTo(1)); - } + Unid = 100, + Name = "John Doe", + Enabled = true, + CardPin = new CardPin + { + CredNum = SpCoreProtoUtil.ToBigIntegerData(new BigInteger(123456)) + } + }); + var dbChangeMsg = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.DbChange, + DbChange = dbChange + }; + dbChangeMsg.DbChange.RequestId = 50; + mos.Write(dbChangeMsg); + + var response = mis.Read(); + Assert.That(response, Is.Not.Null); + Assert.That(response.Type, Is.EqualTo(SpCoreMessage.Types.Type.DbChangeResp)); + Assert.That(response.DbChangeResp.RequestId, Is.EqualTo(50)); } finally { @@ -127,6 +174,124 @@ public void DbChange_HostSendsSchedule_PanelRespondsSuccess() } Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); + + // Verify credential was created in DB + var credentialRepository = new CredentialRepository(_dataAccess); + var credential = credentialRepository.Get(100).GetAwaiter().GetResult(); + Assert.That(credential, Is.Not.Null); + Assert.That(credential.Number, Is.EqualTo("123456")); + Assert.That(credential.AssignedPersonId, Is.EqualTo(100)); + Assert.That(credential.Enabled, Is.True); + + // Verify person was auto-created + var personRepository = new PersonRepository(_dataAccess); + var person = personRepository.Get(100).GetAwaiter().GetResult(); + Assert.That(person, Is.Not.Null); + Assert.That(person.FirstName, Is.EqualTo("John Doe")); + Assert.That(person.Enabled, Is.True); + } + + [Test] + public void DbChange_HostSendsCredentialWithNoCredNum_CredentialNotCreatedInDb() + { + var (client, mis, mos) = ConnectAsHost(); + + try + { + SendIdentification(mos); + var identResponse = mis.Read(); + Assert.That(identResponse.Type, Is.EqualTo(SpCoreMessage.Types.Type.Identification)); + + var dbChange = new DbChange(); + dbChange.Cred.Add(new Cred + { + Unid = 200, + Name = "No Card", + Enabled = true + }); + var dbChangeMsg = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.DbChange, + DbChange = dbChange + }; + dbChangeMsg.DbChange.RequestId = 60; + mos.Write(dbChangeMsg); + + var response = mis.Read(); + Assert.That(response, Is.Not.Null); + Assert.That(response.Type, Is.EqualTo(SpCoreMessage.Types.Type.DbChangeResp)); + Assert.That(response.DbChangeResp.RequestId, Is.EqualTo(60)); + } + finally + { + client.Close(); + } + + Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); + + // Verify credential was NOT created in DB + var credentialRepository = new CredentialRepository(_dataAccess); + var credential = credentialRepository.Get(200).GetAwaiter().GetResult(); + Assert.That(credential, Is.Null); + + // Verify person was NOT created + var personRepository = new PersonRepository(_dataAccess); + var person = personRepository.Get(200).GetAwaiter().GetResult(); + Assert.That(person, Is.Null); + } + + [Test] + public void DbChange_HostSendsCredentialWithBlankName_UsesCardNumberAsName() + { + var (client, mis, mos) = ConnectAsHost(); + + try + { + SendIdentification(mos); + var identResponse = mis.Read(); + Assert.That(identResponse.Type, Is.EqualTo(SpCoreMessage.Types.Type.Identification)); + + var dbChange = new DbChange(); + dbChange.Cred.Add(new Cred + { + Unid = 300, + Enabled = true, + CardPin = new CardPin + { + CredNum = SpCoreProtoUtil.ToBigIntegerData(new BigInteger(789012)) + } + }); + var dbChangeMsg = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.DbChange, + DbChange = dbChange + }; + dbChangeMsg.DbChange.RequestId = 70; + mos.Write(dbChangeMsg); + + var response = mis.Read(); + Assert.That(response, Is.Not.Null); + Assert.That(response.Type, Is.EqualTo(SpCoreMessage.Types.Type.DbChangeResp)); + Assert.That(response.DbChangeResp.RequestId, Is.EqualTo(70)); + } + finally + { + client.Close(); + } + + Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); + + // Verify credential was created with card number + var credentialRepository = new CredentialRepository(_dataAccess); + var credential = credentialRepository.Get(300).GetAwaiter().GetResult(); + Assert.That(credential, Is.Not.Null); + Assert.That(credential.Number, Is.EqualTo("789012")); + + // Verify person was created with card number as name + var personRepository = new PersonRepository(_dataAccess); + var person = personRepository.Get(300).GetAwaiter().GetResult(); + Assert.That(person, Is.Not.Null); + Assert.That(person.FirstName, Is.EqualTo("789012")); } [Test] @@ -136,12 +301,10 @@ public void DevActionReq_HostSendsDoorUnlock_PanelRespondsSuccess() try { - // Identify first SendIdentification(mos); var identResponse = mis.Read(); Assert.That(identResponse.Type, Is.EqualTo(SpCoreMessage.Types.Type.Identification)); - // Send DevActionReq var devActionMsg = new SpCoreMessage { Type = SpCoreMessage.Types.Type.DevActionReq, @@ -154,17 +317,11 @@ public void DevActionReq_HostSendsDoorUnlock_PanelRespondsSuccess() }; mos.Write(devActionMsg); - // Read response var response = mis.Read(); Assert.That(response, Is.Not.Null); Assert.That(response.Type, Is.EqualTo(SpCoreMessage.Types.Type.DevActionResp)); Assert.That(response.DevActionResp.RequestId, Is.EqualTo(99)); Assert.That(response.DevActionResp.ExceptionCase, Is.EqualTo(DevActionResp.ExceptionOneofCase.None)); - - lock (_z9OpenCommunityProtocolService.ReceivedDevActions) - { - Assert.That(_z9OpenCommunityProtocolService.ReceivedDevActions.Count, Is.EqualTo(1)); - } } finally { @@ -193,7 +350,6 @@ public void ConnectAndDisconnect_CleanLifecycle() client.Close(); } - // Give the panel time to detect the disconnect Thread.Sleep(500); Assert.That(_z9OpenCommunityProtocolService.IsClientConnected, Is.False); Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); From 8d03de63a05e8a7dced827ebcac4ea7edc33799b Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 13:49:46 -0500 Subject: [PATCH 07/86] Flip connection direction so panel connects outbound to host Panel now makes the outbound TCP connection to the Z9/Open Community host instead of listening. Upstream host is configured via command line args --z9OpenCommunityHost and --z9OpenCommunityPort (default 9723). Service only starts when --z9OpenCommunityHost is provided. Also updates Z9.Protobuf.Community from 1.0.0 to 1.0.2. Co-Authored-By: Claude Opus 4.5 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- .../Z9OpenCommunityProtocolService.cs | 26 ++++++-------- src/Aporta/Aporta.csproj | 2 +- src/Aporta/Workers/StartupWorker.cs | 26 ++++++++++++-- .../Aporta.Core.Tests.csproj | 2 +- .../Z9OpenCommunityProtocolServiceTests.cs | 35 +++++++++++-------- 6 files changed, 57 insertions(+), 36 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index f7c6bdc..7c39562 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 2f4a04a..3a35ab5 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Net; using System.Net.Sockets; using System.Numerics; using System.Threading; @@ -21,7 +20,6 @@ public class Z9OpenCommunityProtocolService : IDisposable private readonly ILogger _logger; private readonly CredentialRepository _credentialRepository; private readonly PersonRepository _personRepository; - private TcpListener _listener; private Thread _thread; private volatile bool _stopping; private TcpClient _client; @@ -29,8 +27,7 @@ public class Z9OpenCommunityProtocolService : IDisposable private SpCoreMessageOutputStream _mos; private readonly object _writeLock = new(); - public int Port { get; private set; } - public bool IsClientConnected { get; private set; } + public bool IsConnected { get; private set; } public bool IsIdentified { get; private set; } public List ReceivedDbChanges { get; } = new(); public List ReceivedDevActions { get; } = new(); @@ -45,22 +42,19 @@ public Z9OpenCommunityProtocolService( _personRepository = new PersonRepository(dataAccess); } - public void Start(int port = 7000) + public void Start(string host, int port) { - _listener = new TcpListener(IPAddress.Any, port); - _listener.Start(); - Port = ((IPEndPoint)_listener.LocalEndpoint).Port; + _stopping = false; - _logger.LogInformation("Z9/Open Community protocol service started on port {Port}", Port); + _logger.LogInformation("Z9/Open Community protocol service connecting to {Host}:{Port}", host, port); - _thread = new Thread(Run) { IsBackground = true, Name = "Z9OpenCommunityProtocolService" }; + _thread = new Thread(() => Run(host, port)) { IsBackground = true, Name = "Z9OpenCommunityProtocolService" }; _thread.Start(); } public void Stop() { _stopping = true; - _listener?.Stop(); _client?.Close(); _thread?.Join(TimeSpan.FromSeconds(5)); @@ -72,13 +66,13 @@ public void Dispose() Stop(); } - private void Run() + private void Run(string host, int port) { try { - _client = _listener.AcceptTcpClient(); - IsClientConnected = true; - _logger.LogInformation("Z9/Open Community host connected"); + _client = new TcpClient(host, port); + IsConnected = true; + _logger.LogInformation("Connected to Z9/Open Community host at {Host}:{Port}", host, port); var stream = _client.GetStream(); _mis = new SpCoreMessageInputStream(stream); @@ -126,7 +120,7 @@ private void Run() } finally { - IsClientConnected = false; + IsConnected = false; } } diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 4e14870..3c5c93a 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 5084d9a..8f2aa25 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.Services; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -10,8 +11,11 @@ namespace Aporta.Workers; public class StartupWorker : BackgroundService { + private const int DefaultZ9OpenCommunityPort = 9723; + private readonly IHostApplicationLifetime _applicationLifetime; private readonly ILogger _logger; + private readonly IConfiguration _configuration; private readonly IDataAccess _dataAccess; private readonly ExtensionService _extensionService; private readonly AccessService _accessService; @@ -21,12 +25,14 @@ public StartupWorker(IDataAccess dataAccess, ExtensionService extensionService, AccessService accessService, Z9OpenCommunityProtocolService z9OpenCommunityProtocolService, + IConfiguration configuration, ILogger logger, IHostApplicationLifetime applicationLifetime) { _dataAccess = dataAccess; _extensionService = extensionService; _accessService = accessService; _z9OpenCommunityProtocolService = z9OpenCommunityProtocolService; + _configuration = configuration; _logger = logger; _applicationLifetime = applicationLifetime; } @@ -39,16 +45,30 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) await _dataAccess.UpdateSchema(); await _extensionService.Startup(); _accessService.Startup(); - _z9OpenCommunityProtocolService.Start(); + + var z9OpenCommunityHost = _configuration["z9OpenCommunityHost"]; + if (!string.IsNullOrWhiteSpace(z9OpenCommunityHost)) + { + var z9OpenCommunityPort = int.TryParse(_configuration["z9OpenCommunityPort"], out var port) + ? port + : DefaultZ9OpenCommunityPort; + _z9OpenCommunityProtocolService.Start(z9OpenCommunityHost, z9OpenCommunityPort); + } + else + { + _logger.LogInformation( + "Z9/Open Community protocol service not started" + + " (use --z9OpenCommunityHost to specify upstream host)"); + } } catch (Exception exception) { _logger.LogCritical(exception, "An error occurred during startup"); _applicationLifetime.StopApplication(); } - + _logger.LogInformation("Application completed startup routine"); - + stoppingToken.Register(() => { _logger.LogWarning("Application is shutting down"); diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 7af714e..6efcb66 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs index 8d8ff7a..b4cdb5f 100644 --- a/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs @@ -1,4 +1,5 @@ using System.Data; +using System.Net; using System.Net.Sockets; using System.Numerics; using System.Threading; @@ -19,6 +20,7 @@ public class Z9OpenCommunityProtocolServiceTests private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); private IDbConnection _persistConnection; private Z9OpenCommunityProtocolService _z9OpenCommunityProtocolService; + private TcpListener _hostListener; [SetUp] public async Task Setup() @@ -27,23 +29,28 @@ public async Task Setup() _persistConnection.Open(); await _dataAccess.UpdateSchema(); + _hostListener = new TcpListener(IPAddress.Loopback, 0); + _hostListener.Start(); + var hostPort = ((IPEndPoint)_hostListener.LocalEndpoint).Port; + _z9OpenCommunityProtocolService = new Z9OpenCommunityProtocolService( NullLogger.Instance, _dataAccess); - _z9OpenCommunityProtocolService.Start(0); + _z9OpenCommunityProtocolService.Start("127.0.0.1", hostPort); } [TearDown] public void TearDown() { _z9OpenCommunityProtocolService?.Dispose(); + _hostListener?.Stop(); _persistConnection?.Close(); _persistConnection?.Dispose(); } - private (TcpClient client, SpCoreMessageInputStream mis, SpCoreMessageOutputStream mos) ConnectAsHost() + private (TcpClient client, SpCoreMessageInputStream mis, SpCoreMessageOutputStream mos) AcceptAsHost() { - var client = new TcpClient("127.0.0.1", _z9OpenCommunityProtocolService.Port); + var client = _hostListener.AcceptTcpClient(); var stream = client.GetStream(); var mis = new SpCoreMessageInputStream(stream); var mos = new SpCoreMessageOutputStream(stream); @@ -73,9 +80,9 @@ private static void SendIdentification(SpCoreMessageOutputStream mos) } [Test] - public void Identification_HostConnects_BothSidesIdentify() + public void Identification_PanelConnects_BothSidesIdentify() { - var (client, mis, mos) = ConnectAsHost(); + var (client, mis, mos) = AcceptAsHost(); try { @@ -87,7 +94,7 @@ public void Identification_HostConnects_BothSidesIdentify() Assert.That(response.Identification.Id, Is.EqualTo("aporta-panel")); Thread.Sleep(100); - Assert.That(_z9OpenCommunityProtocolService.IsClientConnected, Is.True); + Assert.That(_z9OpenCommunityProtocolService.IsConnected, Is.True); Assert.That(_z9OpenCommunityProtocolService.IsIdentified, Is.True); } finally @@ -101,7 +108,7 @@ public void Identification_HostConnects_BothSidesIdentify() [Test] public void DbChange_HostSendsSchedule_PanelRespondsSuccess() { - var (client, mis, mos) = ConnectAsHost(); + var (client, mis, mos) = AcceptAsHost(); try { @@ -136,7 +143,7 @@ public void DbChange_HostSendsSchedule_PanelRespondsSuccess() [Test] public void DbChange_HostSendsCredential_CredentialAndPersonCreatedInDb() { - var (client, mis, mos) = ConnectAsHost(); + var (client, mis, mos) = AcceptAsHost(); try { @@ -194,7 +201,7 @@ public void DbChange_HostSendsCredential_CredentialAndPersonCreatedInDb() [Test] public void DbChange_HostSendsCredentialWithNoCredNum_CredentialNotCreatedInDb() { - var (client, mis, mos) = ConnectAsHost(); + var (client, mis, mos) = AcceptAsHost(); try { @@ -243,7 +250,7 @@ public void DbChange_HostSendsCredentialWithNoCredNum_CredentialNotCreatedInDb() [Test] public void DbChange_HostSendsCredentialWithBlankName_UsesCardNumberAsName() { - var (client, mis, mos) = ConnectAsHost(); + var (client, mis, mos) = AcceptAsHost(); try { @@ -297,7 +304,7 @@ public void DbChange_HostSendsCredentialWithBlankName_UsesCardNumberAsName() [Test] public void DevActionReq_HostSendsDoorUnlock_PanelRespondsSuccess() { - var (client, mis, mos) = ConnectAsHost(); + var (client, mis, mos) = AcceptAsHost(); try { @@ -334,7 +341,7 @@ public void DevActionReq_HostSendsDoorUnlock_PanelRespondsSuccess() [Test] public void ConnectAndDisconnect_CleanLifecycle() { - var (client, mis, mos) = ConnectAsHost(); + var (client, mis, mos) = AcceptAsHost(); try { @@ -343,7 +350,7 @@ public void ConnectAndDisconnect_CleanLifecycle() Assert.That(identResponse.Type, Is.EqualTo(SpCoreMessage.Types.Type.Identification)); Thread.Sleep(100); - Assert.That(_z9OpenCommunityProtocolService.IsClientConnected, Is.True); + Assert.That(_z9OpenCommunityProtocolService.IsConnected, Is.True); } finally { @@ -351,7 +358,7 @@ public void ConnectAndDisconnect_CleanLifecycle() } Thread.Sleep(500); - Assert.That(_z9OpenCommunityProtocolService.IsClientConnected, Is.False); + Assert.That(_z9OpenCommunityProtocolService.IsConnected, Is.False); Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); } } From 42affa2957c4529a502dd3cdee1c8ef83460daff Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 13:52:52 -0500 Subject: [PATCH 08/86] Make log file path configurable via appsettings.json Read Logging:File:Path from configuration instead of hardcoding /var/log/aporta.log, which requires root permissions. Development defaults to relative "aporta.log" in working directory. Co-Authored-By: Claude Opus 4.5 --- src/Aporta/Startup.cs | 13 +++++++++++-- src/Aporta/appsettings.Development.json | 3 +++ src/Aporta/appsettings.json | 5 ++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/Aporta/Startup.cs b/src/Aporta/Startup.cs index e746031..8b67140 100644 --- a/src/Aporta/Startup.cs +++ b/src/Aporta/Startup.cs @@ -13,6 +13,7 @@ using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.ResponseCompression; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using NReco.Logging.File; @@ -21,6 +22,13 @@ namespace Aporta; public class Startup { + private readonly IConfiguration _configuration; + + public Startup(IConfiguration configuration) + { + _configuration = configuration; + } + // This method gets called by the runtime. Use this method to add services to the container. // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices(IServiceCollection services) @@ -52,12 +60,13 @@ public void ConfigureServices(IServiceCollection services) new[] { "application/octet-stream" }); }); - // For nix based OSs, write logs to /var/log + // For nix based OSs, write logs to file if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { + var logFilePath = _configuration.GetValue("Logging:File:Path") ?? "/var/log/aporta.log"; services.AddLogging(loggingBuilder => { - loggingBuilder.AddFile("/var/log/aporta.log", options => + loggingBuilder.AddFile(logFilePath, options => { options.Append = true; options.MaxRollingFiles = 10; diff --git a/src/Aporta/appsettings.Development.json b/src/Aporta/appsettings.Development.json index 1e4c961..2e15a89 100644 --- a/src/Aporta/appsettings.Development.json +++ b/src/Aporta/appsettings.Development.json @@ -4,6 +4,9 @@ "Default": "Information", "Microsoft": "Warning", "Microsoft.Hosting.Lifetime": "Information" + }, + "File": { + "Path": "aporta.log" } } } diff --git a/src/Aporta/appsettings.json b/src/Aporta/appsettings.json index 45fe774..1a50858 100644 --- a/src/Aporta/appsettings.json +++ b/src/Aporta/appsettings.json @@ -4,6 +4,9 @@ "Default": "Information", "Microsoft": "Warning", "Microsoft.Hosting.Lifetime": "Information" + }, + "File": { + "Path": "/var/log/aporta.log" } } -} \ No newline at end of file +} From 7a92dc81893384f0f2de534f67e3b5147980d454 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 14:13:50 -0500 Subject: [PATCH 09/86] Fix Z9/Open Community protocol handshake and identification - Send IDENTIFICATION first (initiating side sends before reading) - Use IoControllerCommunity DevMod instead of IoControllerZ9Spcore - Set SupportsIdentificationPassword/Upstream to true - Make panel Id configurable via --z9OpenCommunityId arg Co-Authored-By: Claude Opus 4.5 --- .../Services/Z9OpenCommunityProtocolService.cs | 18 ++++++++++++------ src/Aporta/Workers/StartupWorker.cs | 3 ++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 3a35ab5..5563090 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -26,6 +26,7 @@ public class Z9OpenCommunityProtocolService : IDisposable private SpCoreMessageInputStream _mis; private SpCoreMessageOutputStream _mos; private readonly object _writeLock = new(); + private string _id = "aporta-panel"; public bool IsConnected { get; private set; } public bool IsIdentified { get; private set; } @@ -42,11 +43,13 @@ public Z9OpenCommunityProtocolService( _personRepository = new PersonRepository(dataAccess); } - public void Start(string host, int port) + public void Start(string host, int port, string id = null) { _stopping = false; + if (!string.IsNullOrWhiteSpace(id)) + _id = id; - _logger.LogInformation("Z9/Open Community protocol service connecting to {Host}:{Port}", host, port); + _logger.LogInformation("Z9/Open Community protocol service connecting to {Host}:{Port} id={Id}", host, port, _id); _thread = new Thread(() => Run(host, port)) { IsBackground = true, Name = "Z9OpenCommunityProtocolService" }; _thread.Start(); @@ -78,6 +81,9 @@ private void Run(string host, int port) _mis = new SpCoreMessageInputStream(stream); _mos = new SpCoreMessageOutputStream(stream); + // Initiating side sends identification first + SendIdentification(); + while (!_stopping) { SpCoreMessage message; @@ -245,15 +251,15 @@ private void SendIdentification() Type = SpCoreMessage.Types.Type.Identification, Identification = new Identification { - Id = "aporta-panel", + Id = _id, SoftwareVersion = "1.0.0", ProtocolVersion = "0.1", MaxBodyLength = SpCoreMessageHeader.MAX_LENGTH, - SpCoreDevMod = DevMod.IoControllerZ9Spcore, + SpCoreDevMod = DevMod.IoControllerCommunity, ProtocolCapabilities = new ProtocolCapabilities { - SupportsIdentificationPassword = false, - SupportsIdentificationPasswordUpstream = false + SupportsIdentificationPassword = true, + SupportsIdentificationPasswordUpstream = true } } }; diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 8f2aa25..721bf7c 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -52,7 +52,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) var z9OpenCommunityPort = int.TryParse(_configuration["z9OpenCommunityPort"], out var port) ? port : DefaultZ9OpenCommunityPort; - _z9OpenCommunityProtocolService.Start(z9OpenCommunityHost, z9OpenCommunityPort); + var z9OpenCommunityId = _configuration["z9OpenCommunityId"]; + _z9OpenCommunityProtocolService.Start(z9OpenCommunityHost, z9OpenCommunityPort, z9OpenCommunityId); } else { From bba31399db8a767d15714f60a2bbe39b6eb14717 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 17:37:28 -0500 Subject: [PATCH 10/86] Add OSDP over TCP/IP support and Z9 Dev message processing Added TCP/IP connection support for OSDP readers: - Bus.cs: Added ConnectionType enum (Serial/Tcp), TcpHost, TcpPort properties - OSDPDriver.cs: Handle TCP connections using TcpClientOsdpConnection Added automatic OSDP driver configuration from Z9 Dev messages: - Z9OpenCommunityProtocolService.cs: Process Dev messages to extract OSDP CredReader configurations, fires OsdpConfigurationReceived event - StartupWorker.cs: Subscribe to OsdpConfigurationReceived, automatically enable OSDP driver extension, add TCP bus and device Updated Z9.Protobuf.Community to 1.0.3 for community proto field number fixes. Co-Authored-By: Claude Opus 4.5 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- .../Z9OpenCommunityProtocolService.cs | 88 +++++++++++++++++- src/Aporta/Aporta.csproj | 3 +- src/Aporta/Workers/StartupWorker.cs | 91 +++++++++++++++++++ src/Drivers/Aporta.Drivers.OSDP.Shared/Bus.cs | 34 +++++++ src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs | 33 ++++++- .../Aporta.Core.Tests.csproj | 2 +- 7 files changed, 240 insertions(+), 13 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 7c39562..f514d36 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 5563090..992449b 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -16,10 +16,27 @@ namespace Aporta.Core.Services; public class Z9OpenCommunityProtocolService : IDisposable { private const bool AutoCreatePersonForCredential = true; + private const int DefaultOsdpTcpPort = 9843; private readonly ILogger _logger; private readonly CredentialRepository _credentialRepository; private readonly PersonRepository _personRepository; + + // Received OSDP CredReader configurations from Z9 + private readonly List _osdpReaderConfigs = new(); + + /// + /// OSDP reader configuration extracted from Z9 Dev messages. + /// + public class OsdpReaderConfig + { + public int Unid { get; set; } + public string Name { get; set; } + public string Host { get; set; } + public int TcpPort { get; set; } = DefaultOsdpTcpPort; + public int OsdpAddress { get; set; } + public int BaudRate { get; set; } = 9600; + } private Thread _thread; private volatile bool _stopping; private TcpClient _client; @@ -32,6 +49,7 @@ public class Z9OpenCommunityProtocolService : IDisposable public bool IsIdentified { get; private set; } public List ReceivedDbChanges { get; } = new(); public List ReceivedDevActions { get; } = new(); + public List OsdpReaderConfigs => _osdpReaderConfigs; public Exception LastException { get; private set; } public Z9OpenCommunityProtocolService( @@ -132,6 +150,8 @@ private void Run(string host, int port) private void HandleMessage(SpCoreMessage message) { + _logger.LogInformation("Received message type {Type}", message.Type); + switch (message.Type) { case SpCoreMessage.Types.Type.Ping: @@ -140,7 +160,7 @@ private void HandleMessage(SpCoreMessage message) case SpCoreMessage.Types.Type.Identification: IsIdentified = true; _logger.LogInformation("Z9/Open Community host identified"); - SendIdentification(); + // Don't re-send - we already sent ours as the initiating side break; case SpCoreMessage.Types.Type.DbChange: @@ -157,7 +177,7 @@ private void HandleMessage(SpCoreMessage message) { ReceivedDevActions.Add(message.DevActionReq); } - _logger.LogDebug("Received DevActionReq (requestId={RequestId})", message.DevActionReq.RequestId); + _logger.LogInformation("Received DevActionReq (requestId={RequestId})", message.DevActionReq.RequestId); SendDevActionResp(message.DevActionReq.RequestId); break; @@ -165,14 +185,14 @@ private void HandleMessage(SpCoreMessage message) break; default: - _logger.LogDebug("Ignoring message type {Type}", message.Type); + _logger.LogInformation("Ignoring unhandled message type {Type}", message.Type); break; } } private void HandleDbChange(DbChange dbChange) { - _logger.LogDebug("Processing DbChange (requestId={RequestId})", dbChange.RequestId); + _logger.LogInformation("Processing DbChange (requestId={RequestId})", dbChange.RequestId); // Not yet supported by Aporta, accepted silently: // Sched, HolCal, HolType, CredTemplate, DataLayout, DataFormat, Priv @@ -188,9 +208,67 @@ private void HandleDbChange(DbChange dbChange) _credentialRepository.Delete(credDelete).GetAwaiter().GetResult(); } - // TODO: Dev - map to Aporta devices/doors + // Process Dev messages - extract OSDP reader configurations + foreach (var dev in dbChange.Dev) + { + ProcessDev(dev); + } } + private void ProcessDev(Dev dev) + { + SpCoreProtoUtil.InitRequired(dev); + + // Check if this is an OSDP credential reader + if (dev.DevType != DevType.CredReader) + return; + + var credReaderConfig = dev.ExtCredReader?.CredReaderConfig; + if (credReaderConfig == null) + return; + + // Check for OSDP comm type + if (credReaderConfig.CommType != CredReaderCommType.OsdpHalfDuplex) + return; + + var serialPortAddress = credReaderConfig.SerialPortAddress; + if (string.IsNullOrWhiteSpace(serialPortAddress)) + { + _logger.LogWarning("OSDP CredReader {Name} (unid={Unid}) has no serialPortAddress, skipping", + dev.Name, dev.Unid); + return; + } + + var osdpConfig = new OsdpReaderConfig + { + Unid = dev.Unid, + Name = dev.Name ?? $"OSDP Reader {dev.Unid}", + Host = serialPortAddress, + TcpPort = DefaultOsdpTcpPort, // Z9 doesn't send TCP port, use default + OsdpAddress = dev.Port, // OSDP polling address (0-126) + BaudRate = dev.Speed > 0 ? dev.Speed : 9600 + }; + + _logger.LogInformation( + "Received OSDP CredReader config: Name={Name}, Host={Host}:{TcpPort}, OsdpAddress={OsdpAddress}", + osdpConfig.Name, osdpConfig.Host, osdpConfig.TcpPort, osdpConfig.OsdpAddress); + + lock (_osdpReaderConfigs) + { + // Remove existing config with same unid + _osdpReaderConfigs.RemoveAll(c => c.Unid == osdpConfig.Unid); + _osdpReaderConfigs.Add(osdpConfig); + } + + // Notify that OSDP configuration is available + OsdpConfigurationReceived?.Invoke(this, osdpConfig); + } + + /// + /// Event raised when OSDP reader configuration is received from Z9. + /// + public event EventHandler OsdpConfigurationReceived; + private void ProcessCredential(Cred cred) { SpCoreProtoUtil.InitRequired(cred); diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 3c5c93a..e8bd986 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -13,6 +13,7 @@ + @@ -20,7 +21,7 @@ - + diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 721bf7c..19ba86c 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -1,17 +1,23 @@ using System; +using System.Collections.Generic; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.Services; +using Aporta.Drivers.OSDP.Shared; +using Aporta.Drivers.OSDP.Shared.Actions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using Newtonsoft.Json; namespace Aporta.Workers; public class StartupWorker : BackgroundService { private const int DefaultZ9OpenCommunityPort = 9723; + private static readonly Guid OsdpDriverId = Guid.Parse("D3C5DE68-E019-48D6-AB58-76F4B15CD0D5"); private readonly IHostApplicationLifetime _applicationLifetime; private readonly ILogger _logger; @@ -20,6 +26,7 @@ public class StartupWorker : BackgroundService private readonly ExtensionService _extensionService; private readonly AccessService _accessService; private readonly Z9OpenCommunityProtocolService _z9OpenCommunityProtocolService; + private readonly HashSet _configuredOsdpBuses = new(); public StartupWorker(IDataAccess dataAccess, ExtensionService extensionService, @@ -53,6 +60,10 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) ? port : DefaultZ9OpenCommunityPort; var z9OpenCommunityId = _configuration["z9OpenCommunityId"]; + + // Subscribe to OSDP configuration events before starting the service + _z9OpenCommunityProtocolService.OsdpConfigurationReceived += OnOsdpConfigurationReceived; + _z9OpenCommunityProtocolService.Start(z9OpenCommunityHost, z9OpenCommunityPort, z9OpenCommunityId); } else @@ -73,9 +84,89 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) stoppingToken.Register(() => { _logger.LogWarning("Application is shutting down"); + _z9OpenCommunityProtocolService.OsdpConfigurationReceived -= OnOsdpConfigurationReceived; _z9OpenCommunityProtocolService.Stop(); _accessService.Shutdown(); _extensionService.Shutdown(); }); } + + private void OnOsdpConfigurationReceived(object sender, Z9OpenCommunityProtocolService.OsdpReaderConfig config) + { + Task.Run(async () => + { + try + { + await ConfigureOsdpDriver(config); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to configure OSDP driver for reader {Name}", config.Name); + } + }); + } + + private async Task ConfigureOsdpDriver(Z9OpenCommunityProtocolService.OsdpReaderConfig config) + { + _logger.LogInformation( + "Configuring OSDP driver for reader: {Name} at {Host}:{TcpPort} address={OsdpAddress}", + config.Name, config.Host, config.TcpPort, config.OsdpAddress); + + // Check if OSDP driver extension is available and enabled + var extensions = _extensionService.GetExtensions().ToList(); + var osdpExtension = extensions.FirstOrDefault(e => e.Id == OsdpDriverId); + + if (osdpExtension == null) + { + _logger.LogWarning("OSDP driver extension not found"); + return; + } + + if (!osdpExtension.Enabled) + { + _logger.LogInformation("Enabling OSDP driver extension"); + await _extensionService.EnableExtension(OsdpDriverId, true); + } + + // Create a unique bus identifier based on host:port + var busKey = $"{config.Host}:{config.TcpPort}"; + + // Only add the bus once per host:port combination + if (!_configuredOsdpBuses.Contains(busKey)) + { + _logger.LogInformation("Adding TCP OSDP bus: {BusKey}", busKey); + + var bus = new Bus + { + ConnectionType = ConnectionType.Tcp, + PortName = busKey, // Use as identifier + TcpHost = config.Host, + TcpPort = config.TcpPort, + BaudRate = config.BaudRate + }; + + var busAction = new BusAction { Bus = bus }; + await _extensionService.PerformAction(OsdpDriverId, ActionType.AddSerialBus.ToString(), + JsonConvert.SerializeObject(busAction)); + + _configuredOsdpBuses.Add(busKey); + } + + // Add the device to the bus + _logger.LogInformation("Adding OSDP device: {Name} address={OsdpAddress}", config.Name, config.OsdpAddress); + + var device = new Device + { + Name = config.Name, + Address = (byte)config.OsdpAddress, + PortName = busKey, // Reference to bus + RequireSecurity = false // Start without secure channel for testing + }; + + var deviceAction = new DeviceAction { Device = device }; + await _extensionService.PerformAction(OsdpDriverId, ActionType.AddUpdateDevice.ToString(), + JsonConvert.SerializeObject(deviceAction)); + + _logger.LogInformation("OSDP driver configured for reader: {Name}", config.Name); + } } \ No newline at end of file diff --git a/src/Drivers/Aporta.Drivers.OSDP.Shared/Bus.cs b/src/Drivers/Aporta.Drivers.OSDP.Shared/Bus.cs index b4b1f02..b6ea222 100644 --- a/src/Drivers/Aporta.Drivers.OSDP.Shared/Bus.cs +++ b/src/Drivers/Aporta.Drivers.OSDP.Shared/Bus.cs @@ -2,21 +2,55 @@ namespace Aporta.Drivers.OSDP.Shared; +/// +/// Specifies the type of connection used for OSDP communication. +/// +public enum ConnectionType +{ + /// + /// Serial port connection (RS-485). + /// + Serial, + + /// + /// TCP/IP network connection (OSDP over IP). + /// + Tcp +} + /// /// Represents a bus used for communication. /// public class Bus { + /// + /// Gets or sets the connection type (Serial or TCP). + /// + public ConnectionType ConnectionType { get; set; } = ConnectionType.Serial; + /// /// Gets or sets the name of the port used for communication. + /// Also used as a unique identifier/key for the bus connection. /// public string PortName { get; set; } /// /// Gets or sets the baud rate used for communication. + /// For TCP connections, this is used for OSDP timing simulation. /// public int BaudRate { get; set; } + /// + /// Gets or sets the TCP host address for TCP connections. + /// + public string TcpHost { get; set; } + + /// + /// Gets or sets the TCP port number for TCP connections. + /// Default is 9843 (standard OSDP over IP port). + /// + public int TcpPort { get; set; } = 9843; + /// /// Gets or sets a value indicating whether tracing is enabled. /// Tracing provides runtime logging information for debugging purposes. diff --git a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs index 5efe96b..260b41f 100644 --- a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs +++ b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs @@ -418,10 +418,20 @@ private void StartConnections() { foreach (var bus in _configuration.Buses) { - var connection = new SerialPortOsdpConnection(bus.PortName, bus.BaudRate); - + IOsdpConnection connection; + + if (bus.ConnectionType == ConnectionType.Tcp) + { + _logger.LogInformation("Starting TCP OSDP connection to {Host}:{Port}", bus.TcpHost, bus.TcpPort); + connection = new TcpClientOsdpConnection(bus.TcpHost, bus.TcpPort, bus.BaudRate); + } + else + { + connection = new SerialPortOsdpConnection(bus.PortName, bus.BaudRate); + } + _connections.TryAdd(bus.PortName, connection); - + _portMapping.TryAdd(bus.PortName, _panel.StartConnection(connection, TimeSpan.FromMilliseconds(50), false)); } } @@ -524,9 +534,22 @@ private string AddBus(string parameters) if (!_portMapping.ContainsKey(busAction.Bus.PortName)) { + IOsdpConnection connection; + + if (busAction.Bus.ConnectionType == ConnectionType.Tcp) + { + _logger.LogInformation("Adding TCP OSDP bus connection to {Host}:{Port}", + busAction.Bus.TcpHost, busAction.Bus.TcpPort); + connection = new TcpClientOsdpConnection(busAction.Bus.TcpHost, busAction.Bus.TcpPort, busAction.Bus.BaudRate); + } + else + { + connection = new SerialPortOsdpConnection(busAction.Bus.PortName, busAction.Bus.BaudRate); + } + + _connections.TryAdd(busAction.Bus.PortName, connection); _portMapping.TryAdd(busAction.Bus.PortName, - _panel.StartConnection(new SerialPortOsdpConnection(busAction.Bus.PortName, busAction.Bus.BaudRate), - TimeSpan.FromMilliseconds(50), false)); + _panel.StartConnection(connection, TimeSpan.FromMilliseconds(50), false)); } return string.Empty; diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 6efcb66..986e1af 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + From a7b5e9d10124cda1eccc7c56fad9106087275c71 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 18:21:02 -0500 Subject: [PATCH 11/86] Add CRED_READER_ONLINE/OFFLINE event support for Z9 Open Community - OSDPDriver: Add NotifyEndpointOnlineStatus() to raise OnlineStatusChanged events when OSDP devices come online/offline - OSDPDriver: Add try-catch in PanelOnConnectionStatusChanged to prevent silent async exceptions - ExtensionService: Forward OnlineStatusChanged events from drivers - Z9OpenCommunityProtocolService: Add endpoint-to-config mapping and SendCredReaderOnlineEvent() to send EVT messages to Z9 - StartupWorker: Disable OSDP extension in Z9 Open Community mode until config is received from the host, subscribe to OnlineStatusChanged Co-Authored-By: Claude Opus 4.5 --- src/Aporta.Core/Services/ExtensionService.cs | 11 ++- .../Z9OpenCommunityProtocolService.cs | 85 +++++++++++++++++++ src/Aporta/Workers/StartupWorker.cs | 39 +++++++++ src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs | 34 +++++++- 4 files changed, 165 insertions(+), 4 deletions(-) diff --git a/src/Aporta.Core/Services/ExtensionService.cs b/src/Aporta.Core/Services/ExtensionService.cs index 09b9e27..f4bc0ce 100644 --- a/src/Aporta.Core/Services/ExtensionService.cs +++ b/src/Aporta.Core/Services/ExtensionService.cs @@ -146,9 +146,11 @@ public Shared.Models.Extension GetExtension(Guid extensionId) } public event EventHandler AccessCredentialReceived; - + public event EventHandler StateChanged; + public event EventHandler OnlineStatusChanged; + [MethodImpl(MethodImplOptions.NoInlining)] private async Task DiscoverExtensions() { @@ -228,6 +230,7 @@ private void LoadExtension(ExtensionHost extension) extension.Driver.UpdatedEndpoints += DriverOnUpdatedEndpoints; extension.Driver.AccessCredentialReceived += DriverOnAccessCredentialReceived; extension.Driver.StateChanged += DriverOnStateChanged; + extension.Driver.OnlineStatusChanged += DriverOnOnlineStatusChanged; extension.Driver.Load(extension.Configuration, dataEncryption, loggerFactory); extension.Configuration = extension.Driver.CurrentConfiguration(); @@ -331,6 +334,11 @@ private void DriverOnStateChanged(object sender, StateChangedEventArgs eventArgs StateChanged?.Invoke(this, eventArgs); } + private void DriverOnOnlineStatusChanged(object sender, OnlineStatusChangedEventArgs eventArgs) + { + OnlineStatusChanged?.Invoke(this, eventArgs); + } + private static IEnumerable EndpointsToBeInserted(IHardwareDriver driver, Endpoint[] existingEndpoints) { @@ -397,6 +405,7 @@ private void UnloadExtension(ExtensionHost extension) extension.Driver.UpdatedEndpoints -= DriverOnUpdatedEndpoints; extension.Driver.AccessCredentialReceived -= DriverOnAccessCredentialReceived; extension.Driver.StateChanged -= DriverOnStateChanged; + extension.Driver.OnlineStatusChanged -= DriverOnOnlineStatusChanged; extension.Host.Unload(); extension.Loaded = false; diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 992449b..b2b0fe5 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -25,6 +25,10 @@ public class Z9OpenCommunityProtocolService : IDisposable // Received OSDP CredReader configurations from Z9 private readonly List _osdpReaderConfigs = new(); + // Mapping from OSDP endpoint ID prefix to Z9 device unid + // Key format: "{host}:{port}:{osdpAddress}" (e.g., "localhost:9843:0") + private readonly Dictionary _endpointToConfig = new(); + /// /// OSDP reader configuration extracted from Z9 Dev messages. /// @@ -260,6 +264,13 @@ private void ProcessDev(Dev dev) _osdpReaderConfigs.Add(osdpConfig); } + // Store mapping from endpoint ID prefix to config for event correlation + var endpointIdPrefix = $"{osdpConfig.Host}:{osdpConfig.TcpPort}:{osdpConfig.OsdpAddress}"; + lock (_endpointToConfig) + { + _endpointToConfig[endpointIdPrefix] = osdpConfig; + } + // Notify that OSDP configuration is available OsdpConfigurationReceived?.Invoke(this, osdpConfig); } @@ -373,6 +384,80 @@ private void SendDevActionResp(long requestId) WriteMessage(message); } + /// + /// Gets the OsdpReaderConfig for an endpoint ID, if available. + /// + /// The OSDP endpoint ID (format: "host:port:address:R#") + /// The config if found, null otherwise. + public OsdpReaderConfig GetConfigForEndpoint(string endpointId) + { + if (string.IsNullOrEmpty(endpointId)) + return null; + + // Endpoint ID format: "{host}:{port}:{address}:R{readerNum}" + // We need to extract "{host}:{port}:{address}" to match our mapping + var parts = endpointId.Split(':'); + if (parts.Length < 3) + return null; + + // For "localhost:9843:0:R0" we want "localhost:9843:0" + var endpointIdPrefix = $"{parts[0]}:{parts[1]}:{parts[2]}"; + + lock (_endpointToConfig) + { + return _endpointToConfig.TryGetValue(endpointIdPrefix, out var config) ? config : null; + } + } + + /// + /// Sends a CRED_READER_ONLINE or CRED_READER_OFFLINE event to Z9. + /// + /// The OSDP reader configuration. + /// True if reader came online, false if offline. + public void SendCredReaderOnlineEvent(OsdpReaderConfig config, bool isOnline) + { + if (config == null) + { + _logger.LogWarning("Cannot send cred reader event: config is null"); + return; + } + + if (!IsConnected) + { + _logger.LogWarning("Cannot send cred reader event: not connected"); + return; + } + + var evtCode = isOnline ? EvtCode.CredReaderOnline : EvtCode.CredReaderOffline; + var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); + + var evt = new Evt + { + EvtCode = evtCode, + HwTime = new DateTimeData { Millis = nowMillis }, + DbTime = new DateTimeData { Millis = nowMillis }, + Consumed = false, + Priority = 0, + EvtDevRef = new EvtDevRef + { + Unid = config.Unid, + Name = config.Name, + DevType = DevType.CredReader + } + }; + + var message = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.Evt + }; + message.Evt.Add(evt); + + _logger.LogInformation("Sending {EvtCode} event for reader {Name} (unid={Unid})", + evtCode, config.Name, config.Unid); + + WriteMessage(message); + } + private void WriteMessage(SpCoreMessage message) { lock (_writeLock) diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 19ba86c..3645231 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -6,6 +6,7 @@ using Aporta.Core.DataAccess; using Aporta.Core.Services; using Aporta.Drivers.OSDP.Shared; +using Aporta.Extensions.Hardware; using Aporta.Drivers.OSDP.Shared.Actions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; @@ -61,9 +62,16 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) : DefaultZ9OpenCommunityPort; var z9OpenCommunityId = _configuration["z9OpenCommunityId"]; + // In Z9 Open Community mode, disable OSDP extension until we receive config from Z9 + // This prevents the driver from auto-connecting using stale saved configuration + await DisableOsdpExtensionForZ9OpenCommunityMode(); + // Subscribe to OSDP configuration events before starting the service _z9OpenCommunityProtocolService.OsdpConfigurationReceived += OnOsdpConfigurationReceived; + // Subscribe to device online status changes to send events back to Z9 + _extensionService.OnlineStatusChanged += OnOnlineStatusChanged; + _z9OpenCommunityProtocolService.Start(z9OpenCommunityHost, z9OpenCommunityPort, z9OpenCommunityId); } else @@ -84,6 +92,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) stoppingToken.Register(() => { _logger.LogWarning("Application is shutting down"); + _extensionService.OnlineStatusChanged -= OnOnlineStatusChanged; _z9OpenCommunityProtocolService.OsdpConfigurationReceived -= OnOsdpConfigurationReceived; _z9OpenCommunityProtocolService.Stop(); _accessService.Shutdown(); @@ -91,6 +100,19 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) }); } + private async Task DisableOsdpExtensionForZ9OpenCommunityMode() + { + var extensions = _extensionService.GetExtensions().ToList(); + var osdpExtension = extensions.FirstOrDefault(e => e.Id == OsdpDriverId); + + if (osdpExtension is { Enabled: true }) + { + _logger.LogInformation( + "Z9 Open Community mode: Disabling OSDP extension until configuration is received from the host"); + await _extensionService.EnableExtension(OsdpDriverId, false); + } + } + private void OnOsdpConfigurationReceived(object sender, Z9OpenCommunityProtocolService.OsdpReaderConfig config) { Task.Run(async () => @@ -169,4 +191,21 @@ await _extensionService.PerformAction(OsdpDriverId, ActionType.AddUpdateDevice.T _logger.LogInformation("OSDP driver configured for reader: {Name}", config.Name); } + + private void OnOnlineStatusChanged(object sender, OnlineStatusChangedEventArgs e) + { + // Get the Z9 config for this endpoint to send event with correct device unid + var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(e.Endpoint?.Id); + if (config == null) + { + _logger.LogDebug("No Z9 config found for endpoint {EndpointId}, skipping event", + e.Endpoint?.Id); + return; + } + + _logger.LogInformation("OSDP reader {Name} is now {Status}", + config.Name, e.IsOnline ? "online" : "offline"); + + _z9OpenCommunityProtocolService.SendCredReaderOnlineEvent(config, e.IsOnline); + } } \ No newline at end of file diff --git a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs index 260b41f..d1bc5cb 100644 --- a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs +++ b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs @@ -107,9 +107,11 @@ private void PanelOnConnectionStatusChanged(object sender, ControlPanel.Connecti { Task.Run(async () => { - var matchingBus = _configuration.Buses.Single(bus => - bus.PortName == _portMapping.First(keyValue => keyValue.Value == eventArgs.ConnectionId).Key); - var matchingDevice = matchingBus.Devices.First(device => device.Address == eventArgs.Address); + try + { + var matchingBus = _configuration.Buses.Single(bus => + bus.PortName == _portMapping.First(keyValue => keyValue.Value == eventArgs.ConnectionId).Key); + var matchingDevice = matchingBus.Devices.First(device => device.Address == eventArgs.Address); matchingDevice.KeyMismatch = false; @@ -120,6 +122,9 @@ private void PanelOnConnectionStatusChanged(object sender, ControlPanel.Connecti matchingDevice.IsConnected = false; matchingDevice.IdentityNotMatched = false; + // Notify that all endpoints on this device are now offline + NotifyEndpointOnlineStatus(matchingBus.PortName, matchingDevice.Address, false); + OnUpdatedEndpoints(); return; case true: @@ -153,6 +158,10 @@ private void PanelOnConnectionStatusChanged(object sender, ControlPanel.Connecti } matchingDevice.IsConnected = true; + + // Notify that all endpoints on this device are now online + NotifyEndpointOnlineStatus(matchingBus.PortName, matchingDevice.Address, true); + OnUpdatedEndpoints(); if (matchingDevice.PKOCEnabled) @@ -173,6 +182,12 @@ private void PanelOnConnectionStatusChanged(object sender, ControlPanel.Connecti return; } } + } + catch (Exception ex) + { + _logger.LogError(ex, "Error in PanelOnConnectionStatusChanged: ConnectionId={ConnectionId} Address={Address}", + eventArgs.ConnectionId, eventArgs.Address); + } }); } @@ -769,4 +784,17 @@ protected virtual void OnOnlineStatusChanged(OnlineStatusChangedEventArgs e) { OnlineStatusChanged?.Invoke(this, e); } + + private void NotifyEndpointOnlineStatus(string portName, byte address, bool isOnline) + { + // Find all endpoints that match the given bus port name and device address + // Endpoint ID format: "{portName}:{address}:..." (e.g., "localhost:9843:0:R0") + var endpointPrefix = $"{portName}:{address}:"; + + foreach (var endpoint in _endpoints.Where(e => e.Id.StartsWith(endpointPrefix))) + { + _logger.LogInformation("Endpoint {EndpointId} is now {Status}", endpoint.Id, isOnline ? "online" : "offline"); + OnOnlineStatusChanged(new OnlineStatusChangedEventArgs(endpoint, isOnline)); + } + } } \ No newline at end of file From 312ed54a2906a8b48988e714b64ca9e405da3c72 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 19:25:00 -0500 Subject: [PATCH 12/86] Fix OSDP online status notification for Z9 integration test - Fix host/port parsing in Z9OpenCommunityProtocolService to correctly handle serialPortAddress that already contains port (e.g., "localhost:9843") - Add constructor to OnlineStatusChangedEventArgs for endpoint notifications - Add --cleanDatabase CLI argument to delete database on startup for testing - Reorder startup to disable OSDP extension BEFORE ExtensionService.Startup() to prevent loading stale configuration - Use direct database access to disable OSDP since ExtensionService isn't started yet when we need to clear the config - Add debug logging to OSDPDriver for troubleshooting device online flow Co-Authored-By: Claude Opus 4.5 --- .../Z9OpenCommunityProtocolService.cs | 18 +++- .../Hardware/OnlineStatusChangedEventArgs.cs | 9 +- src/Aporta/Workers/StartupWorker.cs | 88 ++++++++++++++++--- src/Aporta/appsettings.Development.json | 3 +- src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs | 23 ++++- 5 files changed, 122 insertions(+), 19 deletions(-) diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index b2b0fe5..76dd6ce 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -243,12 +243,26 @@ private void ProcessDev(Dev dev) return; } + // Parse host and port from serialPortAddress (e.g., "localhost:9843" or just "localhost") + string host; + int tcpPort; + var colonIndex = serialPortAddress.LastIndexOf(':'); + if (colonIndex > 0 && int.TryParse(serialPortAddress.Substring(colonIndex + 1), out tcpPort)) + { + host = serialPortAddress.Substring(0, colonIndex); + } + else + { + host = serialPortAddress; + tcpPort = DefaultOsdpTcpPort; + } + var osdpConfig = new OsdpReaderConfig { Unid = dev.Unid, Name = dev.Name ?? $"OSDP Reader {dev.Unid}", - Host = serialPortAddress, - TcpPort = DefaultOsdpTcpPort, // Z9 doesn't send TCP port, use default + Host = host, + TcpPort = tcpPort, OsdpAddress = dev.Port, // OSDP polling address (0-126) BaudRate = dev.Speed > 0 ? dev.Speed : 9600 }; diff --git a/src/Aporta.Extensions/Hardware/OnlineStatusChangedEventArgs.cs b/src/Aporta.Extensions/Hardware/OnlineStatusChangedEventArgs.cs index f044726..e4b9fb1 100644 --- a/src/Aporta.Extensions/Hardware/OnlineStatusChangedEventArgs.cs +++ b/src/Aporta.Extensions/Hardware/OnlineStatusChangedEventArgs.cs @@ -3,10 +3,15 @@ namespace Aporta.Extensions.Hardware; -// ReSharper disable once ClassNeverInstantiated.Global public class OnlineStatusChangedEventArgs { public IEndpoint Endpoint { get; } - + public bool IsOnline { get; } + + public OnlineStatusChangedEventArgs(IEndpoint endpoint, bool isOnline) + { + Endpoint = endpoint; + IsOnline = isOnline; + } } \ No newline at end of file diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 3645231..8cd499f 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text.Json; using System.Threading; using System.Threading.Tasks; using Aporta.Core.DataAccess; @@ -8,6 +9,7 @@ using Aporta.Drivers.OSDP.Shared; using Aporta.Extensions.Hardware; using Aporta.Drivers.OSDP.Shared.Actions; +using Dapper; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -50,22 +52,34 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) _logger.LogInformation("Application is starting up services"); try { + // Check for --cleanDatabase argument to delete existing database + var cleanDatabase = _configuration.GetValue("cleanDatabase"); + if (cleanDatabase) + { + DeleteDatabaseFile(); + } + await _dataAccess.UpdateSchema(); + + // Check if we're in Z9 Open Community mode BEFORE starting extensions + // This prevents OSDP from auto-connecting using stale saved configuration + var z9OpenCommunityHost = _configuration["z9OpenCommunityHost"]; + var isZ9OpenCommunityMode = !string.IsNullOrWhiteSpace(z9OpenCommunityHost); + if (isZ9OpenCommunityMode) + { + await DisableOsdpExtensionForZ9OpenCommunityMode(); + } + await _extensionService.Startup(); _accessService.Startup(); - var z9OpenCommunityHost = _configuration["z9OpenCommunityHost"]; - if (!string.IsNullOrWhiteSpace(z9OpenCommunityHost)) + if (isZ9OpenCommunityMode) { var z9OpenCommunityPort = int.TryParse(_configuration["z9OpenCommunityPort"], out var port) ? port : DefaultZ9OpenCommunityPort; var z9OpenCommunityId = _configuration["z9OpenCommunityId"]; - // In Z9 Open Community mode, disable OSDP extension until we receive config from Z9 - // This prevents the driver from auto-connecting using stale saved configuration - await DisableOsdpExtensionForZ9OpenCommunityMode(); - // Subscribe to OSDP configuration events before starting the service _z9OpenCommunityProtocolService.OsdpConfigurationReceived += OnOsdpConfigurationReceived; @@ -100,17 +114,67 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) }); } + private void DeleteDatabaseFile() + { + // Database file is stored in Data/Aporta.sqlite relative to the assembly location + var assemblyPath = System.Reflection.Assembly.GetEntryAssembly()?.Location; + var dataDir = System.IO.Path.GetDirectoryName(assemblyPath) ?? Environment.CurrentDirectory; + var dbPath = System.IO.Path.Combine(dataDir, "Data", "Aporta.sqlite"); + + if (System.IO.File.Exists(dbPath)) + { + _logger.LogInformation("Deleting existing database file: {DbPath}", dbPath); + System.IO.File.Delete(dbPath); + } + else + { + _logger.LogDebug("No database file to delete at: {DbPath}", dbPath); + } + } + private async Task DisableOsdpExtensionForZ9OpenCommunityMode() { - var extensions = _extensionService.GetExtensions().ToList(); - var osdpExtension = extensions.FirstOrDefault(e => e.Id == OsdpDriverId); + // Use direct database access because ExtensionService hasn't been started yet + // This ensures OSDP extension won't be loaded at startup with stale config + using var connection = _dataAccess.CreateDbConnection(); + connection.Open(); + + var data = await connection.QueryFirstOrDefaultAsync( + "SELECT data FROM extension WHERE id = @id", + new { id = OsdpDriverId.ToString() }); + + if (data == null) + { + _logger.LogDebug("OSDP extension not found in database, nothing to disable"); + return; + } + + _logger.LogInformation( + "Z9 Open Community mode: Disabling OSDP extension and clearing saved configuration"); + + // Set enabled=false AND clear the configuration to prevent stale buses/devices + // from being loaded when the extension is re-enabled + using var stream = new System.IO.MemoryStream(); + using var writer = new Utf8JsonWriter(stream); + writer.WriteStartObject(); - if (osdpExtension is { Enabled: true }) + using var doc = JsonDocument.Parse(data); + foreach (var prop in doc.RootElement.EnumerateObject()) { - _logger.LogInformation( - "Z9 Open Community mode: Disabling OSDP extension until configuration is received from the host"); - await _extensionService.EnableExtension(OsdpDriverId, false); + if (prop.Name == "enabled") + writer.WriteBoolean("enabled", false); + else if (prop.Name == "configuration") + writer.WriteNull("configuration"); // Clear stale config + else + prop.WriteTo(writer); } + writer.WriteEndObject(); + writer.Flush(); + var newData = System.Text.Encoding.UTF8.GetString(stream.ToArray()); + + await connection.ExecuteAsync( + "UPDATE extension SET data = @data WHERE id = @id", + new { id = OsdpDriverId.ToString(), data = newData }); } private void OnOsdpConfigurationReceived(object sender, Z9OpenCommunityProtocolService.OsdpReaderConfig config) diff --git a/src/Aporta/appsettings.Development.json b/src/Aporta/appsettings.Development.json index 2e15a89..885c058 100644 --- a/src/Aporta/appsettings.Development.json +++ b/src/Aporta/appsettings.Development.json @@ -3,7 +3,8 @@ "LogLevel": { "Default": "Information", "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "Microsoft.Hosting.Lifetime": "Information", + "OSDP.Net": "Debug" }, "File": { "Path": "aporta.log" diff --git a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs index d1bc5cb..aaf0a5c 100644 --- a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs +++ b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs @@ -129,7 +129,7 @@ private void PanelOnConnectionStatusChanged(object sender, ControlPanel.Connecti return; case true: { - _logger.LogInformation("Device \'{MatchingDeviceName}\' is online", matchingDevice.Name); + _logger.LogInformation("Device \'{MatchingDeviceName}\' is online, SecureMode={SecureMode}", matchingDevice.Name, matchingDevice.SecureMode); if (matchingDevice.SecureMode == SecureMode.Install) { @@ -143,19 +143,25 @@ private void PanelOnConnectionStatusChanged(object sender, ControlPanel.Connecti return; } + _logger.LogInformation("Calling ProcessDeviceIdentification..."); if (!await ProcessDeviceIdentification(eventArgs, matchingDevice).ConfigureAwait(false)) { + _logger.LogWarning("ProcessDeviceIdentification returned false"); matchingDevice.IsConnected = false; OnUpdatedEndpoints(); return; } + _logger.LogInformation("ProcessDeviceIdentification succeeded"); + _logger.LogInformation("Calling ProcessDeviceCapabilities..."); if (!await ProcessDeviceCapabilities(eventArgs, matchingDevice).ConfigureAwait(false)) { + _logger.LogWarning("ProcessDeviceCapabilities returned false"); matchingDevice.IsConnected = false; OnUpdatedEndpoints(); return; } + _logger.LogInformation("ProcessDeviceCapabilities succeeded"); matchingDevice.IsConnected = true; @@ -193,10 +199,13 @@ private void PanelOnConnectionStatusChanged(object sender, ControlPanel.Connecti private async Task ProcessDeviceCapabilities(ControlPanel.ConnectionStatusEventArgs eventArgs, Device matchingDevice) { + _logger.LogInformation("ProcessDeviceCapabilities starting for '{MatchingDeviceName}'", matchingDevice.Name); DeviceCapabilities capabilities; try { + _logger.LogDebug("Requesting device capabilities from OSDP panel..."); capabilities = await _panel.DeviceCapabilities(eventArgs.ConnectionId, eventArgs.Address).ConfigureAwait(false); + _logger.LogDebug("Device capabilities received: {Count} capabilities", capabilities?.Capabilities?.Count() ?? 0); } catch (Exception exception) { @@ -263,10 +272,14 @@ private async Task ProcessDeviceCapabilities(ControlPanel.ConnectionStatus private async Task ProcessDeviceIdentification(ControlPanel.ConnectionStatusEventArgs eventArgs, Device matchingDevice) { + _logger.LogInformation("ProcessDeviceIdentification starting for '{MatchingDeviceName}'", matchingDevice.Name); DeviceIdentification identification; try { + _logger.LogDebug("Requesting device identification from OSDP panel..."); identification = await _panel.IdReport(eventArgs.ConnectionId, eventArgs.Address).ConfigureAwait(false); + _logger.LogDebug("Device identification received: VendorCode={VendorCode}", + identification?.VendorCode != null ? BitConverter.ToString(identification.VendorCode.ToArray()) : "null"); } catch (Exception exception) { @@ -790,8 +803,14 @@ private void NotifyEndpointOnlineStatus(string portName, byte address, bool isOn // Find all endpoints that match the given bus port name and device address // Endpoint ID format: "{portName}:{address}:..." (e.g., "localhost:9843:0:R0") var endpointPrefix = $"{portName}:{address}:"; + _logger.LogInformation("NotifyEndpointOnlineStatus: portName={PortName}, address={Address}, prefix={Prefix}, total endpoints={Count}", + portName, address, endpointPrefix, _endpoints.Count); - foreach (var endpoint in _endpoints.Where(e => e.Id.StartsWith(endpointPrefix))) + var matchingEndpoints = _endpoints.Where(e => e.Id.StartsWith(endpointPrefix)).ToList(); + _logger.LogInformation("Found {MatchCount} matching endpoints for prefix '{Prefix}'", + matchingEndpoints.Count, endpointPrefix); + + foreach (var endpoint in matchingEndpoints) { _logger.LogInformation("Endpoint {EndpointId} is now {Status}", endpoint.Id, isOnline ? "online" : "offline"); OnOnlineStatusChanged(new OnlineStatusChangedEventArgs(endpoint, isOnline)); From b8fbc57e1904908175d8d23bcbbc726dbd0c1159 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 19:52:51 -0500 Subject: [PATCH 13/86] Add access event support and fix TCP endpoint ID parsing - Add SendAccessEvent method to Z9OpenCommunityProtocolService for sending access granted/denied events back to Z9 - Add OnAccessCredentialReceived handler in StartupWorker to forward card reads from OSDP readers to Z9 as access denied events (unknown credential) - Fix OSDPDriver endpoint ID parsing for TCP connections where the port name contains a colon (e.g., "localhost:9843"). The previous Split(":")[0] logic broke when the port name itself contained colons. - Add ParseEndpointId helper method to properly extract port name and OSDP address from endpoint IDs regardless of connection type Co-Authored-By: Claude Opus 4.5 --- .../Z9OpenCommunityProtocolService.cs | 61 +++++++++++++++++++ src/Aporta/Workers/StartupWorker.cs | 30 +++++++++ src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs | 54 +++++++++++++--- 3 files changed, 136 insertions(+), 9 deletions(-) diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 76dd6ce..38bf57a 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -472,6 +472,67 @@ public void SendCredReaderOnlineEvent(OsdpReaderConfig config, bool isOnline) WriteMessage(message); } + /// + /// Sends an access event (granted or denied) to Z9. + /// + /// The OSDP reader configuration (to determine the device). + /// True if access was granted, false if denied. + /// The card number that was presented (for logging/display). + /// Optional sub-code providing the reason for denial. + public void SendAccessEvent(OsdpReaderConfig config, bool isGranted, string cardNumber, EvtSubCode subCode = EvtSubCode.AccessDeniedUnknownCredNum) + { + if (config == null) + { + _logger.LogWarning("Cannot send access event: config is null"); + return; + } + + if (!IsConnected) + { + _logger.LogWarning("Cannot send access event: not connected"); + return; + } + + var evtCode = isGranted ? EvtCode.DoorAccessGranted : EvtCode.DoorAccessDenied; + var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); + + var evt = new Evt + { + EvtCode = evtCode, + EvtSubCode = subCode, + HwTime = new DateTimeData { Millis = nowMillis }, + DbTime = new DateTimeData { Millis = nowMillis }, + Consumed = false, + Priority = 0, + EvtDevRef = new EvtDevRef + { + Unid = config.Unid, + Name = config.Name, + DevType = DevType.CredReader + } + }; + + // Add card number to event via EvtCredRef if available + if (!string.IsNullOrEmpty(cardNumber) && BigInteger.TryParse(cardNumber, out var credNumValue)) + { + evt.EvtCredRef = new EvtCredRef + { + CredNum = SpCoreProtoUtil.ToBigIntegerData(credNumValue) + }; + } + + var message = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.Evt + }; + message.Evt.Add(evt); + + _logger.LogInformation("Sending {EvtCode} event for reader {Name} (unid={Unid}), cardNumber={CardNumber}, subCode={SubCode}", + evtCode, config.Name, config.Unid, cardNumber ?? "(none)", subCode); + + WriteMessage(message); + } + private void WriteMessage(SpCoreMessage message) { lock (_writeLock) diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 8cd499f..8572ada 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -8,6 +8,7 @@ using Aporta.Core.Services; using Aporta.Drivers.OSDP.Shared; using Aporta.Extensions.Hardware; +using Z9.Spcore.Proto; using Aporta.Drivers.OSDP.Shared.Actions; using Dapper; using Microsoft.Extensions.Configuration; @@ -86,6 +87,9 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) // Subscribe to device online status changes to send events back to Z9 _extensionService.OnlineStatusChanged += OnOnlineStatusChanged; + // Subscribe to card reads to send access events to Z9 + _extensionService.AccessCredentialReceived += OnAccessCredentialReceived; + _z9OpenCommunityProtocolService.Start(z9OpenCommunityHost, z9OpenCommunityPort, z9OpenCommunityId); } else @@ -106,6 +110,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) stoppingToken.Register(() => { _logger.LogWarning("Application is shutting down"); + _extensionService.AccessCredentialReceived -= OnAccessCredentialReceived; _extensionService.OnlineStatusChanged -= OnOnlineStatusChanged; _z9OpenCommunityProtocolService.OsdpConfigurationReceived -= OnOsdpConfigurationReceived; _z9OpenCommunityProtocolService.Stop(); @@ -272,4 +277,29 @@ private void OnOnlineStatusChanged(object sender, OnlineStatusChangedEventArgs e _z9OpenCommunityProtocolService.SendCredReaderOnlineEvent(config, e.IsOnline); } + + private void OnAccessCredentialReceived(object sender, AccessCredentialReceivedEventArgs e) + { + // Get the Z9 config for this endpoint to send event with correct device unid + var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(e.Access?.Id); + if (config == null) + { + _logger.LogDebug("No Z9 config found for endpoint {EndpointId}, skipping access event", + e.Access?.Id); + return; + } + + var cardNumber = e.Handler?.MatchingCardData ?? "(unknown)"; + _logger.LogInformation("Card read on reader {Name}: {CardNumber}", + config.Name, cardNumber); + + // For now, send all card reads as access denied with unknown credential + // In a more complete implementation, this would check if the credential is known + // and send the appropriate event (granted or denied with specific reason) + _z9OpenCommunityProtocolService.SendAccessEvent( + config, + isGranted: false, + cardNumber: cardNumber, + subCode: Z9.Spcore.Proto.EvtSubCode.AccessDeniedUnknownCredNum); + } } \ No newline at end of file diff --git a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs index aaf0a5c..dfa59d5 100644 --- a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs +++ b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs @@ -322,10 +322,15 @@ private void PanelOnRawCardDataReplyReceived(object sender, ControlPanel.RawCard { var accessPoint = _endpoints.Where(endpoint => endpoint is IAccess).Cast() .SingleOrDefault(accessPoint => - eventArgs.ConnectionId == _portMapping[accessPoint.Id.Split(":")[0]] && - accessPoint.Id.Split(":")[1] == eventArgs.Address.ToString()); + { + var (portName, address) = ParseEndpointId(accessPoint.Id); + return _portMapping.TryGetValue(portName, out var connId) && + eventArgs.ConnectionId == connId && + address == eventArgs.Address.ToString(); + }); if (accessPoint != null) { + _logger.LogInformation("Card read received on {AccessPointName}", accessPoint.Name); AccessCredentialReceived?.Invoke(this, new AccessCredentialReceivedEventArgs( accessPoint, @@ -340,6 +345,25 @@ private void PanelOnRawCardDataReplyReceived(object sender, ControlPanel.RawCard }); } + /// + /// Parses an endpoint ID to extract port name and address. + /// ID format: "{portName}:{address}:{type}{number}" where portName can contain colons (e.g., "localhost:9843"). + /// + private static (string portName, string address) ParseEndpointId(string endpointId) + { + // Find the last two colons to extract address and type suffix + // ID examples: "COM3:0:R0" or "localhost:9843:0:R0" + var lastColon = endpointId.LastIndexOf(':'); + if (lastColon <= 0) return (endpointId, "0"); + + var secondLastColon = endpointId.LastIndexOf(':', lastColon - 1); + if (secondLastColon <= 0) return (endpointId.Substring(0, lastColon), endpointId.Substring(lastColon + 1)); + + var portName = endpointId.Substring(0, secondLastColon); + var address = endpointId.Substring(secondLastColon + 1, lastColon - secondLastColon - 1); + return (portName, address); + } + private void PkocPanelOnCardPresented(object sender, CardPresentedEventArgs eventArgs) { Task.Run(async () => @@ -347,8 +371,12 @@ private void PkocPanelOnCardPresented(object sender, CardPresentedEventArgs even _logger.LogInformation("A PKOC card has been presented to the reader"); var accessPoint = _endpoints.Where(endpoint => endpoint is IAccess).Cast() .SingleOrDefault(accessPoint => - eventArgs.ConnectionId == _portMapping[accessPoint.Id.Split(":")[0]] && - accessPoint.Id.Split(":")[1] == eventArgs.Address.ToString()); + { + var (portName, address) = ParseEndpointId(accessPoint.Id); + return _portMapping.TryGetValue(portName, out var connId) && + eventArgs.ConnectionId == connId && + address == eventArgs.Address.ToString(); + }); if (accessPoint != null) { var hashLookup = new PKOCDevice(eventArgs.ConnectionId, eventArgs.Address).GetHashCode(); @@ -372,11 +400,15 @@ private void PanelOnInputStatusReportReplyReceived(object sender, ControlPanel.InputStatusReportReplyEventArgs eventArgs) { Task.Run(() => - { + { var monitorPoints = _endpoints.Where(endpoint => endpoint is IInput).Cast() .Where(monitorPoint => - eventArgs.ConnectionId == _portMapping[monitorPoint.Id.Split(":")[0]] && - monitorPoint.Id.Split(":")[1] == eventArgs.Address.ToString()); + { + var (portName, address) = ParseEndpointId(monitorPoint.Id); + return _portMapping.TryGetValue(portName, out var connId) && + eventArgs.ConnectionId == connId && + address == eventArgs.Address.ToString(); + }); foreach (var monitorPoint in monitorPoints) { @@ -394,8 +426,12 @@ private void PanelOnOutputStatusReportReplyReceived(object sender, { var controlPoints = _endpoints.Where(endpoint => endpoint is IOutput).Cast() .Where(controlPoint => - eventArgs.ConnectionId == _portMapping[controlPoint.Id.Split(":")[0]] && - controlPoint.Id.Split(":")[1] == eventArgs.Address.ToString()); + { + var (portName, address) = ParseEndpointId(controlPoint.Id); + return _portMapping.TryGetValue(portName, out var connId) && + eventArgs.ConnectionId == connId && + address == eventArgs.Address.ToString(); + }); foreach (var controlPoint in controlPoints) { From db1b8f694885583b0072d24d3890d248abca32fb Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 20:39:09 -0500 Subject: [PATCH 14/86] Use BinaryFormatter for credential encoding/decoding - Encode credentials from Z9 as bit strings using BinaryFormatter.Encode() - Decode card reads using BinaryFormatter.Decode() to extract credNum - Store DataFormat, DataLayout, CredTemplate from Z9 downloads - Update SendAccessEvent to include decoded credNum on EvtCredRef - Add conditional Z9.Protobuf project reference for z9main development Co-Authored-By: Claude Opus 4.5 --- src/Aporta.Core/Aporta.Core.csproj | 12 + .../Z9OpenCommunityProtocolService.cs | 309 ++++++++++++++++-- src/Aporta/Aporta.csproj | 12 + src/Aporta/Workers/StartupWorker.cs | 31 +- 4 files changed, 340 insertions(+), 24 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index f514d36..4933aff 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -4,6 +4,9 @@ Aporta.Core Aporta.Core default + + $(MSBuildThisFileDirectory)../../../z9main/z9.net/Z9/Z9.Protobuf/Z9.Protobuf.csproj + true @@ -11,6 +14,15 @@ + + + + + + + + + diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 38bf57a..3b1c1d9 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -1,8 +1,11 @@ using System; +using System.Collections; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Net.Sockets; using System.Numerics; +using System.Text; using System.Threading; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; @@ -29,6 +32,11 @@ public class Z9OpenCommunityProtocolService : IDisposable // Key format: "{host}:{port}:{osdpAddress}" (e.g., "localhost:9843:0") private readonly Dictionary _endpointToConfig = new(); + // Data formats/layouts/templates received from Z9 (keyed by unid) + private readonly Dictionary _dataFormats = new(); + private readonly Dictionary _dataLayouts = new(); + private readonly Dictionary _credTemplates = new(); + /// /// OSDP reader configuration extracted from Z9 Dev messages. /// @@ -198,9 +206,25 @@ private void HandleDbChange(DbChange dbChange) { _logger.LogInformation("Processing DbChange (requestId={RequestId})", dbChange.RequestId); - // Not yet supported by Aporta, accepted silently: - // Sched, HolCal, HolType, CredTemplate, DataLayout, DataFormat, Priv + // Process DataFormat first (needed by DataLayout) + foreach (var dataFormat in dbChange.DataFormat) + { + ProcessDataFormat(dataFormat); + } + + // Process DataLayout (needed by CredTemplate) + foreach (var dataLayout in dbChange.DataLayout) + { + ProcessDataLayout(dataLayout); + } + + // Process CredTemplate (needed by Cred) + foreach (var credTemplate in dbChange.CredTemplate) + { + ProcessCredTemplate(credTemplate); + } + // Process credentials foreach (var cred in dbChange.Cred) { ProcessCredential(cred); @@ -219,6 +243,39 @@ private void HandleDbChange(DbChange dbChange) } } + private void ProcessDataFormat(DataFormat dataFormat) + { + SpCoreProtoUtil.InitRequired(dataFormat); + _logger.LogDebug("Storing DataFormat: unid={Unid}, name={Name}, type={Type}", + dataFormat.Unid, dataFormat.Name, dataFormat.DataFormatType); + lock (_dataFormats) + { + _dataFormats[dataFormat.Unid] = dataFormat; + } + } + + private void ProcessDataLayout(DataLayout dataLayout) + { + SpCoreProtoUtil.InitRequired(dataLayout); + _logger.LogDebug("Storing DataLayout: unid={Unid}, name={Name}, type={Type}", + dataLayout.Unid, dataLayout.Name, dataLayout.LayoutType); + lock (_dataLayouts) + { + _dataLayouts[dataLayout.Unid] = dataLayout; + } + } + + private void ProcessCredTemplate(CredTemplate credTemplate) + { + SpCoreProtoUtil.InitRequired(credTemplate); + _logger.LogDebug("Storing CredTemplate: unid={Unid}, name={Name}", + credTemplate.Unid, credTemplate.Name); + lock (_credTemplates) + { + _credTemplates[credTemplate.Unid] = credTemplate; + } + } + private void ProcessDev(Dev dev) { SpCoreProtoUtil.InitRequired(dev); @@ -298,13 +355,7 @@ private void ProcessCredential(Cred cred) { SpCoreProtoUtil.InitRequired(cred); - var credNumber = ""; - if (cred.CardPin?.CredNum != null && cred.CardPin.CredNum.BytesCase != BigIntegerData.BytesOneofCase.None) - { - credNumber = SpCoreProtoUtil.ToBigInteger(cred.CardPin.CredNum).ToString(); - } - - if (string.IsNullOrEmpty(credNumber)) + if (cred.CardPin?.CredNum == null || cred.CardPin.CredNum.BytesCase == BigIntegerData.BytesOneofCase.None) { _logger.LogWarning( "Credential Unid={Unid} has no card number, deleting from Aporta if it exists", cred.Unid); @@ -317,10 +368,24 @@ private void ProcessCredential(Cred cred) return; } - var personName = !string.IsNullOrWhiteSpace(cred.Name) ? cred.Name : credNumber; + var credNum = SpCoreProtoUtil.ToBigInteger(cred.CardPin.CredNum); + var facilityCode = cred.CardPin.FacilityCodeCase == CardPin.FacilityCodeOneofCase.FacilityCode + ? (int?)cred.CardPin.FacilityCode : null; + + // Find the data format to encode the credential number as bits + var bitString = EncodeCredentialAsBits(cred, credNum, facilityCode); + if (string.IsNullOrEmpty(bitString)) + { + // Fallback: store as decimal string if no format available + bitString = credNum.ToString(); + _logger.LogWarning("No data format found for credential {Unid}, storing as decimal: {Number}", + cred.Unid, bitString); + } + + var personName = !string.IsNullOrWhiteSpace(cred.Name) ? cred.Name : bitString; _logger.LogInformation("Processing credential Unid={Unid} Number={Number} Name={Name}", - cred.Unid, credNumber, personName); + cred.Unid, bitString, personName); if (AutoCreatePersonForCredential) { @@ -334,7 +399,7 @@ private void ProcessCredential(Cred cred) var credential = new Credential { - Number = credNumber, + Number = bitString, Enabled = cred.Enabled }; _credentialRepository.Upsert(credential, cred.Unid).GetAwaiter().GetResult(); @@ -347,6 +412,201 @@ private void ProcessCredential(Cred cred) } } + /// + /// Encodes a credential number as a bit string using the data format from the credential's template. + /// + private string EncodeCredentialAsBits(Cred cred, BigInteger credNum, int? facilityCode) + { + // Find the credential template + if (cred.CredTemplateUnid == 0) + { + _logger.LogDebug("Credential {Unid} has no CredTemplateUnid", cred.Unid); + return null; + } + + CredTemplate credTemplate; + lock (_credTemplates) + { + if (!_credTemplates.TryGetValue(cred.CredTemplateUnid, out credTemplate)) + { + _logger.LogDebug("CredTemplate {Unid} not found", cred.CredTemplateUnid); + return null; + } + } + + // Get the data layout from the template + var cardPinTemplate = credTemplate.CardPinTemplate; + if (cardPinTemplate == null) + { + _logger.LogDebug("CredTemplate {Unid} has no CardPinTemplate", credTemplate.Unid); + return null; + } + + // If anyDataLayout is true, try all available formats + if (cardPinTemplate.AnyDataLayoutCase == CardPinTemplate.AnyDataLayoutOneofCase.AnyDataLayout + && cardPinTemplate.AnyDataLayout) + { + // Use the first available binary format + lock (_dataFormats) + { + foreach (var df in _dataFormats.Values) + { + if (df.DataFormatType == DataFormatType.Binary && df.ExtBinaryFormat != null) + { + var bits = EncodeWithBinaryFormatter(df, credNum, facilityCode); + if (bits != null) + { + _logger.LogDebug("Encoded credential using format {Name}", df.Name); + return bits; + } + } + } + } + return null; + } + + // Get specific data layout + if (cardPinTemplate.DataLayoutUnidCase != CardPinTemplate.DataLayoutUnidOneofCase.DataLayoutUnid) + { + _logger.LogDebug("CardPinTemplate has no DataLayoutUnid"); + return null; + } + + DataLayout dataLayout; + lock (_dataLayouts) + { + if (!_dataLayouts.TryGetValue(cardPinTemplate.DataLayoutUnid, out dataLayout)) + { + _logger.LogDebug("DataLayout {Unid} not found", cardPinTemplate.DataLayoutUnid); + return null; + } + } + + // Get the data format from BasicDataLayout + if (dataLayout.ExtBasicDataLayout == null || + dataLayout.ExtBasicDataLayout.DataFormatUnidCase != BasicDataLayout.DataFormatUnidOneofCase.DataFormatUnid) + { + _logger.LogDebug("DataLayout {Unid} has no BasicDataLayout or DataFormatUnid", dataLayout.Unid); + return null; + } + + DataFormat dataFormat; + lock (_dataFormats) + { + if (!_dataFormats.TryGetValue(dataLayout.ExtBasicDataLayout.DataFormatUnid, out dataFormat)) + { + _logger.LogDebug("DataFormat {Unid} not found", dataLayout.ExtBasicDataLayout.DataFormatUnid); + return null; + } + } + + if (dataFormat.DataFormatType != DataFormatType.Binary || dataFormat.ExtBinaryFormat == null) + { + _logger.LogDebug("DataFormat {Unid} is not binary", dataFormat.Unid); + return null; + } + + return EncodeWithBinaryFormatter(dataFormat, credNum, facilityCode); + } + + /// + /// Encodes a credential number into a bit string using the existing BinaryFormatter. + /// + private string EncodeWithBinaryFormatter(DataFormat dataFormat, BigInteger credNum, int? facilityCode) + { + try + { + var binaryFormat = dataFormat.ExtBinaryFormat; + var bitCount = binaryFormat.MaxBits; + + // Create a BitBuffer with the required size + var bb = new BitBuffer(bitCount, bitCount); + + // Create DecodedRead with the field values + var decodedRead = new DecodedRead(); + decodedRead.GetElements().Add(new DecodedReadElement(DataFormatField.CredNum, credNum)); + if (facilityCode.HasValue) + { + decodedRead.GetElements().Add(new DecodedReadElement(DataFormatField.FacilityCode, facilityCode.Value)); + } + + // Use BinaryFormatter to encode + var formatter = new BinaryFormatter(dataFormat); + formatter.Encode(bb, decodedRead); + + return bb.ToBinaryString(); + } + catch (BinaryFormatterException ex) + { + _logger.LogDebug(ex, "Failed to encode credential with format {Name}", dataFormat.Name); + return null; + } + } + + /// + /// Decodes a raw bit string from a card read into a credential number by trying all known formats. + /// + /// The raw bit string from the card reader (e.g., "10110010000110000001110011") + /// Tuple of (credNum, facilityCode, formatName) if decoded, or null if no format matched. + public (BigInteger credNum, int? facilityCode, string formatName)? DecodeCardRead(string rawBits) + { + if (string.IsNullOrEmpty(rawBits)) + return null; + + BitBuffer bb; + try + { + bb = BitBuffer.FromBinaryString(rawBits); + } + catch (FormatException ex) + { + _logger.LogWarning(ex, "Invalid bit string: {RawBits}", rawBits); + return null; + } + + lock (_dataFormats) + { + foreach (var dataFormat in _dataFormats.Values) + { + if (dataFormat.DataFormatType != DataFormatType.Binary || dataFormat.ExtBinaryFormat == null) + continue; + + try + { + var formatter = new BinaryFormatter(dataFormat); + var decodedRead = formatter.Decode(bb); + + // Extract credential number + var credNumElements = decodedRead.GetElementsMatchingField(DataFormatField.CredNum); + if (credNumElements.Count == 0) + continue; + + var credNum = credNumElements[0].GetValue(); + + // Extract facility code if present + int? facilityCode = null; + var fcElements = decodedRead.GetElementsMatchingField(DataFormatField.FacilityCode); + if (fcElements.Count > 0) + { + facilityCode = (int)fcElements[0].GetValue(); + } + + _logger.LogDebug("Decoded card read using format {Name}: credNum={CredNum}, fc={FacilityCode}", + dataFormat.Name, credNum, facilityCode); + + return (credNum, facilityCode, dataFormat.Name); + } + catch (BinaryFormatterException) + { + // This format didn't match, try next + } + } + } + + _logger.LogDebug("No format matched for card read: {RawBits}", rawBits); + return null; + } + private void SendIdentification() { var message = new SpCoreMessage @@ -477,9 +737,11 @@ public void SendCredReaderOnlineEvent(OsdpReaderConfig config, bool isOnline) /// /// The OSDP reader configuration (to determine the device). /// True if access was granted, false if denied. - /// The card number that was presented (for logging/display). + /// The decoded credential number (null if unable to decode). + /// The facility code (null if not available or not decoded). + /// The raw bit string from the card read (stored in EvtData if credNum is null). /// Optional sub-code providing the reason for denial. - public void SendAccessEvent(OsdpReaderConfig config, bool isGranted, string cardNumber, EvtSubCode subCode = EvtSubCode.AccessDeniedUnknownCredNum) + public void SendAccessEvent(OsdpReaderConfig config, bool isGranted, BigInteger? credNum, int? facilityCode, string rawBits, EvtSubCode subCode = EvtSubCode.AccessDeniedUnknownCredNum) { if (config == null) { @@ -512,13 +774,22 @@ public void SendAccessEvent(OsdpReaderConfig config, bool isGranted, string card } }; - // Add card number to event via EvtCredRef if available - if (!string.IsNullOrEmpty(cardNumber) && BigInteger.TryParse(cardNumber, out var credNumValue)) + // Add decoded credential number to EvtCredRef if available + if (credNum.HasValue) { evt.EvtCredRef = new EvtCredRef { - CredNum = SpCoreProtoUtil.ToBigIntegerData(credNumValue) + CredNum = SpCoreProtoUtil.ToBigIntegerData(credNum.Value) }; + if (facilityCode.HasValue) + { + evt.EvtCredRef.FacilityCode = facilityCode.Value; + } + } + else if (!string.IsNullOrEmpty(rawBits)) + { + // Unable to decode - store raw bits in Data field + evt.Data = rawBits; } var message = new SpCoreMessage @@ -527,8 +798,8 @@ public void SendAccessEvent(OsdpReaderConfig config, bool isGranted, string card }; message.Evt.Add(evt); - _logger.LogInformation("Sending {EvtCode} event for reader {Name} (unid={Unid}), cardNumber={CardNumber}, subCode={SubCode}", - evtCode, config.Name, config.Unid, cardNumber ?? "(none)", subCode); + _logger.LogInformation("Sending {EvtCode} event for reader {Name} (unid={Unid}), credNum={CredNum}, fc={FacilityCode}, rawBits={RawBits}, subCode={SubCode}", + evtCode, config.Name, config.Unid, credNum?.ToString() ?? "(none)", facilityCode?.ToString() ?? "(none)", rawBits ?? "(none)", subCode); WriteMessage(message); } diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index e8bd986..9543dc3 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -7,6 +7,9 @@ win-x64;linux-arm;linux-arm64;osx-x64;linux-x64 AnyCPU default + + $(MSBuildThisFileDirectory)../../../z9main/z9.net/Z9/Z9.Protobuf/Z9.Protobuf.csproj + true @@ -21,6 +24,15 @@ + + + + + + + + + diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 8572ada..86e975d 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -289,9 +289,28 @@ private void OnAccessCredentialReceived(object sender, AccessCredentialReceivedE return; } - var cardNumber = e.Handler?.MatchingCardData ?? "(unknown)"; - _logger.LogInformation("Card read on reader {Name}: {CardNumber}", - config.Name, cardNumber); + var rawBits = e.Handler?.MatchingCardData; + _logger.LogInformation("Card read on reader {Name}: rawBits={RawBits}", + config.Name, rawBits ?? "(unknown)"); + + // Try to decode the raw bits using known card formats + System.Numerics.BigInteger? credNum = null; + int? facilityCode = null; + if (!string.IsNullOrEmpty(rawBits)) + { + var decoded = _z9OpenCommunityProtocolService.DecodeCardRead(rawBits); + if (decoded.HasValue) + { + credNum = decoded.Value.credNum; + facilityCode = decoded.Value.facilityCode; + _logger.LogInformation("Decoded card read: credNum={CredNum}, fc={FacilityCode}, format={Format}", + credNum, facilityCode, decoded.Value.formatName); + } + else + { + _logger.LogDebug("Unable to decode card read with any known format"); + } + } // For now, send all card reads as access denied with unknown credential // In a more complete implementation, this would check if the credential is known @@ -299,7 +318,9 @@ private void OnAccessCredentialReceived(object sender, AccessCredentialReceivedE _z9OpenCommunityProtocolService.SendAccessEvent( config, isGranted: false, - cardNumber: cardNumber, - subCode: Z9.Spcore.Proto.EvtSubCode.AccessDeniedUnknownCredNum); + credNum: credNum, + facilityCode: facilityCode, + rawBits: rawBits, + subCode: EvtSubCode.AccessDeniedUnknownCredNum); } } \ No newline at end of file From b517f97377740929d3dc76f2d6ed9743dafbe3da Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 21:41:24 -0500 Subject: [PATCH 15/86] Persist all Z9 Open data types to SQLite database Replace in-memory dictionaries with database storage for Z9 Open protobuf types. Add ProtoJsonRepository base class using Google.Protobuf JsonFormatter/JsonParser for serialization with proper oneof extension handling. New tables: cred_template, data_layout, data_format, priv, sched, hol, hol_cal, hol_type. All types now persist across restarts. Also fixes migration system bug that used version as array index. Co-Authored-By: Claude Opus 4.5 --- .../Migrations/_0001_AddZ9OpenTables.cs | 67 +++ .../Repositories/CredTemplateRepository.cs | 17 + .../Repositories/DataFormatRepository.cs | 17 + .../Repositories/DataLayoutRepository.cs | 17 + .../Repositories/HolCalRepository.cs | 17 + .../DataAccess/Repositories/HolRepository.cs | 17 + .../Repositories/HolTypeRepository.cs | 17 + .../DataAccess/Repositories/PrivRepository.cs | 17 + .../Repositories/ProtoJsonRepository.cs | 85 +++ .../Repositories/SchedRepository.cs | 17 + .../DataAccess/SqLiteDataAccess.cs | 12 +- .../Z9OpenCommunityProtocolService.cs | 343 +++++++++--- .../Repositories/ProtoJsonRepositoryTests.cs | 508 ++++++++++++++++++ 13 files changed, 1060 insertions(+), 91 deletions(-) create mode 100644 src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/CredTemplateRepository.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/DataFormatRepository.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/DataLayoutRepository.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/HolCalRepository.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/HolRepository.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/HolTypeRepository.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/PrivRepository.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/SchedRepository.cs create mode 100644 test/Aporta.Core.Tests/DataAccess/Repositories/ProtoJsonRepositoryTests.cs diff --git a/src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs b/src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs new file mode 100644 index 0000000..d159715 --- /dev/null +++ b/src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs @@ -0,0 +1,67 @@ +using System.Data; +using System.Threading.Tasks; +using Dapper; + +namespace Aporta.Core.DataAccess.Migrations; + +public class _0001_AddZ9OpenTables : IMigration +{ + public int Version => 101; + + public string Name => "Add Z9 Open protobuf storage tables"; + + public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) + { + await connection.ExecuteAsync( + @" + -- Credential Template table + CREATE TABLE cred_template ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Data Layout table + CREATE TABLE data_layout ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Data Format table + CREATE TABLE data_format ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Privilege table + CREATE TABLE priv ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Schedule table + CREATE TABLE sched ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Holiday table + CREATE TABLE hol ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Holiday Calendar table + CREATE TABLE hol_cal ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Holiday Type table + CREATE TABLE hol_type ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + ", + transaction: transaction); + } +} diff --git a/src/Aporta.Core/DataAccess/Repositories/CredTemplateRepository.cs b/src/Aporta.Core/DataAccess/Repositories/CredTemplateRepository.cs new file mode 100644 index 0000000..eb09aab --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/CredTemplateRepository.cs @@ -0,0 +1,17 @@ +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +public class CredTemplateRepository : ProtoJsonRepository +{ + private readonly IDataAccess _dataAccess; + + public CredTemplateRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "cred_template"; + protected override int GetUnid(CredTemplate message) => message.Unid; +} diff --git a/src/Aporta.Core/DataAccess/Repositories/DataFormatRepository.cs b/src/Aporta.Core/DataAccess/Repositories/DataFormatRepository.cs new file mode 100644 index 0000000..7ca9a65 --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/DataFormatRepository.cs @@ -0,0 +1,17 @@ +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +public class DataFormatRepository : ProtoJsonRepository +{ + private readonly IDataAccess _dataAccess; + + public DataFormatRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "data_format"; + protected override int GetUnid(DataFormat message) => message.Unid; +} diff --git a/src/Aporta.Core/DataAccess/Repositories/DataLayoutRepository.cs b/src/Aporta.Core/DataAccess/Repositories/DataLayoutRepository.cs new file mode 100644 index 0000000..ab886ae --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/DataLayoutRepository.cs @@ -0,0 +1,17 @@ +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +public class DataLayoutRepository : ProtoJsonRepository +{ + private readonly IDataAccess _dataAccess; + + public DataLayoutRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "data_layout"; + protected override int GetUnid(DataLayout message) => message.Unid; +} diff --git a/src/Aporta.Core/DataAccess/Repositories/HolCalRepository.cs b/src/Aporta.Core/DataAccess/Repositories/HolCalRepository.cs new file mode 100644 index 0000000..9a85ea1 --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/HolCalRepository.cs @@ -0,0 +1,17 @@ +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +public class HolCalRepository : ProtoJsonRepository +{ + private readonly IDataAccess _dataAccess; + + public HolCalRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "hol_cal"; + protected override int GetUnid(HolCal message) => message.Unid; +} diff --git a/src/Aporta.Core/DataAccess/Repositories/HolRepository.cs b/src/Aporta.Core/DataAccess/Repositories/HolRepository.cs new file mode 100644 index 0000000..6394487 --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/HolRepository.cs @@ -0,0 +1,17 @@ +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +public class HolRepository : ProtoJsonRepository +{ + private readonly IDataAccess _dataAccess; + + public HolRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "hol"; + protected override int GetUnid(Hol message) => message.Unid; +} diff --git a/src/Aporta.Core/DataAccess/Repositories/HolTypeRepository.cs b/src/Aporta.Core/DataAccess/Repositories/HolTypeRepository.cs new file mode 100644 index 0000000..045d3a3 --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/HolTypeRepository.cs @@ -0,0 +1,17 @@ +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +public class HolTypeRepository : ProtoJsonRepository +{ + private readonly IDataAccess _dataAccess; + + public HolTypeRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "hol_type"; + protected override int GetUnid(HolType message) => message.Unid; +} diff --git a/src/Aporta.Core/DataAccess/Repositories/PrivRepository.cs b/src/Aporta.Core/DataAccess/Repositories/PrivRepository.cs new file mode 100644 index 0000000..408330c --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/PrivRepository.cs @@ -0,0 +1,17 @@ +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +public class PrivRepository : ProtoJsonRepository +{ + private readonly IDataAccess _dataAccess; + + public PrivRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "priv"; + protected override int GetUnid(Priv message) => message.Unid; +} diff --git a/src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs b/src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs new file mode 100644 index 0000000..7a10e84 --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs @@ -0,0 +1,85 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Dapper; +using Google.Protobuf; + +namespace Aporta.Core.DataAccess.Repositories; + +/// +/// Base repository for storing Google.Protobuf IMessage types as JSON documents. +/// Uses Google.Protobuf.JsonFormatter/JsonParser for serialization. +/// +public abstract class ProtoJsonRepository where T : IMessage, new() +{ + private static readonly JsonFormatter Formatter = new(JsonFormatter.Settings.Default); + private static readonly JsonParser Parser = new(JsonParser.Settings.Default); + + protected abstract IDataAccess DataAccess { get; } + protected abstract string TableName { get; } + + /// + /// Gets the unid field value from the protobuf message (used as primary key). + /// + protected abstract int GetUnid(T message); + + public async Task Get(int id) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var json = await connection.QuerySingleOrDefaultAsync( + $"SELECT data FROM {TableName} WHERE id = @id", new { id }); + + return json == null ? default : Parser.Parse(json); + } + + public async Task> GetAll() + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var results = await connection.QueryAsync( + $"SELECT data FROM {TableName}"); + + return results.Select(json => Parser.Parse(json)); + } + + public async Task Upsert(T message) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var id = GetUnid(message); + var json = Formatter.Format(message); + + await connection.ExecuteAsync( + $"INSERT INTO {TableName} (id, data) VALUES (@id, @data) ON CONFLICT(id) DO UPDATE SET data = @data", + new { id, data = json }); + } + + public async Task Delete(int id) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + await connection.ExecuteAsync( + $"DELETE FROM {TableName} WHERE id = @id", new { id }); + } + + public async Task DeleteAll() + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + await connection.ExecuteAsync($"DELETE FROM {TableName}"); + } + + public async Task Count() + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + return await connection.ExecuteScalarAsync($"SELECT COUNT(*) FROM {TableName}"); + } +} diff --git a/src/Aporta.Core/DataAccess/Repositories/SchedRepository.cs b/src/Aporta.Core/DataAccess/Repositories/SchedRepository.cs new file mode 100644 index 0000000..ea367bc --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/SchedRepository.cs @@ -0,0 +1,17 @@ +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +public class SchedRepository : ProtoJsonRepository +{ + private readonly IDataAccess _dataAccess; + + public SchedRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "sched"; + protected override int GetUnid(Sched message) => message.Unid; +} diff --git a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs index 7d558a8..225ced3 100644 --- a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs +++ b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs @@ -1,7 +1,8 @@ using System; using System.Data; using System.IO; -using System.Reflection; +using System.Linq; +using System.Reflection; using System.Threading.Tasks; using Aporta.Core.DataAccess.Migrations; using Dapper; @@ -17,7 +18,8 @@ public class SqLiteDataAccess : IDataAccess private readonly IMigration[] _migrations = { - new _0000_InitialCreate() + new _0000_InitialCreate(), + new _0001_AddZ9OpenTables() }; /// @@ -99,16 +101,16 @@ public async Task UpdateSchema() connection.Open(); using var transaction = connection.BeginTransaction(); - for (int migrationIndex = currentVersion + 1; migrationIndex < _migrations.Length; migrationIndex++) + foreach (var migration in _migrations.Where(m => m.Version > currentVersion).OrderBy(m => m.Version)) { - await _migrations[migrationIndex].PerformUpdate(connection, transaction); + await migration.PerformUpdate(connection, transaction); await connection.ExecuteAsync( @"insert into schema_info (id, name, timestamp) values (@id, @name, @timestamp)", new { - id = _migrations[migrationIndex].Version, name = _migrations[migrationIndex].Name, + id = migration.Version, name = migration.Name, timestamp = DateTime.UtcNow }, transaction); } diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 3b1c1d9..6fa3ef7 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -25,6 +25,16 @@ public class Z9OpenCommunityProtocolService : IDisposable private readonly CredentialRepository _credentialRepository; private readonly PersonRepository _personRepository; + // Z9 Open protobuf repositories + private readonly DataFormatRepository _dataFormatRepository; + private readonly DataLayoutRepository _dataLayoutRepository; + private readonly CredTemplateRepository _credTemplateRepository; + private readonly PrivRepository _privRepository; + private readonly SchedRepository _schedRepository; + private readonly HolRepository _holRepository; + private readonly HolCalRepository _holCalRepository; + private readonly HolTypeRepository _holTypeRepository; + // Received OSDP CredReader configurations from Z9 private readonly List _osdpReaderConfigs = new(); @@ -32,11 +42,6 @@ public class Z9OpenCommunityProtocolService : IDisposable // Key format: "{host}:{port}:{osdpAddress}" (e.g., "localhost:9843:0") private readonly Dictionary _endpointToConfig = new(); - // Data formats/layouts/templates received from Z9 (keyed by unid) - private readonly Dictionary _dataFormats = new(); - private readonly Dictionary _dataLayouts = new(); - private readonly Dictionary _credTemplates = new(); - /// /// OSDP reader configuration extracted from Z9 Dev messages. /// @@ -71,6 +76,14 @@ public Z9OpenCommunityProtocolService( _logger = logger; _credentialRepository = new CredentialRepository(dataAccess); _personRepository = new PersonRepository(dataAccess); + _dataFormatRepository = new DataFormatRepository(dataAccess); + _dataLayoutRepository = new DataLayoutRepository(dataAccess); + _credTemplateRepository = new CredTemplateRepository(dataAccess); + _privRepository = new PrivRepository(dataAccess); + _schedRepository = new SchedRepository(dataAccess); + _holRepository = new HolRepository(dataAccess); + _holCalRepository = new HolCalRepository(dataAccess); + _holTypeRepository = new HolTypeRepository(dataAccess); } public void Start(string host, int port, string id = null) @@ -206,37 +219,177 @@ private void HandleDbChange(DbChange dbChange) { _logger.LogInformation("Processing DbChange (requestId={RequestId})", dbChange.RequestId); - // Process DataFormat first (needed by DataLayout) + // Process deletes first (order: most dependent -> least dependent) + // Cred deletes + if (dbChange.CredDeleteAllCase == DbChange.CredDeleteAllOneofCase.CredDeleteAll && dbChange.CredDeleteAll) + { + _logger.LogInformation("Deleting all credentials"); + // Note: We don't have a DeleteAll that also cleans up persons/assignments + // For now, just delete credentials + } + foreach (var credDelete in dbChange.CredDelete) + { + _logger.LogInformation("Deleting credential {Unid}", credDelete); + _credentialRepository.RevokePerson(credDelete, credDelete).GetAwaiter().GetResult(); + _credentialRepository.Delete(credDelete).GetAwaiter().GetResult(); + if (AutoCreatePersonForCredential) + { + _personRepository.Delete(credDelete).GetAwaiter().GetResult(); + } + } + + // Priv deletes + if (dbChange.PrivDeleteAllCase == DbChange.PrivDeleteAllOneofCase.PrivDeleteAll && dbChange.PrivDeleteAll) + { + _logger.LogInformation("Deleting all privileges"); + _privRepository.DeleteAll().GetAwaiter().GetResult(); + } + foreach (var privDelete in dbChange.PrivDelete) + { + _logger.LogInformation("Deleting privilege {Unid}", privDelete); + _privRepository.Delete(privDelete).GetAwaiter().GetResult(); + } + + // CredTemplate deletes + if (dbChange.CredTemplateDeleteAllCase == DbChange.CredTemplateDeleteAllOneofCase.CredTemplateDeleteAll && dbChange.CredTemplateDeleteAll) + { + _logger.LogInformation("Deleting all credential templates"); + _credTemplateRepository.DeleteAll().GetAwaiter().GetResult(); + } + foreach (var credTemplateDelete in dbChange.CredTemplateDelete) + { + _logger.LogInformation("Deleting credential template {Unid}", credTemplateDelete); + _credTemplateRepository.Delete(credTemplateDelete).GetAwaiter().GetResult(); + } + + // DataLayout deletes + if (dbChange.DataLayoutDeleteAllCase == DbChange.DataLayoutDeleteAllOneofCase.DataLayoutDeleteAll && dbChange.DataLayoutDeleteAll) + { + _logger.LogInformation("Deleting all data layouts"); + _dataLayoutRepository.DeleteAll().GetAwaiter().GetResult(); + } + foreach (var dataLayoutDelete in dbChange.DataLayoutDelete) + { + _logger.LogInformation("Deleting data layout {Unid}", dataLayoutDelete); + _dataLayoutRepository.Delete(dataLayoutDelete).GetAwaiter().GetResult(); + } + + // DataFormat deletes + if (dbChange.DataFormatDeleteAllCase == DbChange.DataFormatDeleteAllOneofCase.DataFormatDeleteAll && dbChange.DataFormatDeleteAll) + { + _logger.LogInformation("Deleting all data formats"); + _dataFormatRepository.DeleteAll().GetAwaiter().GetResult(); + } + foreach (var dataFormatDelete in dbChange.DataFormatDelete) + { + _logger.LogInformation("Deleting data format {Unid}", dataFormatDelete); + _dataFormatRepository.Delete(dataFormatDelete).GetAwaiter().GetResult(); + } + + // Sched deletes + if (dbChange.SchedDeleteAllCase == DbChange.SchedDeleteAllOneofCase.SchedDeleteAll && dbChange.SchedDeleteAll) + { + _logger.LogInformation("Deleting all schedules"); + _schedRepository.DeleteAll().GetAwaiter().GetResult(); + } + foreach (var schedDelete in dbChange.SchedDelete) + { + _logger.LogInformation("Deleting schedule {Unid}", schedDelete); + _schedRepository.Delete(schedDelete).GetAwaiter().GetResult(); + } + + // Hol deletes + if (dbChange.HolDeleteAllCase == DbChange.HolDeleteAllOneofCase.HolDeleteAll && dbChange.HolDeleteAll) + { + _logger.LogInformation("Deleting all holidays"); + _holRepository.DeleteAll().GetAwaiter().GetResult(); + } + foreach (var holDelete in dbChange.HolDelete) + { + _logger.LogInformation("Deleting holiday {Unid}", holDelete); + _holRepository.Delete(holDelete).GetAwaiter().GetResult(); + } + + // HolCal deletes + if (dbChange.HolCalDeleteAllCase == DbChange.HolCalDeleteAllOneofCase.HolCalDeleteAll && dbChange.HolCalDeleteAll) + { + _logger.LogInformation("Deleting all holiday calendars"); + _holCalRepository.DeleteAll().GetAwaiter().GetResult(); + } + foreach (var holCalDelete in dbChange.HolCalDelete) + { + _logger.LogInformation("Deleting holiday calendar {Unid}", holCalDelete); + _holCalRepository.Delete(holCalDelete).GetAwaiter().GetResult(); + } + + // HolType deletes + if (dbChange.HolTypeDeleteAllCase == DbChange.HolTypeDeleteAllOneofCase.HolTypeDeleteAll && dbChange.HolTypeDeleteAll) + { + _logger.LogInformation("Deleting all holiday types"); + _holTypeRepository.DeleteAll().GetAwaiter().GetResult(); + } + foreach (var holTypeDelete in dbChange.HolTypeDelete) + { + _logger.LogInformation("Deleting holiday type {Unid}", holTypeDelete); + _holTypeRepository.Delete(holTypeDelete).GetAwaiter().GetResult(); + } + + // Process inserts/updates (order: least dependent -> most dependent) + // HolType (no dependencies) + foreach (var holType in dbChange.HolType) + { + ProcessHolType(holType); + } + + // HolCal (no dependencies) + foreach (var holCal in dbChange.HolCal) + { + ProcessHolCal(holCal); + } + + // Hol (depends on HolCal) + foreach (var hol in dbChange.Hol) + { + ProcessHol(hol); + } + + // Sched (may reference HolCal) + foreach (var sched in dbChange.Sched) + { + ProcessSched(sched); + } + + // DataFormat (no dependencies) foreach (var dataFormat in dbChange.DataFormat) { ProcessDataFormat(dataFormat); } - // Process DataLayout (needed by CredTemplate) + // DataLayout (depends on DataFormat) foreach (var dataLayout in dbChange.DataLayout) { ProcessDataLayout(dataLayout); } - // Process CredTemplate (needed by Cred) + // CredTemplate (depends on DataLayout) foreach (var credTemplate in dbChange.CredTemplate) { ProcessCredTemplate(credTemplate); } - // Process credentials - foreach (var cred in dbChange.Cred) + // Priv (may reference Sched) + foreach (var priv in dbChange.Priv) { - ProcessCredential(cred); + ProcessPriv(priv); } - foreach (var credDelete in dbChange.CredDelete) + // Cred (depends on CredTemplate, may reference Priv) + foreach (var cred in dbChange.Cred) { - _logger.LogInformation("Deleting credential {Unid}", credDelete); - _credentialRepository.Delete(credDelete).GetAwaiter().GetResult(); + ProcessCredential(cred); } - // Process Dev messages - extract OSDP reader configurations + // Dev (extract OSDP reader configurations - stored in memory for now) foreach (var dev in dbChange.Dev) { ProcessDev(dev); @@ -248,10 +401,7 @@ private void ProcessDataFormat(DataFormat dataFormat) SpCoreProtoUtil.InitRequired(dataFormat); _logger.LogDebug("Storing DataFormat: unid={Unid}, name={Name}, type={Type}", dataFormat.Unid, dataFormat.Name, dataFormat.DataFormatType); - lock (_dataFormats) - { - _dataFormats[dataFormat.Unid] = dataFormat; - } + _dataFormatRepository.Upsert(dataFormat).GetAwaiter().GetResult(); } private void ProcessDataLayout(DataLayout dataLayout) @@ -259,10 +409,7 @@ private void ProcessDataLayout(DataLayout dataLayout) SpCoreProtoUtil.InitRequired(dataLayout); _logger.LogDebug("Storing DataLayout: unid={Unid}, name={Name}, type={Type}", dataLayout.Unid, dataLayout.Name, dataLayout.LayoutType); - lock (_dataLayouts) - { - _dataLayouts[dataLayout.Unid] = dataLayout; - } + _dataLayoutRepository.Upsert(dataLayout).GetAwaiter().GetResult(); } private void ProcessCredTemplate(CredTemplate credTemplate) @@ -270,10 +417,47 @@ private void ProcessCredTemplate(CredTemplate credTemplate) SpCoreProtoUtil.InitRequired(credTemplate); _logger.LogDebug("Storing CredTemplate: unid={Unid}, name={Name}", credTemplate.Unid, credTemplate.Name); - lock (_credTemplates) - { - _credTemplates[credTemplate.Unid] = credTemplate; - } + _credTemplateRepository.Upsert(credTemplate).GetAwaiter().GetResult(); + } + + private void ProcessPriv(Priv priv) + { + SpCoreProtoUtil.InitRequired(priv); + _logger.LogDebug("Storing Priv: unid={Unid}, name={Name}, type={Type}", + priv.Unid, priv.Name, priv.PrivType); + _privRepository.Upsert(priv).GetAwaiter().GetResult(); + } + + private void ProcessSched(Sched sched) + { + SpCoreProtoUtil.InitRequired(sched); + _logger.LogDebug("Storing Sched: unid={Unid}, name={Name}", + sched.Unid, sched.Name); + _schedRepository.Upsert(sched).GetAwaiter().GetResult(); + } + + private void ProcessHol(Hol hol) + { + SpCoreProtoUtil.InitRequired(hol); + _logger.LogDebug("Storing Hol: unid={Unid}, name={Name}", + hol.Unid, hol.Name); + _holRepository.Upsert(hol).GetAwaiter().GetResult(); + } + + private void ProcessHolCal(HolCal holCal) + { + SpCoreProtoUtil.InitRequired(holCal); + _logger.LogDebug("Storing HolCal: unid={Unid}, name={Name}", + holCal.Unid, holCal.Name); + _holCalRepository.Upsert(holCal).GetAwaiter().GetResult(); + } + + private void ProcessHolType(HolType holType) + { + SpCoreProtoUtil.InitRequired(holType); + _logger.LogDebug("Storing HolType: unid={Unid}, name={Name}", + holType.Unid, holType.Name); + _holTypeRepository.Upsert(holType).GetAwaiter().GetResult(); } private void ProcessDev(Dev dev) @@ -424,14 +608,11 @@ private string EncodeCredentialAsBits(Cred cred, BigInteger credNum, int? facili return null; } - CredTemplate credTemplate; - lock (_credTemplates) + var credTemplate = _credTemplateRepository.Get(cred.CredTemplateUnid).GetAwaiter().GetResult(); + if (credTemplate == null) { - if (!_credTemplates.TryGetValue(cred.CredTemplateUnid, out credTemplate)) - { - _logger.LogDebug("CredTemplate {Unid} not found", cred.CredTemplateUnid); - return null; - } + _logger.LogDebug("CredTemplate {Unid} not found", cred.CredTemplateUnid); + return null; } // Get the data layout from the template @@ -447,18 +628,16 @@ private string EncodeCredentialAsBits(Cred cred, BigInteger credNum, int? facili && cardPinTemplate.AnyDataLayout) { // Use the first available binary format - lock (_dataFormats) + var dataFormats = _dataFormatRepository.GetAll().GetAwaiter().GetResult(); + foreach (var df in dataFormats) { - foreach (var df in _dataFormats.Values) + if (df.DataFormatType == DataFormatType.Binary && df.ExtBinaryFormat != null) { - if (df.DataFormatType == DataFormatType.Binary && df.ExtBinaryFormat != null) + var bits = EncodeWithBinaryFormatter(df, credNum, facilityCode); + if (bits != null) { - var bits = EncodeWithBinaryFormatter(df, credNum, facilityCode); - if (bits != null) - { - _logger.LogDebug("Encoded credential using format {Name}", df.Name); - return bits; - } + _logger.LogDebug("Encoded credential using format {Name}", df.Name); + return bits; } } } @@ -472,14 +651,11 @@ private string EncodeCredentialAsBits(Cred cred, BigInteger credNum, int? facili return null; } - DataLayout dataLayout; - lock (_dataLayouts) + var dataLayout = _dataLayoutRepository.Get(cardPinTemplate.DataLayoutUnid).GetAwaiter().GetResult(); + if (dataLayout == null) { - if (!_dataLayouts.TryGetValue(cardPinTemplate.DataLayoutUnid, out dataLayout)) - { - _logger.LogDebug("DataLayout {Unid} not found", cardPinTemplate.DataLayoutUnid); - return null; - } + _logger.LogDebug("DataLayout {Unid} not found", cardPinTemplate.DataLayoutUnid); + return null; } // Get the data format from BasicDataLayout @@ -490,14 +666,11 @@ private string EncodeCredentialAsBits(Cred cred, BigInteger credNum, int? facili return null; } - DataFormat dataFormat; - lock (_dataFormats) + var dataFormat = _dataFormatRepository.Get(dataLayout.ExtBasicDataLayout.DataFormatUnid).GetAwaiter().GetResult(); + if (dataFormat == null) { - if (!_dataFormats.TryGetValue(dataLayout.ExtBasicDataLayout.DataFormatUnid, out dataFormat)) - { - _logger.LogDebug("DataFormat {Unid} not found", dataLayout.ExtBasicDataLayout.DataFormatUnid); - return null; - } + _logger.LogDebug("DataFormat {Unid} not found", dataLayout.ExtBasicDataLayout.DataFormatUnid); + return null; } if (dataFormat.DataFormatType != DataFormatType.Binary || dataFormat.ExtBinaryFormat == null) @@ -564,42 +737,40 @@ private string EncodeWithBinaryFormatter(DataFormat dataFormat, BigInteger credN return null; } - lock (_dataFormats) + var dataFormats = _dataFormatRepository.GetAll().GetAwaiter().GetResult(); + foreach (var dataFormat in dataFormats) { - foreach (var dataFormat in _dataFormats.Values) - { - if (dataFormat.DataFormatType != DataFormatType.Binary || dataFormat.ExtBinaryFormat == null) - continue; - - try - { - var formatter = new BinaryFormatter(dataFormat); - var decodedRead = formatter.Decode(bb); + if (dataFormat.DataFormatType != DataFormatType.Binary || dataFormat.ExtBinaryFormat == null) + continue; - // Extract credential number - var credNumElements = decodedRead.GetElementsMatchingField(DataFormatField.CredNum); - if (credNumElements.Count == 0) - continue; - - var credNum = credNumElements[0].GetValue(); + try + { + var formatter = new BinaryFormatter(dataFormat); + var decodedRead = formatter.Decode(bb); - // Extract facility code if present - int? facilityCode = null; - var fcElements = decodedRead.GetElementsMatchingField(DataFormatField.FacilityCode); - if (fcElements.Count > 0) - { - facilityCode = (int)fcElements[0].GetValue(); - } + // Extract credential number + var credNumElements = decodedRead.GetElementsMatchingField(DataFormatField.CredNum); + if (credNumElements.Count == 0) + continue; - _logger.LogDebug("Decoded card read using format {Name}: credNum={CredNum}, fc={FacilityCode}", - dataFormat.Name, credNum, facilityCode); + var credNum = credNumElements[0].GetValue(); - return (credNum, facilityCode, dataFormat.Name); - } - catch (BinaryFormatterException) + // Extract facility code if present + int? facilityCode = null; + var fcElements = decodedRead.GetElementsMatchingField(DataFormatField.FacilityCode); + if (fcElements.Count > 0) { - // This format didn't match, try next + facilityCode = (int)fcElements[0].GetValue(); } + + _logger.LogDebug("Decoded card read using format {Name}: credNum={CredNum}, fc={FacilityCode}", + dataFormat.Name, credNum, facilityCode); + + return (credNum, facilityCode, dataFormat.Name); + } + catch (BinaryFormatterException) + { + // This format didn't match, try next } } diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/ProtoJsonRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/ProtoJsonRepositoryTests.cs new file mode 100644 index 0000000..4b33330 --- /dev/null +++ b/test/Aporta.Core.Tests/DataAccess/Repositories/ProtoJsonRepositoryTests.cs @@ -0,0 +1,508 @@ +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using NUnit.Framework; +using Z9.Spcore.Proto; + +namespace Aporta.Core.Tests.DataAccess.Repositories; + +[TestFixture] +public class DataFormatRepositoryTests +{ + private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); + private IDbConnection _persistConnection; + + [SetUp] + public async Task Setup() + { + _persistConnection = _dataAccess.CreateDbConnection(); + _persistConnection.Open(); + await _dataAccess.UpdateSchema(); + } + + [TearDown] + public void TearDown() + { + _persistConnection?.Close(); + _persistConnection?.Dispose(); + } + + [Test] + public async Task Upsert_NewRecord_Stores() + { + var repository = new DataFormatRepository(_dataAccess); + var dataFormat = new DataFormat + { + Unid = 1, + Name = "Standard 26-bit" + }; + + await repository.Upsert(dataFormat); + var retrieved = await repository.Get(1); + + Assert.That(retrieved, Is.Not.Null); + Assert.That(retrieved.Unid, Is.EqualTo(1)); + Assert.That(retrieved.Name, Is.EqualTo("Standard 26-bit")); + } + + [Test] + public async Task Upsert_ExistingRecord_Updates() + { + var repository = new DataFormatRepository(_dataAccess); + var original = new DataFormat { Unid = 1, Name = "Original" }; + var updated = new DataFormat { Unid = 1, Name = "Updated" }; + + await repository.Upsert(original); + await repository.Upsert(updated); + var retrieved = await repository.Get(1); + + Assert.That(retrieved.Name, Is.EqualTo("Updated")); + } + + [Test] + public async Task Get_NonExistentId_ReturnsNull() + { + var repository = new DataFormatRepository(_dataAccess); + var retrieved = await repository.Get(999); + Assert.That(retrieved, Is.Null); + } + + [Test] + public async Task GetAll_MultipleRecords_ReturnsAll() + { + var repository = new DataFormatRepository(_dataAccess); + await repository.Upsert(new DataFormat { Unid = 1, Name = "Format1" }); + await repository.Upsert(new DataFormat { Unid = 2, Name = "Format2" }); + await repository.Upsert(new DataFormat { Unid = 3, Name = "Format3" }); + + var all = (await repository.GetAll()).ToList(); + + Assert.That(all.Count, Is.EqualTo(3)); + } + + [Test] + public async Task Delete_ExistingRecord_Removes() + { + var repository = new DataFormatRepository(_dataAccess); + await repository.Upsert(new DataFormat { Unid = 1, Name = "ToDelete" }); + + await repository.Delete(1); + var retrieved = await repository.Get(1); + + Assert.That(retrieved, Is.Null); + } + + [Test] + public async Task DeleteAll_ClearsTable() + { + var repository = new DataFormatRepository(_dataAccess); + await repository.Upsert(new DataFormat { Unid = 1, Name = "Format1" }); + await repository.Upsert(new DataFormat { Unid = 2, Name = "Format2" }); + + await repository.DeleteAll(); + var count = await repository.Count(); + + Assert.That(count, Is.EqualTo(0)); + } + + [Test] + public async Task DataFormat_WithBinaryFormat_PreservesExtension() + { + var repository = new DataFormatRepository(_dataAccess); + var dataFormat = new DataFormat + { + Unid = 1, + Name = "Standard 26-bit Wiegand", + DataFormatType = DataFormatType.Binary, + ExtBinaryFormat = new BinaryFormat + { + MinBits = 26, + MaxBits = 26, + SupportReverseRead = false + } + }; + + await repository.Upsert(dataFormat); + var retrieved = await repository.Get(1); + + Assert.That(retrieved.DataFormatType, Is.EqualTo(DataFormatType.Binary)); + Assert.That(retrieved.ExtBinaryFormat, Is.Not.Null); + Assert.That(retrieved.ExtBinaryFormat.MinBits, Is.EqualTo(26)); + Assert.That(retrieved.ExtBinaryFormat.MaxBits, Is.EqualTo(26)); + Assert.That(retrieved.ExtBinaryFormat.SupportReverseRead, Is.False); + } +} + +[TestFixture] +public class DataLayoutRepositoryTests +{ + private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); + private IDbConnection _persistConnection; + + [SetUp] + public async Task Setup() + { + _persistConnection = _dataAccess.CreateDbConnection(); + _persistConnection.Open(); + await _dataAccess.UpdateSchema(); + } + + [TearDown] + public void TearDown() + { + _persistConnection?.Close(); + _persistConnection?.Dispose(); + } + + [Test] + public async Task Upsert_NewRecord_Stores() + { + var repository = new DataLayoutRepository(_dataAccess); + var dataLayout = new DataLayout + { + Unid = 1, + Name = "Standard Layout" + }; + + await repository.Upsert(dataLayout); + var retrieved = await repository.Get(1); + + Assert.That(retrieved, Is.Not.Null); + Assert.That(retrieved.Unid, Is.EqualTo(1)); + Assert.That(retrieved.Name, Is.EqualTo("Standard Layout")); + } + + [Test] + public async Task DataLayout_WithBasicDataLayout_PreservesExtension() + { + var repository = new DataLayoutRepository(_dataAccess); + var dataLayout = new DataLayout + { + Unid = 1, + Name = "Basic Layout", + LayoutType = DataLayoutType.Basic, + ExtBasicDataLayout = new BasicDataLayout + { + DataFormatUnid = 10 + } + }; + + await repository.Upsert(dataLayout); + var retrieved = await repository.Get(1); + + Assert.That(retrieved.LayoutType, Is.EqualTo(DataLayoutType.Basic)); + Assert.That(retrieved.ExtBasicDataLayout, Is.Not.Null); + Assert.That(retrieved.ExtBasicDataLayout.DataFormatUnid, Is.EqualTo(10)); + } +} + +[TestFixture] +public class CredTemplateRepositoryTests +{ + private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); + private IDbConnection _persistConnection; + + [SetUp] + public async Task Setup() + { + _persistConnection = _dataAccess.CreateDbConnection(); + _persistConnection.Open(); + await _dataAccess.UpdateSchema(); + } + + [TearDown] + public void TearDown() + { + _persistConnection?.Close(); + _persistConnection?.Dispose(); + } + + [Test] + public async Task Upsert_NewRecord_Stores() + { + var repository = new CredTemplateRepository(_dataAccess); + var credTemplate = new CredTemplate + { + Unid = 1, + Name = "Standard Card Template" + }; + + await repository.Upsert(credTemplate); + var retrieved = await repository.Get(1); + + Assert.That(retrieved, Is.Not.Null); + Assert.That(retrieved.Unid, Is.EqualTo(1)); + Assert.That(retrieved.Name, Is.EqualTo("Standard Card Template")); + } + + [Test] + public async Task CredTemplate_WithCardPinTemplate_PreservesNested() + { + var repository = new CredTemplateRepository(_dataAccess); + var credTemplate = new CredTemplate + { + Unid = 1, + Name = "Card Template", + CardPinTemplate = new CardPinTemplate + { + DataLayoutUnid = 5, + AnyDataLayout = false + } + }; + + await repository.Upsert(credTemplate); + var retrieved = await repository.Get(1); + + Assert.That(retrieved.CardPinTemplate, Is.Not.Null); + Assert.That(retrieved.CardPinTemplate.DataLayoutUnid, Is.EqualTo(5)); + } +} + +[TestFixture] +public class PrivRepositoryTests +{ + private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); + private IDbConnection _persistConnection; + + [SetUp] + public async Task Setup() + { + _persistConnection = _dataAccess.CreateDbConnection(); + _persistConnection.Open(); + await _dataAccess.UpdateSchema(); + } + + [TearDown] + public void TearDown() + { + _persistConnection?.Close(); + _persistConnection?.Dispose(); + } + + [Test] + public async Task Upsert_NewRecord_Stores() + { + var repository = new PrivRepository(_dataAccess); + var priv = new Priv + { + Unid = 1, + Name = "Front Door Access" + }; + + await repository.Upsert(priv); + var retrieved = await repository.Get(1); + + Assert.That(retrieved, Is.Not.Null); + Assert.That(retrieved.Unid, Is.EqualTo(1)); + Assert.That(retrieved.Name, Is.EqualTo("Front Door Access")); + } + + [Test] + public async Task Priv_WithDoorAccessPriv_PreservesExtension() + { + var repository = new PrivRepository(_dataAccess); + var priv = new Priv + { + Unid = 1, + Name = "Door Access", + PrivType = PrivType.Door, + ExtDoorAccessPriv = new DoorAccessPriv + { + DoorUnid = 10 + } + }; + + await repository.Upsert(priv); + var retrieved = await repository.Get(1); + + Assert.That(retrieved.PrivType, Is.EqualTo(PrivType.Door)); + Assert.That(retrieved.ExtDoorAccessPriv, Is.Not.Null); + Assert.That(retrieved.ExtDoorAccessPriv.DoorUnid, Is.EqualTo(10)); + } +} + +[TestFixture] +public class SchedRepositoryTests +{ + private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); + private IDbConnection _persistConnection; + + [SetUp] + public async Task Setup() + { + _persistConnection = _dataAccess.CreateDbConnection(); + _persistConnection.Open(); + await _dataAccess.UpdateSchema(); + } + + [TearDown] + public void TearDown() + { + _persistConnection?.Close(); + _persistConnection?.Dispose(); + } + + [Test] + public async Task Upsert_NewRecord_Stores() + { + var repository = new SchedRepository(_dataAccess); + var sched = new Sched + { + Unid = 1, + Name = "Business Hours" + }; + + await repository.Upsert(sched); + var retrieved = await repository.Get(1); + + Assert.That(retrieved, Is.Not.Null); + Assert.That(retrieved.Unid, Is.EqualTo(1)); + Assert.That(retrieved.Name, Is.EqualTo("Business Hours")); + } + + [Test] + public async Task Sched_WithElements_PreservesRepeated() + { + var repository = new SchedRepository(_dataAccess); + var sched = new Sched + { + Unid = 1, + Name = "Work Week" + }; + sched.Elements.Add(new SchedElement + { + DayMask = 0x1F, // Mon-Fri + StartMinuteOfDay = 480, // 8:00 AM + EndMinuteOfDay = 1020 // 5:00 PM + }); + + await repository.Upsert(sched); + var retrieved = await repository.Get(1); + + Assert.That(retrieved.Elements.Count, Is.EqualTo(1)); + Assert.That(retrieved.Elements[0].DayMask, Is.EqualTo(0x1F)); + Assert.That(retrieved.Elements[0].StartMinuteOfDay, Is.EqualTo(480)); + } +} + +[TestFixture] +public class HolRepositoryTests +{ + private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); + private IDbConnection _persistConnection; + + [SetUp] + public async Task Setup() + { + _persistConnection = _dataAccess.CreateDbConnection(); + _persistConnection.Open(); + await _dataAccess.UpdateSchema(); + } + + [TearDown] + public void TearDown() + { + _persistConnection?.Close(); + _persistConnection?.Dispose(); + } + + [Test] + public async Task Upsert_NewRecord_Stores() + { + var repository = new HolRepository(_dataAccess); + var hol = new Hol + { + Unid = 1, + Name = "Christmas" + }; + + await repository.Upsert(hol); + var retrieved = await repository.Get(1); + + Assert.That(retrieved, Is.Not.Null); + Assert.That(retrieved.Unid, Is.EqualTo(1)); + Assert.That(retrieved.Name, Is.EqualTo("Christmas")); + } +} + +[TestFixture] +public class HolCalRepositoryTests +{ + private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); + private IDbConnection _persistConnection; + + [SetUp] + public async Task Setup() + { + _persistConnection = _dataAccess.CreateDbConnection(); + _persistConnection.Open(); + await _dataAccess.UpdateSchema(); + } + + [TearDown] + public void TearDown() + { + _persistConnection?.Close(); + _persistConnection?.Dispose(); + } + + [Test] + public async Task Upsert_NewRecord_Stores() + { + var repository = new HolCalRepository(_dataAccess); + var holCal = new HolCal + { + Unid = 1, + Name = "US Federal Holidays" + }; + + await repository.Upsert(holCal); + var retrieved = await repository.Get(1); + + Assert.That(retrieved, Is.Not.Null); + Assert.That(retrieved.Unid, Is.EqualTo(1)); + Assert.That(retrieved.Name, Is.EqualTo("US Federal Holidays")); + } +} + +[TestFixture] +public class HolTypeRepositoryTests +{ + private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); + private IDbConnection _persistConnection; + + [SetUp] + public async Task Setup() + { + _persistConnection = _dataAccess.CreateDbConnection(); + _persistConnection.Open(); + await _dataAccess.UpdateSchema(); + } + + [TearDown] + public void TearDown() + { + _persistConnection?.Close(); + _persistConnection?.Dispose(); + } + + [Test] + public async Task Upsert_NewRecord_Stores() + { + var repository = new HolTypeRepository(_dataAccess); + var holType = new HolType + { + Unid = 1, + Name = "Federal Holiday" + }; + + await repository.Upsert(holType); + var retrieved = await repository.Get(1); + + Assert.That(retrieved, Is.Not.Null); + Assert.That(retrieved.Unid, Is.EqualTo(1)); + Assert.That(retrieved.Name, Is.EqualTo("Federal Holiday")); + } +} From 974ceb5eb9564410407528194ce172522255a318 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 22:27:04 -0500 Subject: [PATCH 16/86] Implement access granted flow for Z9 Open Community protocol Enable Aporta to grant access when a known credential is swiped: AccessService.cs: - Add AccessDecisionMade event for external systems to subscribe - Add 35-bit credential decoding fallback to match raw card reads against credentials stored as decimal numbers - Allow access decisions without door strike (for community controllers) Z9OpenCommunityProtocolService.cs: - Only set EvtSubCode for denied events (granted events don't need one) StartupWorker.cs: - Auto-create Door entities when OSDP readers come online - Subscribe to AccessDecisionMade event to forward decisions - Add retry logic for endpoint lookup during door creation Co-Authored-By: Claude Opus 4.5 --- src/Aporta.Core/Services/AccessService.cs | 98 ++++++++++++--- .../Z9OpenCommunityProtocolService.cs | 7 +- src/Aporta/Workers/StartupWorker.cs | 113 ++++++++++++++---- 3 files changed, 183 insertions(+), 35 deletions(-) diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index db1665e..dbbf5c4 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -16,6 +16,18 @@ namespace Aporta.Core.Services; +/// +/// Event args for access decision events, used to notify external systems. +/// +public class AccessDecisionEventArgs : EventArgs +{ + public string EndpointId { get; set; } + public bool IsGranted { get; set; } + public string CardNumber { get; set; } + public string PersonName { get; set; } + public EventReason Reason { get; set; } +} + public class AccessService { private readonly ExtensionService _extensionService; @@ -27,6 +39,12 @@ public class AccessService private readonly ConcurrentDictionary _processAccessCredential = new(); private readonly IHubContext _hubContext; + /// + /// Event raised when an access decision is made (granted or denied). + /// External systems can subscribe to forward the decision. + /// + public event EventHandler AccessDecisionMade; + /// /// Represents a service for accessing and managing system access. /// @@ -86,12 +104,6 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA var matchingDoorStrike = MatchingDoorStrike(matchingDoor.DoorStrikeEndpointId, endpoints); - if (matchingDoorStrike == null) - { - _logger.LogInformation("Door '{Name}' didn't have a strike assigned", matchingDoor.Name); - return; - } - if (!eventArgs.Handler.IsValid()) { return; @@ -99,7 +111,16 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA if (await IsAccessGranted(eventArgs.Handler.MatchingCardData, matchingDoor, accessPoint)) { - await OpenDoor(eventArgs.Access, matchingDoorStrike, 3); + // Only open door if strike is assigned - community controllers may not have one + if (matchingDoorStrike != null) + { + await OpenDoor(eventArgs.Access, matchingDoorStrike, 3); + } + else + { + _logger.LogInformation("Door '{Name}' access granted but no strike assigned to operate", matchingDoor.Name); + await eventArgs.Access.AccessGrantedNotification(); + } } else { @@ -114,7 +135,26 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA private async Task IsAccessGranted(string matchingCardData, Door matchingDoor, Endpoint accessPoint) { + // First try matching by raw bit string var assignedCredential = await _credentialRepository.AssignedCredential(matchingCardData); + + // If not found and the card data looks like a bit string, try matching by decoded credential number + if (assignedCredential == null && !string.IsNullOrEmpty(matchingCardData) && + matchingCardData.All(c => c == '0' || c == '1')) + { + // Try to decode as credential number - simple extraction for 35-bit format + // Format: bits 0-1 = unused, bits 2-33 = 32-bit cred num, bit 34 = parity + if (matchingCardData.Length == 35) + { + var credNumBits = matchingCardData.Substring(2, 32); + var credNum = Convert.ToInt64(credNumBits, 2); + assignedCredential = await _credentialRepository.AssignedCredential(credNum.ToString()); + if (assignedCredential != null) + { + _logger.LogDebug("Matched credential by decoded 35-bit credNum: {CredNum}", credNum); + } + } + } int eventId; if (assignedCredential?.Person == null) { @@ -141,16 +181,26 @@ await _credentialRepository.Insert(new Credential { await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); } - + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); + // Notify external systems of access decision + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = false, + CardNumber = matchingCardData, + PersonName = null, + Reason = EventReason.CredentialNotEnrolled + }); + return false; } if (!AccessGranted()) { _logger.LogInformation("Door '{Name}' denied access", matchingDoor.Name); - + eventId = await _eventRepository.Insert(new Event { EndpointId = accessPoint.Id, Type = EventType.AccessDenied, @@ -164,14 +214,24 @@ await _credentialRepository.Insert(new Credential }) }); await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); - + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); - + + // Notify external systems of access decision + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = false, + CardNumber = matchingCardData, + PersonName = assignedCredential.Person.FirstName, + Reason = EventReason.AccessNotAssigned + }); + return false; } _logger.LogInformation("Door '{Name}' granted access", matchingDoor.Name); - + eventId = await _eventRepository.Insert(new Event { EndpointId = accessPoint.Id, Type = EventType.AccessGranted, @@ -185,9 +245,19 @@ await _credentialRepository.Insert(new Credential }) }); await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); - + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); - + + // Notify external systems of access decision + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = true, + CardNumber = matchingCardData, + PersonName = assignedCredential.Person.FirstName, + Reason = EventReason.None + }); + return true; } diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 6fa3ef7..be3c644 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -932,7 +932,6 @@ public void SendAccessEvent(OsdpReaderConfig config, bool isGranted, BigInteger? var evt = new Evt { EvtCode = evtCode, - EvtSubCode = subCode, HwTime = new DateTimeData { Millis = nowMillis }, DbTime = new DateTimeData { Millis = nowMillis }, Consumed = false, @@ -945,6 +944,12 @@ public void SendAccessEvent(OsdpReaderConfig config, bool isGranted, BigInteger? } }; + // Only set EvtSubCode for denied events (access granted events don't have a sub-code) + if (!isGranted) + { + evt.EvtSubCode = subCode; + } + // Add decoded credential number to EvtCredRef if available if (credNum.HasValue) { diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 86e975d..70a6b41 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -5,9 +5,11 @@ using System.Threading; using System.Threading.Tasks; using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; using Aporta.Core.Services; using Aporta.Drivers.OSDP.Shared; using Aporta.Extensions.Hardware; +using Aporta.Shared.Models; using Z9.Spcore.Proto; using Aporta.Drivers.OSDP.Shared.Actions; using Dapper; @@ -30,6 +32,8 @@ public class StartupWorker : BackgroundService private readonly ExtensionService _extensionService; private readonly AccessService _accessService; private readonly Z9OpenCommunityProtocolService _z9OpenCommunityProtocolService; + private readonly DoorRepository _doorRepository; + private readonly EndpointRepository _endpointRepository; private readonly HashSet _configuredOsdpBuses = new(); public StartupWorker(IDataAccess dataAccess, @@ -46,6 +50,8 @@ public StartupWorker(IDataAccess dataAccess, _configuration = configuration; _logger = logger; _applicationLifetime = applicationLifetime; + _doorRepository = new DoorRepository(dataAccess); + _endpointRepository = new EndpointRepository(dataAccess); } protected override async Task ExecuteAsync(CancellationToken stoppingToken) @@ -84,11 +90,11 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) // Subscribe to OSDP configuration events before starting the service _z9OpenCommunityProtocolService.OsdpConfigurationReceived += OnOsdpConfigurationReceived; - // Subscribe to device online status changes to send events back to Z9 + // Subscribe to device online status changes to forward via community protocol _extensionService.OnlineStatusChanged += OnOnlineStatusChanged; - // Subscribe to card reads to send access events to Z9 - _extensionService.AccessCredentialReceived += OnAccessCredentialReceived; + // Subscribe to access decisions to forward via community protocol + _accessService.AccessDecisionMade += OnAccessDecisionMade; _z9OpenCommunityProtocolService.Start(z9OpenCommunityHost, z9OpenCommunityPort, z9OpenCommunityId); } @@ -110,7 +116,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) stoppingToken.Register(() => { _logger.LogWarning("Application is shutting down"); - _extensionService.AccessCredentialReceived -= OnAccessCredentialReceived; + _accessService.AccessDecisionMade -= OnAccessDecisionMade; _extensionService.OnlineStatusChanged -= OnOnlineStatusChanged; _z9OpenCommunityProtocolService.OsdpConfigurationReceived -= OnOsdpConfigurationReceived; _z9OpenCommunityProtocolService.Stop(); @@ -275,23 +281,86 @@ private void OnOnlineStatusChanged(object sender, OnlineStatusChangedEventArgs e _logger.LogInformation("OSDP reader {Name} is now {Status}", config.Name, e.IsOnline ? "online" : "offline"); + // When reader comes online, ensure a Door exists for access control decisions + if (e.IsOnline && e.Endpoint != null) + { + var driverEndpointId = e.Endpoint.Id; // This is the DriverEndpointId (string) + Task.Run(async () => + { + try + { + await EnsureDoorExistsForReader(driverEndpointId, config.Name); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to create door for reader {Name}", config.Name); + } + }); + } + _z9OpenCommunityProtocolService.SendCredReaderOnlineEvent(config, e.IsOnline); } - private void OnAccessCredentialReceived(object sender, AccessCredentialReceivedEventArgs e) + private async Task EnsureDoorExistsForReader(string driverEndpointId, string readerName) + { + // Look up the endpoint by DriverEndpointId to get its database ID + // The endpoint may not be persisted immediately, so retry a few times + Aporta.Shared.Models.Endpoint readerEndpoint = null; + for (int retry = 0; retry < 10; retry++) + { + var endpoints = await _endpointRepository.GetAll(); + readerEndpoint = endpoints.FirstOrDefault(ep => ep.DriverEndpointId == driverEndpointId); + if (readerEndpoint != null) + break; + await Task.Delay(500); // Wait for endpoint to be persisted + } + + if (readerEndpoint == null) + { + _logger.LogWarning("Cannot create door: endpoint not found for DriverEndpointId {Id} after retries", driverEndpointId); + return; + } + + var doors = await _doorRepository.GetAll(); + + // Check if any door already uses this reader as InAccess or OutAccess + var existingDoor = doors.FirstOrDefault(d => + d.InAccessEndpointId == readerEndpoint.Id || + d.OutAccessEndpointId == readerEndpoint.Id); + + if (existingDoor != null) + { + _logger.LogDebug("Door '{DoorName}' already exists for reader endpoint {EndpointId}", + existingDoor.Name, readerEndpoint.Id); + return; + } + + // Create a new door with this reader as the in-access point + var door = new Aporta.Shared.Models.Door + { + Name = $"Door - {readerName}", + InAccessEndpointId = readerEndpoint.Id, + // Note: DoorStrikeEndpointId is left null - access decisions will still be made + // but the strike won't be activated (appropriate for simple test scenario) + }; + + await _doorRepository.Insert(door); + _logger.LogInformation("Created door '{DoorName}' for reader endpoint {EndpointId}", + door.Name, readerEndpoint.Id); + } + + private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) { // Get the Z9 config for this endpoint to send event with correct device unid - var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(e.Access?.Id); + var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(e.EndpointId); if (config == null) { _logger.LogDebug("No Z9 config found for endpoint {EndpointId}, skipping access event", - e.Access?.Id); + e.EndpointId); return; } - var rawBits = e.Handler?.MatchingCardData; - _logger.LogInformation("Card read on reader {Name}: rawBits={RawBits}", - config.Name, rawBits ?? "(unknown)"); + var rawBits = e.CardNumber; // Try to decode the raw bits using known card formats System.Numerics.BigInteger? credNum = null; @@ -303,24 +372,28 @@ private void OnAccessCredentialReceived(object sender, AccessCredentialReceivedE { credNum = decoded.Value.credNum; facilityCode = decoded.Value.facilityCode; - _logger.LogInformation("Decoded card read: credNum={CredNum}, fc={FacilityCode}, format={Format}", + _logger.LogDebug("Decoded card: credNum={CredNum}, fc={FacilityCode}, format={Format}", credNum, facilityCode, decoded.Value.formatName); } - else - { - _logger.LogDebug("Unable to decode card read with any known format"); - } } - // For now, send all card reads as access denied with unknown credential - // In a more complete implementation, this would check if the credential is known - // and send the appropriate event (granted or denied with specific reason) + // Map EventReason to EvtSubCode (for granted, subCode is ignored so use default 0 value) + var subCode = e.Reason switch + { + EventReason.CredentialNotEnrolled => EvtSubCode.AccessDeniedUnknownCredNum, + EventReason.AccessNotAssigned => EvtSubCode.AccessDeniedNoPriv, + _ => EvtSubCode.AccessDeniedInactive // Default value (0); unused for granted events + }; + + _logger.LogInformation("Access {Decision} for reader {Name}: person={Person}, reason={Reason}", + e.IsGranted ? "GRANTED" : "DENIED", config.Name, e.PersonName ?? "(unknown)", e.Reason); + _z9OpenCommunityProtocolService.SendAccessEvent( config, - isGranted: false, + isGranted: e.IsGranted, credNum: credNum, facilityCode: facilityCode, rawBits: rawBits, - subCode: EvtSubCode.AccessDeniedUnknownCredNum); + subCode: subCode); } } \ No newline at end of file From 5632b03687312d6ced210e4385c2d7f46062af6e Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 23:17:32 -0500 Subject: [PATCH 17/86] Implement privilege checking for Z9 Open Community access control - Add Z9CredRepository to store full Z9 Cred proto with privilege bindings - Add migration _0002_AddZ9CredTable for z9_cred table - Implement HasAccessPrivilege() in AccessService to check privilege bindings - Store Z9 Cred proto when processing credentials from Z9 server - Check for PrivType.Door or precision access bindings before granting access Co-Authored-By: Claude Opus 4.5 --- .../Migrations/_0002_AddZ9CredTable.cs | 25 +++++++ .../Repositories/Z9CredRepository.cs | 21 ++++++ .../DataAccess/SqLiteDataAccess.cs | 3 +- src/Aporta.Core/Services/AccessService.cs | 73 +++++++++++++++++-- .../Z9OpenCommunityProtocolService.cs | 9 ++- 5 files changed, 122 insertions(+), 9 deletions(-) create mode 100644 src/Aporta.Core/DataAccess/Migrations/_0002_AddZ9CredTable.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs diff --git a/src/Aporta.Core/DataAccess/Migrations/_0002_AddZ9CredTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0002_AddZ9CredTable.cs new file mode 100644 index 0000000..bd5e79b --- /dev/null +++ b/src/Aporta.Core/DataAccess/Migrations/_0002_AddZ9CredTable.cs @@ -0,0 +1,25 @@ +using System.Data; +using System.Threading.Tasks; +using Dapper; + +namespace Aporta.Core.DataAccess.Migrations; + +public class _0002_AddZ9CredTable : IMigration +{ + public int Version => 102; + + public string Name => "Add Z9 Cred table for storing full credential proto with privilege bindings"; + + public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) + { + await connection.ExecuteAsync( + @" + -- Z9 Credential table (stores full proto including privBindings) + CREATE TABLE z9_cred ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + ", + transaction: transaction); + } +} diff --git a/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs b/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs new file mode 100644 index 0000000..2d8cbd7 --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs @@ -0,0 +1,21 @@ +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +/// +/// Repository for storing the full Z9 Cred proto messages (including privBindings). +/// This is separate from CredentialRepository which stores Aporta's legacy credential format. +/// +public class Z9CredRepository : ProtoJsonRepository +{ + private readonly IDataAccess _dataAccess; + + public Z9CredRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "z9_cred"; + protected override int GetUnid(Cred message) => message.Unid; +} diff --git a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs index 225ced3..1f579d2 100644 --- a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs +++ b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs @@ -19,7 +19,8 @@ public class SqLiteDataAccess : IDataAccess private readonly IMigration[] _migrations = { new _0000_InitialCreate(), - new _0001_AddZ9OpenTables() + new _0001_AddZ9OpenTables(), + new _0002_AddZ9CredTable() }; /// diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index dbbf5c4..86db976 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -13,6 +13,7 @@ using Aporta.Shared.Models; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; +using Z9.Spcore.Proto; namespace Aporta.Core.Services; @@ -36,6 +37,8 @@ public class AccessService private readonly EndpointRepository _endpointRepository; private readonly CredentialRepository _credentialRepository; private readonly EventRepository _eventRepository; + private readonly Z9CredRepository _z9CredRepository; + private readonly PrivRepository _privRepository; private readonly ConcurrentDictionary _processAccessCredential = new(); private readonly IHubContext _hubContext; @@ -55,6 +58,8 @@ public AccessService(IDataAccess dataAccess, ExtensionService extensionService, _credentialRepository = new CredentialRepository(dataAccess); _endpointRepository = new EndpointRepository(dataAccess); _eventRepository = new EventRepository(dataAccess); + _z9CredRepository = new Z9CredRepository(dataAccess); + _privRepository = new PrivRepository(dataAccess); _extensionService = extensionService; _hubContext = hubContext; _logger = logger; @@ -133,7 +138,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA } } - private async Task IsAccessGranted(string matchingCardData, Door matchingDoor, Endpoint accessPoint) + private async Task IsAccessGranted(string matchingCardData, Aporta.Shared.Models.Door matchingDoor, Endpoint accessPoint) { // First try matching by raw bit string var assignedCredential = await _credentialRepository.AssignedCredential(matchingCardData); @@ -197,9 +202,9 @@ await _credentialRepository.Insert(new Credential return false; } - if (!AccessGranted()) + if (!await HasAccessPrivilege(assignedCredential.Id, matchingDoor)) { - _logger.LogInformation("Door '{Name}' denied access", matchingDoor.Name); + _logger.LogInformation("Door '{Name}' denied access - no privilege", matchingDoor.Name); eventId = await _eventRepository.Insert(new Event { @@ -282,12 +287,68 @@ async Task ControlStrike() await Task.WhenAll(openDoorTasks); } - private static bool AccessGranted() + /// + /// Checks if the credential has privilege to access the door. + /// For now, checks if the credential has any valid privilege binding. + /// TODO: Add door-specific privilege checking once Z9 Door-to-Aporta Door mapping is established. + /// + private async Task HasAccessPrivilege(int credentialUnid, Aporta.Shared.Models.Door door) { - return true; + // Look up the full Z9 Cred proto to check privilege bindings + var z9Cred = await _z9CredRepository.Get(credentialUnid); + if (z9Cred == null) + { + _logger.LogDebug("Z9 Cred not found for unid {Unid}, denying access", credentialUnid); + return false; + } + + if (z9Cred.PrivBindings == null || z9Cred.PrivBindings.Count == 0) + { + _logger.LogDebug("Credential {Unid} has no privilege bindings, denying access", credentialUnid); + return false; + } + + // Check each privilege binding + foreach (var binding in z9Cred.PrivBindings) + { + // Check for precision access (direct door reference) + if (binding.DevAsDoorAccessPrivUnidCase == CredPrivBinding.DevAsDoorAccessPrivUnidOneofCase.DevAsDoorAccessPrivUnid) + { + // TODO: Map Z9 door unid to Aporta door ID and verify match + _logger.LogDebug("Credential {Unid} has precision access binding to door unid {DoorUnid}", + credentialUnid, binding.DevAsDoorAccessPrivUnid); + return true; // For now, grant access if any precision binding exists + } + + // Check for privilege reference + if (binding.PrivUnidCase == CredPrivBinding.PrivUnidOneofCase.PrivUnid) + { + var priv = await _privRepository.Get(binding.PrivUnid); + if (priv == null) + { + _logger.LogDebug("Privilege {Unid} not found for credential {CredUnid}", + binding.PrivUnid, credentialUnid); + continue; + } + + // Check if this is a door access privilege + if (priv.PrivType == PrivType.Door && priv.Enabled) + { + // TODO: Verify the door access privilege applies to this specific door + // For now, grant access if the credential has any enabled door access privilege + _logger.LogDebug("Credential {Unid} has door access privilege {PrivUnid} ({PrivName})", + credentialUnid, priv.Unid, priv.Name); + return true; + } + } + } + + _logger.LogDebug("Credential {Unid} has no matching privilege for door {DoorName}", + credentialUnid, door.Name); + return false; } - private async Task MatchingDoor(string accessPointId, Endpoint[] endpoints) + private async Task MatchingDoor(string accessPointId, Endpoint[] endpoints) { var doors = await _doorRepository.GetAll(); diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index be3c644..2c48653 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -34,6 +34,7 @@ public class Z9OpenCommunityProtocolService : IDisposable private readonly HolRepository _holRepository; private readonly HolCalRepository _holCalRepository; private readonly HolTypeRepository _holTypeRepository; + private readonly Z9CredRepository _z9CredRepository; // Received OSDP CredReader configurations from Z9 private readonly List _osdpReaderConfigs = new(); @@ -84,6 +85,7 @@ public Z9OpenCommunityProtocolService( _holRepository = new HolRepository(dataAccess); _holCalRepository = new HolCalRepository(dataAccess); _holTypeRepository = new HolTypeRepository(dataAccess); + _z9CredRepository = new Z9CredRepository(dataAccess); } public void Start(string host, int port, string id = null) @@ -568,8 +570,11 @@ private void ProcessCredential(Cred cred) var personName = !string.IsNullOrWhiteSpace(cred.Name) ? cred.Name : bitString; - _logger.LogInformation("Processing credential Unid={Unid} Number={Number} Name={Name}", - cred.Unid, bitString, personName); + _logger.LogInformation("Processing credential Unid={Unid} Number={Number} Name={Name} PrivBindings={BindingCount}", + cred.Unid, bitString, personName, cred.PrivBindings.Count); + + // Store the full Z9 Cred proto (for privilege checking) + _z9CredRepository.Upsert(cred).GetAwaiter().GetResult(); if (AutoCreatePersonForCredential) { From a30d17b8f6c3d76377195965a4db8840b4e8c6f4 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 23:21:27 -0500 Subject: [PATCH 18/86] Update Z9.Protobuf.Community to 1.0.5 Includes schedule utilities for evaluating time-based access restrictions. Co-Authored-By: Claude Opus 4.5 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- src/Aporta/Aporta.csproj | 2 +- test/Aporta.Core.Tests/Aporta.Core.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 4933aff..a18f41b 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 9543dc3..26cb779 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -33,7 +33,7 @@ - + diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 986e1af..01bed9c 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + From 1a58bd00984e3e31be434ca25fc22a2a8cf4e21a Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 5 Feb 2026 23:45:54 -0500 Subject: [PATCH 19/86] Add credential status checks for access denied scenarios Check Z9 Cred status before granting access: - Disabled credential -> ACCESS_DENIED_INACTIVE - Not yet effective (future date) -> ACCESS_DENIED_NOT_EFFECTIVE - Expired (past date) -> ACCESS_DENIED_EXPIRED - No privilege bindings -> ACCESS_DENIED_NO_PRIV Add corresponding EventReason enum values and map to EvtSubCode for proper event reporting to Z9 host. Co-Authored-By: Claude Opus 4.5 --- src/Aporta.Core/Services/AccessService.cs | 115 +++++++++++++++++++++- src/Aporta.Shared/Models/EventData.cs | 10 +- src/Aporta/Workers/StartupWorker.cs | 4 + 3 files changed, 126 insertions(+), 3 deletions(-) diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 86db976..935de36 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -202,6 +202,117 @@ await _credentialRepository.Insert(new Credential return false; } + // Check Z9 Cred status (enabled, effective date) + var z9Cred = await _z9CredRepository.Get(assignedCredential.Id); + if (z9Cred != null) + { + // Check if credential is disabled + if (z9Cred.EnabledCase == Cred.EnabledOneofCase.Enabled && !z9Cred.Enabled) + { + _logger.LogInformation("Door '{Name}' denied access - credential disabled", matchingDoor.Name); + + eventId = await _eventRepository.Insert(new Event + { + EndpointId = accessPoint.Id, Type = EventType.AccessDenied, + Data = JsonSerializer.Serialize(new EventData + { + Door = matchingDoor, + Endpoint = accessPoint, + Person = assignedCredential.Person, + EventReason = EventReason.CredentialDisabled, + CardNumber = matchingCardData + }) + }); + await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); + + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = false, + CardNumber = matchingCardData, + PersonName = assignedCredential.Person.FirstName, + Reason = EventReason.CredentialDisabled + }); + + return false; + } + + // Check if credential is not yet effective + if (z9Cred.Effective != null && z9Cred.Effective.MillisCase == DateTimeData.MillisOneofCase.Millis) + { + var effectiveDate = DateTimeOffset.FromUnixTimeMilliseconds(z9Cred.Effective.Millis).DateTime; + if (effectiveDate > DateTime.UtcNow) + { + _logger.LogInformation("Door '{Name}' denied access - credential not yet effective (effective {Date})", + matchingDoor.Name, effectiveDate.ToShortDateString()); + + eventId = await _eventRepository.Insert(new Event + { + EndpointId = accessPoint.Id, Type = EventType.AccessDenied, + Data = JsonSerializer.Serialize(new EventData + { + Door = matchingDoor, + Endpoint = accessPoint, + Person = assignedCredential.Person, + EventReason = EventReason.CredentialNotYetEffective, + CardNumber = matchingCardData + }) + }); + await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); + + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = false, + CardNumber = matchingCardData, + PersonName = assignedCredential.Person.FirstName, + Reason = EventReason.CredentialNotYetEffective + }); + + return false; + } + } + + // Check if credential has expired + if (z9Cred.Expires != null && z9Cred.Expires.MillisCase == DateTimeData.MillisOneofCase.Millis) + { + var expiresDate = DateTimeOffset.FromUnixTimeMilliseconds(z9Cred.Expires.Millis).DateTime; + if (expiresDate < DateTime.UtcNow) + { + _logger.LogInformation("Door '{Name}' denied access - credential expired (expired {Date})", + matchingDoor.Name, expiresDate.ToShortDateString()); + + eventId = await _eventRepository.Insert(new Event + { + EndpointId = accessPoint.Id, Type = EventType.AccessDenied, + Data = JsonSerializer.Serialize(new EventData + { + Door = matchingDoor, + Endpoint = accessPoint, + Person = assignedCredential.Person, + EventReason = EventReason.CredentialExpired, + CardNumber = matchingCardData + }) + }); + await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); + + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = false, + CardNumber = matchingCardData, + PersonName = assignedCredential.Person.FirstName, + Reason = EventReason.CredentialExpired + }); + + return false; + } + } + } + if (!await HasAccessPrivilege(assignedCredential.Id, matchingDoor)) { _logger.LogInformation("Door '{Name}' denied access - no privilege", matchingDoor.Name); @@ -214,7 +325,7 @@ await _credentialRepository.Insert(new Credential Door = matchingDoor, Endpoint = accessPoint, Person = assignedCredential.Person, - EventReason = EventReason.AccessNotAssigned, + EventReason = EventReason.NoPrivilege, CardNumber = matchingCardData }) }); @@ -229,7 +340,7 @@ await _credentialRepository.Insert(new Credential IsGranted = false, CardNumber = matchingCardData, PersonName = assignedCredential.Person.FirstName, - Reason = EventReason.AccessNotAssigned + Reason = EventReason.NoPrivilege }); return false; diff --git a/src/Aporta.Shared/Models/EventData.cs b/src/Aporta.Shared/Models/EventData.cs index 713fad0..618d82d 100644 --- a/src/Aporta.Shared/Models/EventData.cs +++ b/src/Aporta.Shared/Models/EventData.cs @@ -25,5 +25,13 @@ public enum EventReason [Description("Access Not Assigned")] AccessNotAssigned, [Description("Credential Not Enrolled")] - CredentialNotEnrolled + CredentialNotEnrolled, + [Description("Credential Disabled")] + CredentialDisabled, + [Description("Credential Not Yet Effective")] + CredentialNotYetEffective, + [Description("Credential Expired")] + CredentialExpired, + [Description("No Privilege")] + NoPrivilege } \ No newline at end of file diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 70a6b41..6184c86 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -382,6 +382,10 @@ private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) { EventReason.CredentialNotEnrolled => EvtSubCode.AccessDeniedUnknownCredNum, EventReason.AccessNotAssigned => EvtSubCode.AccessDeniedNoPriv, + EventReason.NoPrivilege => EvtSubCode.AccessDeniedNoPriv, + EventReason.CredentialDisabled => EvtSubCode.AccessDeniedInactive, + EventReason.CredentialNotYetEffective => EvtSubCode.AccessDeniedNotEffective, + EventReason.CredentialExpired => EvtSubCode.AccessDeniedExpired, _ => EvtSubCode.AccessDeniedInactive // Default value (0); unused for granted events }; From 46c992640b4d77346a13e5c4b76e2dfedcc7455d Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Fri, 6 Feb 2026 07:44:42 -0500 Subject: [PATCH 20/86] Update Z9.Protobuf.Community to 1.0.6 and add door-specific privilege checking Upgrade NuGet package to 1.0.6, fix protobuf API usage for DoorAccessPriv (use Elements collection) and SchedElement (use SchedDays/Start/Stop), add DoorUnid to OsdpReaderConfig for door-to-reader mapping, implement schedule restriction checking for access privileges, and simplify csproj references by removing conditional local Z9.Protobuf paths. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 14 +- src/Aporta.Core/Services/AccessService.cs | 182 ++++++++++++++++-- .../Z9OpenCommunityProtocolService.cs | 6 +- src/Aporta.Shared/Models/EventData.cs | 4 +- src/Aporta/Aporta.csproj | 13 +- src/Aporta/Workers/StartupWorker.cs | 5 + .../Aporta.Core.Tests.csproj | 2 +- .../Repositories/ProtoJsonRepositoryTests.cs | 28 +-- 8 files changed, 195 insertions(+), 59 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index a18f41b..7466a02 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -4,9 +4,6 @@ Aporta.Core Aporta.Core default - - $(MSBuildThisFileDirectory)../../../z9main/z9.net/Z9/Z9.Protobuf/Z9.Protobuf.csproj - true @@ -14,16 +11,7 @@ - - - - - - - - - - + diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 935de36..9d8dccd 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -13,6 +13,7 @@ using Aporta.Shared.Models; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; +using Z9.Protobuf; using Z9.Spcore.Proto; namespace Aporta.Core.Services; @@ -39,8 +40,10 @@ public class AccessService private readonly EventRepository _eventRepository; private readonly Z9CredRepository _z9CredRepository; private readonly PrivRepository _privRepository; + private readonly SchedRepository _schedRepository; private readonly ConcurrentDictionary _processAccessCredential = new(); private readonly IHubContext _hubContext; + private Func _getDoorUnidForEndpoint; /// /// Event raised when an access decision is made (granted or denied). @@ -60,11 +63,21 @@ public AccessService(IDataAccess dataAccess, ExtensionService extensionService, _eventRepository = new EventRepository(dataAccess); _z9CredRepository = new Z9CredRepository(dataAccess); _privRepository = new PrivRepository(dataAccess); + _schedRepository = new SchedRepository(dataAccess); _extensionService = extensionService; _hubContext = hubContext; _logger = logger; } + /// + /// Sets a function to look up the Z9 Door unid for an endpoint. + /// Called by StartupWorker after Z9OpenCommunityProtocolService is available. + /// + public void SetDoorUnidLookup(Func getDoorUnidForEndpoint) + { + _getDoorUnidForEndpoint = getDoorUnidForEndpoint; + } + public void Startup() { _extensionService.AccessCredentialReceived += ExtensionServiceOnAccessCredentialReceived; @@ -313,9 +326,12 @@ await _credentialRepository.Insert(new Credential } } - if (!await HasAccessPrivilege(assignedCredential.Id, matchingDoor)) + var privilegeDenialReason = await CheckAccessPrivilege(assignedCredential.Id, matchingDoor, accessPoint.DriverEndpointId); + if (privilegeDenialReason != null) { - _logger.LogInformation("Door '{Name}' denied access - no privilege", matchingDoor.Name); + var reason = privilegeDenialReason.Value; + var reasonText = reason == EventReason.OutsideSchedule ? "outside schedule" : "no privilege"; + _logger.LogInformation("Door '{Name}' denied access - {Reason}", matchingDoor.Name, reasonText); eventId = await _eventRepository.Insert(new Event { @@ -325,7 +341,7 @@ await _credentialRepository.Insert(new Credential Door = matchingDoor, Endpoint = accessPoint, Person = assignedCredential.Person, - EventReason = EventReason.NoPrivilege, + EventReason = reason, CardNumber = matchingCardData }) }); @@ -340,7 +356,7 @@ await _credentialRepository.Insert(new Credential IsGranted = false, CardNumber = matchingCardData, PersonName = assignedCredential.Person.FirstName, - Reason = EventReason.NoPrivilege + Reason = reason }); return false; @@ -400,63 +416,189 @@ async Task ControlStrike() /// /// Checks if the credential has privilege to access the door. - /// For now, checks if the credential has any valid privilege binding. - /// TODO: Add door-specific privilege checking once Z9 Door-to-Aporta Door mapping is established. + /// Returns null if access is granted, or the EventReason for denial. /// - private async Task HasAccessPrivilege(int credentialUnid, Aporta.Shared.Models.Door door) + private async Task CheckAccessPrivilege(int credentialUnid, Aporta.Shared.Models.Door door, string endpointId) { + // Look up the Z9 Door unid for this endpoint + int? z9DoorUnid = _getDoorUnidForEndpoint?.Invoke(endpointId); + // Look up the full Z9 Cred proto to check privilege bindings var z9Cred = await _z9CredRepository.Get(credentialUnid); if (z9Cred == null) { _logger.LogDebug("Z9 Cred not found for unid {Unid}, denying access", credentialUnid); - return false; + return EventReason.NoPrivilege; } if (z9Cred.PrivBindings == null || z9Cred.PrivBindings.Count == 0) { _logger.LogDebug("Credential {Unid} has no privilege bindings, denying access", credentialUnid); - return false; + return EventReason.NoPrivilege; } + // Track if we found any valid privilege (to distinguish NO_PRIV from OUTSIDE_SCHED) + bool foundValidPrivilege = false; + // Check each privilege binding foreach (var binding in z9Cred.PrivBindings) { - // Check for precision access (direct door reference) + // Check for precision access (direct door reference via devAsDoorAccessPrivUnid) if (binding.DevAsDoorAccessPrivUnidCase == CredPrivBinding.DevAsDoorAccessPrivUnidOneofCase.DevAsDoorAccessPrivUnid) { - // TODO: Map Z9 door unid to Aporta door ID and verify match + // Check if this precision access applies to our door + if (z9DoorUnid.HasValue && binding.DevAsDoorAccessPrivUnid != z9DoorUnid.Value) + { + _logger.LogDebug("Credential {Unid} has precision access to door {PrivDoor} but not to {ActualDoor}", + credentialUnid, binding.DevAsDoorAccessPrivUnid, z9DoorUnid.Value); + continue; // This binding doesn't apply to our door + } + + foundValidPrivilege = true; + + // Check schedule restriction on the binding + if (!await IsInSchedule(binding.SchedRestriction)) + { + _logger.LogDebug("Credential {Unid} has precision access but outside schedule", + credentialUnid); + continue; // Try other bindings + } + _logger.LogDebug("Credential {Unid} has precision access binding to door unid {DoorUnid}", credentialUnid, binding.DevAsDoorAccessPrivUnid); - return true; // For now, grant access if any precision binding exists + return null; // Access granted } - // Check for privilege reference - if (binding.PrivUnidCase == CredPrivBinding.PrivUnidOneofCase.PrivUnid) + // Check for privilege reference (DoorAccessPriv) + // Note: Community proto uses "Unid" field (not "PrivUnid") + if (binding.UnidCase == CredPrivBinding.UnidOneofCase.Unid) { - var priv = await _privRepository.Get(binding.PrivUnid); + var priv = await _privRepository.Get(binding.Unid); if (priv == null) { _logger.LogDebug("Privilege {Unid} not found for credential {CredUnid}", - binding.PrivUnid, credentialUnid); + binding.Unid, credentialUnid); continue; } // Check if this is a door access privilege if (priv.PrivType == PrivType.Door && priv.Enabled) { - // TODO: Verify the door access privilege applies to this specific door - // For now, grant access if the credential has any enabled door access privilege + // Check if any DoorAccessPrivElement matches our door + bool doorMatches = await CheckDoorAccessPrivElements(priv, z9DoorUnid); + if (!doorMatches) + { + _logger.LogDebug("Credential {Unid} has privilege {PrivName} but it doesn't include door {DoorUnid}", + credentialUnid, priv.Name, z9DoorUnid); + continue; // This privilege doesn't cover our door + } + + foundValidPrivilege = true; + + // Check schedule restriction on the binding + if (!await IsInSchedule(binding.SchedRestriction)) + { + _logger.LogDebug("Credential {Unid} has privilege {PrivName} but outside schedule", + credentialUnid, priv.Name); + continue; // Try other bindings + } + + // TODO: Also check element-level schedule restrictions + _logger.LogDebug("Credential {Unid} has door access privilege {PrivUnid} ({PrivName})", credentialUnid, priv.Unid, priv.Name); - return true; + return null; // Access granted } } } + // If we found valid privileges but all were outside schedule, return OutsideSchedule + if (foundValidPrivilege) + { + _logger.LogDebug("Credential {Unid} has valid privileges but all are outside schedule for door {DoorName}", + credentialUnid, door.Name); + return EventReason.OutsideSchedule; + } + _logger.LogDebug("Credential {Unid} has no matching privilege for door {DoorName}", credentialUnid, door.Name); - return false; + return EventReason.NoPrivilege; + } + + /// + /// Checks if a DoorAccessPriv includes the specified door. + /// + private Task CheckDoorAccessPrivElements(Priv priv, int? z9DoorUnid) + { + var doorAccessPriv = priv.ExtDoorAccessPriv; + if (doorAccessPriv == null || doorAccessPriv.Elements == null || doorAccessPriv.Elements.Count == 0) + { + // No elements means no doors covered + _logger.LogDebug("DoorAccessPriv {PrivUnid} has no elements", priv.Unid); + return Task.FromResult(false); + } + + // If we don't know the Z9 door unid, we can't do door-specific checking + // Fall back to allowing access if there are any elements + if (!z9DoorUnid.HasValue) + { + _logger.LogDebug("No Z9 door unid available, allowing any DoorAccessPriv element"); + return Task.FromResult(true); + } + + foreach (var element in doorAccessPriv.Elements) + { + // Check if element specifies a door + if (element.DoorUnidCase == DoorAccessPrivElement.DoorUnidOneofCase.DoorUnid) + { + if (element.DoorUnid == z9DoorUnid.Value) + { + _logger.LogDebug("DoorAccessPrivElement matches door {DoorUnid}", z9DoorUnid.Value); + return Task.FromResult(true); + } + } + else + { + // Element has no specific door - means "all doors" + // (community profile doesn't support devGroup or controlledArea) + _logger.LogDebug("DoorAccessPrivElement has no specific door, treating as 'all doors'"); + return Task.FromResult(true); + } + } + + _logger.LogDebug("No DoorAccessPrivElement matches door {DoorUnid}", z9DoorUnid.Value); + return Task.FromResult(false); + } + + /// + /// Checks if the current time is within the schedule restriction. + /// Returns true if in schedule or no schedule restriction (null = always). + /// + private async Task IsInSchedule(SchedRestriction schedRestriction) + { + // No schedule restriction means "always" (24/7) + if (schedRestriction == null) + return true; + + // No schedule unid means "always" + if (schedRestriction.SchedUnidCase != SchedRestriction.SchedUnidOneofCase.SchedUnid) + return true; + + var sched = await _schedRepository.Get(schedRestriction.SchedUnid); + if (sched == null) + { + _logger.LogWarning("Schedule {Unid} not found, treating as always active", schedRestriction.SchedUnid); + return true; + } + + // TODO: Pass holidays when we have HolRepository + bool inSched = SchedEvaluator.InSched(DateTime.Now, sched, null); + + // Apply invert flag + if (schedRestriction.Invert) + inSched = !inSched; + + return inSched; } private async Task MatchingDoor(string accessPointId, Endpoint[] endpoints) diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 2c48653..9529652 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -54,6 +54,7 @@ public class OsdpReaderConfig public int TcpPort { get; set; } = DefaultOsdpTcpPort; public int OsdpAddress { get; set; } public int BaudRate { get; set; } = 9600; + public int? DoorUnid { get; set; } } private Thread _thread; private volatile bool _stopping; @@ -507,7 +508,10 @@ private void ProcessDev(Dev dev) Host = host, TcpPort = tcpPort, OsdpAddress = dev.Port, // OSDP polling address (0-126) - BaudRate = dev.Speed > 0 ? dev.Speed : 9600 + BaudRate = dev.Speed > 0 ? dev.Speed : 9600, + DoorUnid = dev.LogicalParentUnidCase == Dev.LogicalParentUnidOneofCase.LogicalParentUnid + ? dev.LogicalParentUnid + : null }; _logger.LogInformation( diff --git a/src/Aporta.Shared/Models/EventData.cs b/src/Aporta.Shared/Models/EventData.cs index 618d82d..799b026 100644 --- a/src/Aporta.Shared/Models/EventData.cs +++ b/src/Aporta.Shared/Models/EventData.cs @@ -33,5 +33,7 @@ public enum EventReason [Description("Credential Expired")] CredentialExpired, [Description("No Privilege")] - NoPrivilege + NoPrivilege, + [Description("Outside Schedule")] + OutsideSchedule } \ No newline at end of file diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 26cb779..1fc0588 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -7,9 +7,6 @@ win-x64;linux-arm;linux-arm64;osx-x64;linux-x64 AnyCPU default - - $(MSBuildThisFileDirectory)../../../z9main/z9.net/Z9/Z9.Protobuf/Z9.Protobuf.csproj - true @@ -26,14 +23,8 @@ - - - - - - - - + + diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 6184c86..c489fa9 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -87,6 +87,10 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) : DefaultZ9OpenCommunityPort; var z9OpenCommunityId = _configuration["z9OpenCommunityId"]; + // Wire up door unid lookup for access privilege checking + _accessService.SetDoorUnidLookup(endpointId => + _z9OpenCommunityProtocolService.GetConfigForEndpoint(endpointId)?.DoorUnid); + // Subscribe to OSDP configuration events before starting the service _z9OpenCommunityProtocolService.OsdpConfigurationReceived += OnOsdpConfigurationReceived; @@ -386,6 +390,7 @@ private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) EventReason.CredentialDisabled => EvtSubCode.AccessDeniedInactive, EventReason.CredentialNotYetEffective => EvtSubCode.AccessDeniedNotEffective, EventReason.CredentialExpired => EvtSubCode.AccessDeniedExpired, + EventReason.OutsideSchedule => EvtSubCode.AccessDeniedOutsideSched, _ => EvtSubCode.AccessDeniedInactive // Default value (0); unused for granted events }; diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 01bed9c..12f0c9a 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/ProtoJsonRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/ProtoJsonRepositoryTests.cs index 4b33330..d2f54db 100644 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/ProtoJsonRepositoryTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/Repositories/ProtoJsonRepositoryTests.cs @@ -303,15 +303,14 @@ public async Task Upsert_NewRecord_Stores() public async Task Priv_WithDoorAccessPriv_PreservesExtension() { var repository = new PrivRepository(_dataAccess); + var doorAccessPriv = new DoorAccessPriv(); + doorAccessPriv.Elements.Add(new DoorAccessPrivElement { DoorUnid = 10 }); var priv = new Priv { Unid = 1, Name = "Door Access", PrivType = PrivType.Door, - ExtDoorAccessPriv = new DoorAccessPriv - { - DoorUnid = 10 - } + ExtDoorAccessPriv = doorAccessPriv }; await repository.Upsert(priv); @@ -319,7 +318,7 @@ public async Task Priv_WithDoorAccessPriv_PreservesExtension() Assert.That(retrieved.PrivType, Is.EqualTo(PrivType.Door)); Assert.That(retrieved.ExtDoorAccessPriv, Is.Not.Null); - Assert.That(retrieved.ExtDoorAccessPriv.DoorUnid, Is.EqualTo(10)); + Assert.That(retrieved.ExtDoorAccessPriv.Elements[0].DoorUnid, Is.EqualTo(10)); } } @@ -371,19 +370,24 @@ public async Task Sched_WithElements_PreservesRepeated() Unid = 1, Name = "Work Week" }; - sched.Elements.Add(new SchedElement + var element = new SchedElement { - DayMask = 0x1F, // Mon-Fri - StartMinuteOfDay = 480, // 8:00 AM - EndMinuteOfDay = 1020 // 5:00 PM - }); + Start = new SqlTimeData { Hour = 8, Minute = 0, Second = 0 }, + Stop = new SqlTimeData { Hour = 17, Minute = 0, Second = 0 } + }; + element.SchedDays.Add(SchedDay.Mon); + element.SchedDays.Add(SchedDay.Tues); + element.SchedDays.Add(SchedDay.Wed); + element.SchedDays.Add(SchedDay.Thur); + element.SchedDays.Add(SchedDay.Fri); + sched.Elements.Add(element); await repository.Upsert(sched); var retrieved = await repository.Get(1); Assert.That(retrieved.Elements.Count, Is.EqualTo(1)); - Assert.That(retrieved.Elements[0].DayMask, Is.EqualTo(0x1F)); - Assert.That(retrieved.Elements[0].StartMinuteOfDay, Is.EqualTo(480)); + Assert.That(retrieved.Elements[0].SchedDays, Has.Count.EqualTo(5)); + Assert.That(retrieved.Elements[0].Start.Hour, Is.EqualTo(8)); } } From 27fd4fd66d852794db2d85aadc515f84824eb93e Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Fri, 6 Feb 2026 07:48:00 -0500 Subject: [PATCH 21/86] Fix migration test to expect current schema version 102 Co-Authored-By: Claude Opus 4.6 --- test/Aporta.Core.Tests/DataAccess/MigrationTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs index 5f04896..4fe31eb 100644 --- a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs @@ -8,7 +8,7 @@ namespace Aporta.Core.Tests.DataAccess; [TestFixture] public class MigrationTests { - private const int CurrentVersion = 100; + private const int CurrentVersion = 102; private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); private IDbConnection _persistConnection; From 77e85ce2b767c7321c2944466c3021d788d88f7c Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Fri, 6 Feb 2026 09:46:10 -0500 Subject: [PATCH 22/86] Update Z9.Protobuf.Community to 1.0.7 and use privUnid for privilege lookup 1.0.7 adds the missing privUnid field to CredPrivBinding, enabling proper privilege resolution for schedule-restricted access bindings. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- src/Aporta.Core/Services/AccessService.cs | 7 +++---- src/Aporta/Aporta.csproj | 2 +- test/Aporta.Core.Tests/Aporta.Core.Tests.csproj | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 7466a02..1190ab9 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 9d8dccd..ab5f9c9 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -470,14 +470,13 @@ async Task ControlStrike() } // Check for privilege reference (DoorAccessPriv) - // Note: Community proto uses "Unid" field (not "PrivUnid") - if (binding.UnidCase == CredPrivBinding.UnidOneofCase.Unid) + if (binding.PrivUnidCase == CredPrivBinding.PrivUnidOneofCase.PrivUnid) { - var priv = await _privRepository.Get(binding.Unid); + var priv = await _privRepository.Get(binding.PrivUnid); if (priv == null) { _logger.LogDebug("Privilege {Unid} not found for credential {CredUnid}", - binding.Unid, credentialUnid); + binding.PrivUnid, credentialUnid); continue; } diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 1fc0588..4b5988b 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 12f0c9a..2507182 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + From cc28bc72bbef0443dff26014872f731372a80e93 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Fri, 6 Feb 2026 16:17:24 -0500 Subject: [PATCH 23/86] Add Z9 Open Community integration roadmap to README Co-Authored-By: Claude Opus 4.6 --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index 054e66d..d6aa319 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,20 @@ _appsettings.Production.json_ - Location for Aporta settings } ``` +## Z9 Open Community Integration Roadmap + +Aporta integrates with the Z9 Open Community protocol for centralized management. Current status and upcoming work: + +- Connection & identification with host +- Configuration download (credentials, privileges, schedules, devices) +- Device mapping (doors, OSDP readers over IP) +- OSDP reader online/offline reporting +- Access control decisions (grant, deny, schedule enforcement) +- Access event reporting to host +- **TODO**: Device actions (door momentary unlock, door mode change) +- **TODO**: Door contact sensor monitoring and reporting +- **TODO**: Additional device state reporting + ## Aporta Housekeeping General information about configuring and setting up the Aporta project for development and running locally. From ebbbff916e50f3a55a185b0f7b3447d79ae927d2 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Fri, 6 Feb 2026 18:31:00 -0500 Subject: [PATCH 24/86] Wire door strike output from Z9 actuator model and handle DevActionReq Process Z9 Actuator Dev objects to extract door strike output config, match actuators to readers via shared door (logicalParentUnid), and wire DoorStrikeEndpointId when the OSDP output endpoint comes online. Handle DevActionReq DOOR_MOMENTARY_UNLOCK from the Z9 host. Filter OnlineStatusChanged to only process reader endpoints (not outputs) to prevent duplicate door creation. Fix OpenDoor to fire strike asynchronously so the access processing task completes immediately, preventing the deduplication check from dropping subsequent card reads. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Services/AccessService.cs | 11 +- .../Z9OpenCommunityProtocolService.cs | 113 +++++++++++++- src/Aporta/Workers/StartupWorker.cs | 140 ++++++++++++++++-- 3 files changed, 242 insertions(+), 22 deletions(-) diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index ab5f9c9..63e4a47 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -405,13 +405,12 @@ async Task ControlStrike() await controlPoint.SetState(false); } - var openDoorTasks = new[] - { - Task.Run(ControlStrike), - Task.Run(access.AccessGrantedNotification) - }; + // Fire strike asynchronously - don't block access processing + // (blocking would keep the task in WaitingForActivation state, + // causing the deduplication check to drop subsequent card reads) + _ = Task.Run(ControlStrike); - await Task.WhenAll(openDoorTasks); + await access.AccessGrantedNotification(); } /// diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 9529652..3846379 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -43,6 +43,10 @@ public class Z9OpenCommunityProtocolService : IDisposable // Key format: "{host}:{port}:{osdpAddress}" (e.g., "localhost:9843:0") private readonly Dictionary _endpointToConfig = new(); + // Pending door strike actuators (received before their door's reader) + // Key: logicalParentUnid (door unid), Value: output number + private readonly Dictionary _pendingStrikeActuators = new(); + /// /// OSDP reader configuration extracted from Z9 Dev messages. /// @@ -55,6 +59,7 @@ public class OsdpReaderConfig public int OsdpAddress { get; set; } public int BaudRate { get; set; } = 9600; public int? DoorUnid { get; set; } + public int? StrikeOutputNumber { get; set; } } private Thread _thread; private volatile bool _stopping; @@ -205,8 +210,9 @@ private void HandleMessage(SpCoreMessage message) { ReceivedDevActions.Add(message.DevActionReq); } - _logger.LogInformation("Received DevActionReq (requestId={RequestId})", message.DevActionReq.RequestId); - SendDevActionResp(message.DevActionReq.RequestId); + _logger.LogInformation("Received DevActionReq (requestId={RequestId}, type={Type}, devUnid={DevUnid})", + message.DevActionReq.RequestId, message.DevActionReq.DevActionType, message.DevActionReq.DevUnid); + HandleDevActionReq(message.DevActionReq); break; case SpCoreMessage.Types.Type.EvtControl: @@ -467,6 +473,12 @@ private void ProcessDev(Dev dev) { SpCoreProtoUtil.InitRequired(dev); + if (dev.DevType == DevType.Actuator) + { + ProcessActuatorDev(dev); + return; + } + // Check if this is an OSDP credential reader if (dev.DevType != DevType.CredReader) return; @@ -518,6 +530,21 @@ private void ProcessDev(Dev dev) "Received OSDP CredReader config: Name={Name}, Host={Host}:{TcpPort}, OsdpAddress={OsdpAddress}", osdpConfig.Name, osdpConfig.Host, osdpConfig.TcpPort, osdpConfig.OsdpAddress); + // Check for pending strike actuator for this door + if (osdpConfig.DoorUnid != null) + { + lock (_pendingStrikeActuators) + { + if (_pendingStrikeActuators.TryGetValue(osdpConfig.DoorUnid.Value, out var outputNumber)) + { + osdpConfig.StrikeOutputNumber = outputNumber; + _pendingStrikeActuators.Remove(osdpConfig.DoorUnid.Value); + _logger.LogInformation("Applied pending door strike actuator: output {OutputNumber} on reader {Name}", + outputNumber, osdpConfig.Name); + } + } + } + lock (_osdpReaderConfigs) { // Remove existing config with same unid @@ -536,6 +563,52 @@ private void ProcessDev(Dev dev) OsdpConfigurationReceived?.Invoke(this, osdpConfig); } + private void ProcessActuatorDev(Dev dev) + { + if (dev.DevUse != DevUse.ActuatorDoorStrike) + return; + + if (dev.LogicalParentUnidCase != Dev.LogicalParentUnidOneofCase.LogicalParentUnid) + { + _logger.LogWarning("Door strike actuator {Name} (unid={Unid}) has no logicalParentUnid (door), skipping", + dev.Name, dev.Unid); + return; + } + + var doorUnid = dev.LogicalParentUnid; + var outputNumber = 0; + if (!string.IsNullOrWhiteSpace(dev.Address)) + { + int.TryParse(dev.Address, out outputNumber); + } + + _logger.LogInformation("Received door strike actuator: output {OutputNumber}, door unid={DoorUnid}", + outputNumber, doorUnid); + + // Try to find matching reader config by door unid + OsdpReaderConfig matchingConfig = null; + lock (_osdpReaderConfigs) + { + matchingConfig = _osdpReaderConfigs.Find(c => c.DoorUnid == doorUnid); + } + + if (matchingConfig != null) + { + matchingConfig.StrikeOutputNumber = outputNumber; + _logger.LogInformation("Assigned door strike output {OutputNumber} to reader {Name} (door unid={DoorUnid})", + outputNumber, matchingConfig.Name, doorUnid); + } + else + { + // Reader for this door hasn't arrived yet - store for later + lock (_pendingStrikeActuators) + { + _pendingStrikeActuators[doorUnid] = outputNumber; + } + _logger.LogInformation("Reader for door unid={DoorUnid} not yet received, storing pending strike actuator", doorUnid); + } + } + /// /// Event raised when OSDP reader configuration is received from Z9. /// @@ -824,15 +897,41 @@ private void SendDbChangeResp(long requestId) WriteMessage(message); } - private void SendDevActionResp(long requestId) + /// + /// Event raised when a DevActionReq is received from the host. + /// + public event EventHandler DevActionRequested; + + private void HandleDevActionReq(DevActionReq req) { + try + { + DevActionRequested?.Invoke(this, req); + } + catch (Exception ex) + { + _logger.LogError(ex, "Error handling DevActionReq (requestId={RequestId})", req.RequestId); + SendDevActionResp(req.RequestId, ex.Message); + return; + } + SendDevActionResp(req.RequestId); + } + + private void SendDevActionResp(long requestId, string exception = null) + { + var resp = new DevActionResp + { + RequestId = requestId + }; + if (exception != null) + { + resp.Exception = exception; + } + var message = new SpCoreMessage { Type = SpCoreMessage.Types.Type.DevActionResp, - DevActionResp = new DevActionResp - { - RequestId = requestId - } + DevActionResp = resp }; WriteMessage(message); diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index c489fa9..1fc2662 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -100,6 +100,9 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) // Subscribe to access decisions to forward via community protocol _accessService.AccessDecisionMade += OnAccessDecisionMade; + // Subscribe to device action requests from the host + _z9OpenCommunityProtocolService.DevActionRequested += OnDevActionRequested; + _z9OpenCommunityProtocolService.Start(z9OpenCommunityHost, z9OpenCommunityPort, z9OpenCommunityId); } else @@ -121,6 +124,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) { _logger.LogWarning("Application is shutting down"); _accessService.AccessDecisionMade -= OnAccessDecisionMade; + _z9OpenCommunityProtocolService.DevActionRequested -= OnDevActionRequested; _extensionService.OnlineStatusChanged -= OnOnlineStatusChanged; _z9OpenCommunityProtocolService.OsdpConfigurationReceived -= OnOsdpConfigurationReceived; _z9OpenCommunityProtocolService.Stop(); @@ -273,12 +277,21 @@ await _extensionService.PerformAction(OsdpDriverId, ActionType.AddUpdateDevice.T private void OnOnlineStatusChanged(object sender, OnlineStatusChangedEventArgs e) { + // Only process reader endpoints (e.g., "localhost:9843:0:R0") + // Skip output endpoints (e.g., "localhost:9843:0:O0") which share the same prefix + var endpointId = e.Endpoint?.Id; + if (string.IsNullOrEmpty(endpointId) || !IsReaderEndpoint(endpointId)) + { + _logger.LogDebug("Skipping non-reader endpoint {EndpointId}", endpointId); + return; + } + // Get the Z9 config for this endpoint to send event with correct device unid - var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(e.Endpoint?.Id); + var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(endpointId); if (config == null) { _logger.LogDebug("No Z9 config found for endpoint {EndpointId}, skipping event", - e.Endpoint?.Id); + endpointId); return; } @@ -286,14 +299,13 @@ private void OnOnlineStatusChanged(object sender, OnlineStatusChangedEventArgs e config.Name, e.IsOnline ? "online" : "offline"); // When reader comes online, ensure a Door exists for access control decisions - if (e.IsOnline && e.Endpoint != null) + if (e.IsOnline) { - var driverEndpointId = e.Endpoint.Id; // This is the DriverEndpointId (string) Task.Run(async () => { try { - await EnsureDoorExistsForReader(driverEndpointId, config.Name); + await EnsureDoorExistsForReader(endpointId, config.Name); } catch (Exception ex) { @@ -305,6 +317,16 @@ private void OnOnlineStatusChanged(object sender, OnlineStatusChangedEventArgs e _z9OpenCommunityProtocolService.SendCredReaderOnlineEvent(config, e.IsOnline); } + /// + /// Checks if an OSDP endpoint ID represents a reader (vs output, input, etc.). + /// Reader endpoint IDs end with ":R{number}" (e.g., "localhost:9843:0:R0"). + /// + private static bool IsReaderEndpoint(string endpointId) + { + var lastColon = endpointId.LastIndexOf(':'); + return lastColon >= 0 && lastColon < endpointId.Length - 1 && endpointId[lastColon + 1] == 'R'; + } + private async Task EnsureDoorExistsForReader(string driverEndpointId, string readerName) { // Look up the endpoint by DriverEndpointId to get its database ID @@ -344,13 +366,113 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea { Name = $"Door - {readerName}", InAccessEndpointId = readerEndpoint.Id, - // Note: DoorStrikeEndpointId is left null - access decisions will still be made - // but the strike won't be activated (appropriate for simple test scenario) }; + var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); + + // If the reader has a strike output configured, wire it up + if (config?.StrikeOutputNumber != null) + { + var strikeDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:O{config.StrikeOutputNumber}"; + _logger.LogInformation("Looking for strike output endpoint: {StrikeEndpointId}", strikeDriverEndpointId); + + Aporta.Shared.Models.Endpoint strikeEndpoint = null; + for (int retry = 0; retry < 20; retry++) + { + var allEndpoints = await _endpointRepository.GetAll(); + strikeEndpoint = allEndpoints.FirstOrDefault(ep => ep.DriverEndpointId == strikeDriverEndpointId); + if (strikeEndpoint != null) + break; + await Task.Delay(500); + } + + if (strikeEndpoint != null) + { + door.DoorStrikeEndpointId = strikeEndpoint.Id; + _logger.LogInformation("Assigned door strike endpoint {StrikeEndpointId} to door '{DoorName}'", + strikeEndpoint.Id, door.Name); + } + else + { + _logger.LogWarning("Strike output endpoint {StrikeEndpointId} not found after retries", strikeDriverEndpointId); + } + } + await _doorRepository.Insert(door); - _logger.LogInformation("Created door '{DoorName}' for reader endpoint {EndpointId}", - door.Name, readerEndpoint.Id); + _logger.LogInformation("Created door '{DoorName}' for reader endpoint {EndpointId} (strike={StrikeId})", + door.Name, readerEndpoint.Id, door.DoorStrikeEndpointId); + } + + private void OnDevActionRequested(object sender, DevActionReq req) + { + if (req.DevActionType == DevActionType.DoorMomentaryUnlock) + { + var doorUnid = req.DevUnid; + _logger.LogInformation("DevActionReq: DOOR_MOMENTARY_UNLOCK for door unid={DoorUnid}", doorUnid); + + Task.Run(async () => + { + try + { + await HandleDoorMomentaryUnlock(doorUnid); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to handle DOOR_MOMENTARY_UNLOCK for door unid={DoorUnid}", doorUnid); + } + }); + } + else + { + _logger.LogInformation("DevActionReq: unhandled action type {Type} for device unid={DevUnid}", + req.DevActionType, req.DevUnid); + } + } + + private async Task HandleDoorMomentaryUnlock(int doorUnid) + { + // Find the reader config whose DoorUnid matches + var config = _z9OpenCommunityProtocolService.OsdpReaderConfigs + .FirstOrDefault(c => c.DoorUnid == doorUnid); + + if (config == null) + { + _logger.LogWarning("No reader config found for door unid={DoorUnid}", doorUnid); + return; + } + + if (config.StrikeOutputNumber == null) + { + _logger.LogWarning("No strike output configured for reader {Name}", config.Name); + return; + } + + var strikeDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:O{config.StrikeOutputNumber}"; + + var endpoints = await _endpointRepository.GetAll(); + var strikeEndpoint = endpoints.FirstOrDefault(ep => ep.DriverEndpointId == strikeDriverEndpointId); + + if (strikeEndpoint == null) + { + _logger.LogWarning("Strike endpoint {EndpointId} not found in database", strikeDriverEndpointId); + return; + } + + var controlPoint = _extensionService.GetControlPoint(strikeEndpoint.ExtensionId, strikeEndpoint.DriverEndpointId); + if (controlPoint == null) + { + _logger.LogWarning("No control point found for strike endpoint {EndpointId}", strikeDriverEndpointId); + return; + } + + _logger.LogInformation("Activating door strike for door unid={DoorUnid} (endpoint={EndpointId})", + doorUnid, strikeDriverEndpointId); + + await controlPoint.SetState(true); + await Task.Delay(TimeSpan.FromSeconds(3)); + await controlPoint.SetState(false); + + _logger.LogInformation("Door strike deactivated for door unid={DoorUnid}", doorUnid); } private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) From b69ee95545354e612dee0268902ee590d1c8c51f Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Fri, 6 Feb 2026 19:12:18 -0500 Subject: [PATCH 25/86] Report door state events (unlocked/locked/opened/closed) to Z9 Subscribe to OSDP state changes and send DoorUnlocked/DoorLocked events when the strike output changes, and DoorOpened/DoorClosed events when the door contact input changes. Process Door and Sensor dev objects from Z9 to wire door contact inputs alongside existing strike outputs. Co-Authored-By: Claude Opus 4.6 --- .../Z9OpenCommunityProtocolService.cs | 150 ++++++++++++++++++ src/Aporta/Workers/StartupWorker.cs | 91 +++++++++++ 2 files changed, 241 insertions(+) diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 3846379..fe70622 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -47,6 +47,13 @@ public class Z9OpenCommunityProtocolService : IDisposable // Key: logicalParentUnid (door unid), Value: output number private readonly Dictionary _pendingStrikeActuators = new(); + // Pending door contact sensors (received before their door's reader) + // Key: logicalParentUnid (door unid), Value: input number + private readonly Dictionary _pendingDoorContactSensors = new(); + + // Door info received from Z9 (unid -> name mapping) + private readonly Dictionary _doorInfo = new(); + /// /// OSDP reader configuration extracted from Z9 Dev messages. /// @@ -60,6 +67,7 @@ public class OsdpReaderConfig public int BaudRate { get; set; } = 9600; public int? DoorUnid { get; set; } public int? StrikeOutputNumber { get; set; } + public int? DoorContactInputNumber { get; set; } } private Thread _thread; private volatile bool _stopping; @@ -479,6 +487,18 @@ private void ProcessDev(Dev dev) return; } + if (dev.DevType == DevType.Sensor) + { + ProcessSensorDev(dev); + return; + } + + if (dev.DevType == DevType.Door) + { + ProcessDoorDev(dev); + return; + } + // Check if this is an OSDP credential reader if (dev.DevType != DevType.CredReader) return; @@ -543,6 +563,18 @@ private void ProcessDev(Dev dev) outputNumber, osdpConfig.Name); } } + + // Check for pending door contact sensor for this door + lock (_pendingDoorContactSensors) + { + if (_pendingDoorContactSensors.TryGetValue(osdpConfig.DoorUnid.Value, out var inputNumber)) + { + osdpConfig.DoorContactInputNumber = inputNumber; + _pendingDoorContactSensors.Remove(osdpConfig.DoorUnid.Value); + _logger.LogInformation("Applied pending door contact sensor: input {InputNumber} on reader {Name}", + inputNumber, osdpConfig.Name); + } + } } lock (_osdpReaderConfigs) @@ -609,6 +641,60 @@ private void ProcessActuatorDev(Dev dev) } } + private void ProcessSensorDev(Dev dev) + { + if (dev.DevUse != DevUse.SensorDoorContact) + return; + + if (dev.LogicalParentUnidCase != Dev.LogicalParentUnidOneofCase.LogicalParentUnid) + { + _logger.LogWarning("Door contact sensor {Name} (unid={Unid}) has no logicalParentUnid (door), skipping", + dev.Name, dev.Unid); + return; + } + + var doorUnid = dev.LogicalParentUnid; + var inputNumber = 0; + if (!string.IsNullOrWhiteSpace(dev.Address)) + { + int.TryParse(dev.Address, out inputNumber); + } + + _logger.LogInformation("Received door contact sensor: input {InputNumber}, door unid={DoorUnid}", + inputNumber, doorUnid); + + OsdpReaderConfig matchingConfig = null; + lock (_osdpReaderConfigs) + { + matchingConfig = _osdpReaderConfigs.Find(c => c.DoorUnid == doorUnid); + } + + if (matchingConfig != null) + { + matchingConfig.DoorContactInputNumber = inputNumber; + _logger.LogInformation("Assigned door contact input {InputNumber} to reader {Name} (door unid={DoorUnid})", + inputNumber, matchingConfig.Name, doorUnid); + } + else + { + lock (_pendingDoorContactSensors) + { + _pendingDoorContactSensors[doorUnid] = inputNumber; + } + _logger.LogInformation("Reader for door unid={DoorUnid} not yet received, storing pending door contact sensor", doorUnid); + } + } + + private void ProcessDoorDev(Dev dev) + { + var doorName = dev.Name ?? $"Door {dev.Unid}"; + lock (_doorInfo) + { + _doorInfo[dev.Unid] = doorName; + } + _logger.LogInformation("Received Door Dev: unid={Unid}, name={Name}", dev.Unid, doorName); + } + /// /// Event raised when OSDP reader configuration is received from Z9. /// @@ -1088,6 +1174,70 @@ public void SendAccessEvent(OsdpReaderConfig config, bool isGranted, BigInteger? WriteMessage(message); } + /// + /// Sends a door state event (unlocked/locked/opened/closed) to Z9. + /// + /// The OSDP reader configuration (to look up door info). + /// The event code (DoorUnlocked, DoorLocked, DoorOpened, DoorClosed). + public void SendDoorStateEvent(OsdpReaderConfig config, EvtCode evtCode) + { + if (config == null) + { + _logger.LogWarning("Cannot send door state event: config is null"); + return; + } + + if (!IsConnected) + { + _logger.LogWarning("Cannot send door state event: not connected"); + return; + } + + if (!config.DoorUnid.HasValue) + { + _logger.LogWarning("Cannot send door state event: reader {Name} has no DoorUnid", config.Name); + return; + } + + var doorUnid = config.DoorUnid.Value; + string doorName; + lock (_doorInfo) + { + if (!_doorInfo.TryGetValue(doorUnid, out doorName)) + { + doorName = $"Door {doorUnid}"; + } + } + + var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); + + var evt = new Evt + { + EvtCode = evtCode, + HwTime = new DateTimeData { Millis = nowMillis }, + DbTime = new DateTimeData { Millis = nowMillis }, + Consumed = false, + Priority = 0, + EvtDevRef = new EvtDevRef + { + Unid = doorUnid, + Name = doorName, + DevType = DevType.Door + } + }; + + var message = new SpCoreMessage + { + Type = SpCoreMessage.Types.Type.Evt + }; + message.Evt.Add(evt); + + _logger.LogInformation("Sending {EvtCode} event for door {DoorName} (unid={DoorUnid})", + evtCode, doorName, doorUnid); + + WriteMessage(message); + } + private void WriteMessage(SpCoreMessage message) { lock (_writeLock) diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 1fc2662..97a2f60 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -103,6 +103,9 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) // Subscribe to device action requests from the host _z9OpenCommunityProtocolService.DevActionRequested += OnDevActionRequested; + // Subscribe to state changes (door strike output, door contact input) for door state events + _extensionService.StateChanged += OnStateChanged; + _z9OpenCommunityProtocolService.Start(z9OpenCommunityHost, z9OpenCommunityPort, z9OpenCommunityId); } else @@ -124,6 +127,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) { _logger.LogWarning("Application is shutting down"); _accessService.AccessDecisionMade -= OnAccessDecisionMade; + _extensionService.StateChanged -= OnStateChanged; _z9OpenCommunityProtocolService.DevActionRequested -= OnDevActionRequested; _extensionService.OnlineStatusChanged -= OnOnlineStatusChanged; _z9OpenCommunityProtocolService.OsdpConfigurationReceived -= OnOsdpConfigurationReceived; @@ -398,9 +402,39 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea } } + // Insert door now so access processing can proceed while we wire optional contact endpoint await _doorRepository.Insert(door); _logger.LogInformation("Created door '{DoorName}' for reader endpoint {EndpointId} (strike={StrikeId})", door.Name, readerEndpoint.Id, door.DoorStrikeEndpointId); + + // If the reader has a door contact input configured, wire it up (may take time if endpoint hasn't appeared yet) + if (config?.DoorContactInputNumber != null) + { + var contactDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:I{config.DoorContactInputNumber}"; + _logger.LogInformation("Looking for door contact input endpoint: {ContactEndpointId}", contactDriverEndpointId); + + Aporta.Shared.Models.Endpoint contactEndpoint = null; + for (int retry = 0; retry < 20; retry++) + { + var allEndpoints = await _endpointRepository.GetAll(); + contactEndpoint = allEndpoints.FirstOrDefault(ep => ep.DriverEndpointId == contactDriverEndpointId); + if (contactEndpoint != null) + break; + await Task.Delay(500); + } + + if (contactEndpoint != null) + { + door.DoorContactEndpointId = contactEndpoint.Id; + await _doorRepository.Update(door); + _logger.LogInformation("Assigned door contact endpoint {ContactEndpointId} to door '{DoorName}'", + contactEndpoint.Id, door.Name); + } + else + { + _logger.LogWarning("Door contact input endpoint {ContactEndpointId} not found after retries", contactDriverEndpointId); + } + } } private void OnDevActionRequested(object sender, DevActionReq req) @@ -475,6 +509,63 @@ private async Task HandleDoorMomentaryUnlock(int doorUnid) _logger.LogInformation("Door strike deactivated for door unid={DoorUnid}", doorUnid); } + private void OnStateChanged(object sender, StateChangedEventArgs e) + { + var driverEndpointId = e.Endpoint?.Id; + if (string.IsNullOrEmpty(driverEndpointId)) + return; + + Task.Run(async () => + { + try + { + await HandleStateChanged(driverEndpointId, e.State); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to handle state change for endpoint {EndpointId}", driverEndpointId); + } + }); + } + + private async Task HandleStateChanged(string driverEndpointId, bool state) + { + // Look up the Aporta endpoint by driver endpoint ID + var endpoints = await _endpointRepository.GetAll(); + var endpoint = endpoints.FirstOrDefault(ep => ep.DriverEndpointId == driverEndpointId); + if (endpoint == null) + return; + + // Find which door has this endpoint as strike or contact + var doors = await _doorRepository.GetAll(); + EvtCode? evtCode = null; + + var strikeDoor = doors.FirstOrDefault(d => d.DoorStrikeEndpointId == endpoint.Id); + if (strikeDoor != null) + { + evtCode = state ? EvtCode.DoorUnlocked : EvtCode.DoorLocked; + } + + var contactDoor = doors.FirstOrDefault(d => d.DoorContactEndpointId == endpoint.Id); + if (contactDoor != null) + { + evtCode = state ? EvtCode.DoorClosed : EvtCode.DoorOpened; + } + + if (evtCode == null) + return; + + var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); + if (config == null) + { + _logger.LogDebug("No Z9 config found for endpoint {EndpointId}, skipping door state event", + driverEndpointId); + return; + } + + _z9OpenCommunityProtocolService.SendDoorStateEvent(config, evtCode.Value); + } + private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) { // Get the Z9 config for this endpoint to send event with correct device unid From b54033c4d367d8323449fa2e1d7a1955254c9941 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Fri, 6 Feb 2026 19:30:05 -0500 Subject: [PATCH 26/86] Update Z9 integration roadmap with completed items and new TODOs Co-Authored-By: Claude Opus 4.6 --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d6aa319..6bd82ed 100644 --- a/README.md +++ b/README.md @@ -106,9 +106,11 @@ Aporta integrates with the Z9 Open Community protocol for centralized management - OSDP reader online/offline reporting - Access control decisions (grant, deny, schedule enforcement) - Access event reporting to host +- Door strike wiring and actuation +- Door state event reporting (unlocked/locked/opened/closed) - **TODO**: Device actions (door momentary unlock, door mode change) -- **TODO**: Door contact sensor monitoring and reporting -- **TODO**: Additional device state reporting +- **TODO**: Door forced open alarm +- **TODO**: Door held open alarm ## Aporta Housekeeping From 4ec04d84e905e6b3f9b5a9a250cda820c3ea3195 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 06:13:47 -0500 Subject: [PATCH 27/86] Add REX (Request to Exit) support with activateStrikeOnRex door config Wire REX sensor from Z9 as OSDP input endpoint on door, send EXIT_REQUESTED event on REX press, and fire door strike if activateStrikeOnRex is enabled. Upgrade Z9.Protobuf.Community to 1.0.8 for DoorConfig proto support. Co-Authored-By: Claude Opus 4.6 --- NuGet.Config | 7 ++ README.md | 3 +- src/Aporta.Core/Aporta.Core.csproj | 2 +- .../Z9OpenCommunityProtocolService.cs | 96 ++++++++++++++++--- src/Aporta/Aporta.csproj | 2 +- src/Aporta/Workers/StartupWorker.cs | 56 ++++++++++- .../Aporta.Core.Tests.csproj | 2 +- 7 files changed, 147 insertions(+), 21 deletions(-) create mode 100644 NuGet.Config diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 0000000..07c55b8 --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/README.md b/README.md index 6bd82ed..6a6cb3e 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,8 @@ Aporta integrates with the Z9 Open Community protocol for centralized management - Access event reporting to host - Door strike wiring and actuation - Door state event reporting (unlocked/locked/opened/closed) -- **TODO**: Device actions (door momentary unlock, door mode change) +- Device actions (door momentary unlock) +- **TODO**: Device actions (door mode change) - **TODO**: Door forced open alarm - **TODO**: Door held open alarm diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 1190ab9..1df703b 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index fe70622..0cfa49c 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -51,9 +51,16 @@ public class Z9OpenCommunityProtocolService : IDisposable // Key: logicalParentUnid (door unid), Value: input number private readonly Dictionary _pendingDoorContactSensors = new(); + // Pending REX sensors (received before their door's reader) + // Key: logicalParentUnid (door unid), Value: input number + private readonly Dictionary _pendingRexSensors = new(); + // Door info received from Z9 (unid -> name mapping) private readonly Dictionary _doorInfo = new(); + // Door activateStrikeOnRex config (unid -> bool) + private readonly Dictionary _doorActivateStrikeOnRex = new(); + /// /// OSDP reader configuration extracted from Z9 Dev messages. /// @@ -68,6 +75,8 @@ public class OsdpReaderConfig public int? DoorUnid { get; set; } public int? StrikeOutputNumber { get; set; } public int? DoorContactInputNumber { get; set; } + public int? RexInputNumber { get; set; } + public bool ActivateStrikeOnRex { get; set; } } private Thread _thread; private volatile bool _stopping; @@ -575,6 +584,27 @@ private void ProcessDev(Dev dev) inputNumber, osdpConfig.Name); } } + + // Check for pending REX sensor for this door + lock (_pendingRexSensors) + { + if (_pendingRexSensors.TryGetValue(osdpConfig.DoorUnid.Value, out var rexInputNumber)) + { + osdpConfig.RexInputNumber = rexInputNumber; + _pendingRexSensors.Remove(osdpConfig.DoorUnid.Value); + _logger.LogInformation("Applied pending REX sensor: input {InputNumber} on reader {Name}", + rexInputNumber, osdpConfig.Name); + } + } + + // Check for door config (activateStrikeOnRex) + lock (_doorActivateStrikeOnRex) + { + if (_doorActivateStrikeOnRex.TryGetValue(osdpConfig.DoorUnid.Value, out var activateStrike)) + { + osdpConfig.ActivateStrikeOnRex = activateStrike; + } + } } lock (_osdpReaderConfigs) @@ -643,13 +673,28 @@ private void ProcessActuatorDev(Dev dev) private void ProcessSensorDev(Dev dev) { - if (dev.DevUse != DevUse.SensorDoorContact) - return; + if (dev.DevUse == DevUse.SensorDoorContact) + { + ProcessSensorWithPending(dev, "door contact", + (config, inputNum) => config.DoorContactInputNumber = inputNum, + _pendingDoorContactSensors); + } + else if (dev.DevUse == DevUse.SensorRex) + { + ProcessSensorWithPending(dev, "REX", + (config, inputNum) => config.RexInputNumber = inputNum, + _pendingRexSensors); + } + } + private void ProcessSensorWithPending(Dev dev, string sensorLabel, + Action assignInputNumber, + Dictionary pendingDictionary) + { if (dev.LogicalParentUnidCase != Dev.LogicalParentUnidOneofCase.LogicalParentUnid) { - _logger.LogWarning("Door contact sensor {Name} (unid={Unid}) has no logicalParentUnid (door), skipping", - dev.Name, dev.Unid); + _logger.LogWarning("{SensorLabel} sensor {Name} (unid={Unid}) has no logicalParentUnid (door), skipping", + sensorLabel, dev.Name, dev.Unid); return; } @@ -660,8 +705,8 @@ private void ProcessSensorDev(Dev dev) int.TryParse(dev.Address, out inputNumber); } - _logger.LogInformation("Received door contact sensor: input {InputNumber}, door unid={DoorUnid}", - inputNumber, doorUnid); + _logger.LogInformation("Received {SensorLabel} sensor: input {InputNumber}, door unid={DoorUnid}", + sensorLabel, inputNumber, doorUnid); OsdpReaderConfig matchingConfig = null; lock (_osdpReaderConfigs) @@ -671,17 +716,18 @@ private void ProcessSensorDev(Dev dev) if (matchingConfig != null) { - matchingConfig.DoorContactInputNumber = inputNumber; - _logger.LogInformation("Assigned door contact input {InputNumber} to reader {Name} (door unid={DoorUnid})", - inputNumber, matchingConfig.Name, doorUnid); + assignInputNumber(matchingConfig, inputNumber); + _logger.LogInformation("Assigned {SensorLabel} input {InputNumber} to reader {Name} (door unid={DoorUnid})", + sensorLabel, inputNumber, matchingConfig.Name, doorUnid); } else { - lock (_pendingDoorContactSensors) + lock (pendingDictionary) { - _pendingDoorContactSensors[doorUnid] = inputNumber; + pendingDictionary[doorUnid] = inputNumber; } - _logger.LogInformation("Reader for door unid={DoorUnid} not yet received, storing pending door contact sensor", doorUnid); + _logger.LogInformation("Reader for door unid={DoorUnid} not yet received, storing pending {SensorLabel} sensor", + doorUnid, sensorLabel); } } @@ -692,7 +738,31 @@ private void ProcessDoorDev(Dev dev) { _doorInfo[dev.Unid] = doorName; } - _logger.LogInformation("Received Door Dev: unid={Unid}, name={Name}", dev.Unid, doorName); + + // Extract activateStrikeOnRex from door config + if (dev.ExtDoor?.DoorConfig != null) + { + var activateStrikeOnRex = dev.ExtDoor.DoorConfig.ActivateStrikeOnRex; + lock (_doorActivateStrikeOnRex) + { + _doorActivateStrikeOnRex[dev.Unid] = activateStrikeOnRex; + } + + // Apply to existing reader config if already loaded + lock (_osdpReaderConfigs) + { + var config = _osdpReaderConfigs.Find(c => c.DoorUnid == dev.Unid); + if (config != null) + config.ActivateStrikeOnRex = activateStrikeOnRex; + } + + _logger.LogInformation("Received Door Dev: unid={Unid}, name={Name}, activateStrikeOnRex={ActivateStrikeOnRex}", + dev.Unid, doorName, activateStrikeOnRex); + } + else + { + _logger.LogInformation("Received Door Dev: unid={Unid}, name={Name}", dev.Unid, doorName); + } } /// diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 4b5988b..c5673d9 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 97a2f60..64b920c 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -435,6 +435,35 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea _logger.LogWarning("Door contact input endpoint {ContactEndpointId} not found after retries", contactDriverEndpointId); } } + + // If the reader has a REX input configured, wire it up + if (config?.RexInputNumber != null) + { + var rexDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:I{config.RexInputNumber}"; + _logger.LogInformation("Looking for REX input endpoint: {RexEndpointId}", rexDriverEndpointId); + + Aporta.Shared.Models.Endpoint rexEndpoint = null; + for (int retry = 0; retry < 20; retry++) + { + var allEndpoints = await _endpointRepository.GetAll(); + rexEndpoint = allEndpoints.FirstOrDefault(ep => ep.DriverEndpointId == rexDriverEndpointId); + if (rexEndpoint != null) + break; + await Task.Delay(500); + } + + if (rexEndpoint != null) + { + door.RequestToExitEndpointId = rexEndpoint.Id; + await _doorRepository.Update(door); + _logger.LogInformation("Assigned REX endpoint {RexEndpointId} to door '{DoorName}'", + rexEndpoint.Id, door.Name); + } + else + { + _logger.LogWarning("REX input endpoint {RexEndpointId} not found after retries", rexDriverEndpointId); + } + } } private void OnDevActionRequested(object sender, DevActionReq req) @@ -536,8 +565,27 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) if (endpoint == null) return; - // Find which door has this endpoint as strike or contact var doors = await _doorRepository.GetAll(); + + // Check if this is a REX input + var rexDoor = doors.FirstOrDefault(d => d.RequestToExitEndpointId == endpoint.Id); + if (rexDoor != null && state) + { + var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); + if (config != null) + { + _logger.LogInformation("REX activated for door '{DoorName}'", rexDoor.Name); + _z9OpenCommunityProtocolService.SendDoorStateEvent(config, EvtCode.ExitRequested); + + if (config.ActivateStrikeOnRex && config.DoorUnid.HasValue) + { + await HandleDoorMomentaryUnlock(config.DoorUnid.Value); + } + } + return; + } + + // Check strike and contact endpoints for door state events EvtCode? evtCode = null; var strikeDoor = doors.FirstOrDefault(d => d.DoorStrikeEndpointId == endpoint.Id); @@ -555,15 +603,15 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) if (evtCode == null) return; - var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); - if (config == null) + var config2 = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); + if (config2 == null) { _logger.LogDebug("No Z9 config found for endpoint {EndpointId}, skipping door state event", driverEndpointId); return; } - _z9OpenCommunityProtocolService.SendDoorStateEvent(config, evtCode.Value); + _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, evtCode.Value); } private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 2507182..d768670 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + From 8129775a36793fa229a45c7ee7b92072c6423978 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 06:47:40 -0500 Subject: [PATCH 28/86] Use strikeTime from Z9 DoorConfig for momentary unlock duration Extract strikeTime from community proto DoorConfig and use it for door strike pulse duration instead of hardcoded 3 seconds. Defaults to 3000ms when not configured. Upgrade Z9.Protobuf.Community to 1.0.9. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- .../Z9OpenCommunityProtocolService.cs | 32 +++++++++++++++---- src/Aporta/Aporta.csproj | 2 +- src/Aporta/Workers/StartupWorker.cs | 7 ++-- .../Aporta.Core.Tests.csproj | 2 +- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 1df703b..334c891 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 0cfa49c..d377bea 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -58,8 +58,9 @@ public class Z9OpenCommunityProtocolService : IDisposable // Door info received from Z9 (unid -> name mapping) private readonly Dictionary _doorInfo = new(); - // Door activateStrikeOnRex config (unid -> bool) + // Door config values (unid -> value) private readonly Dictionary _doorActivateStrikeOnRex = new(); + private readonly Dictionary _doorStrikeTimeMs = new(); /// /// OSDP reader configuration extracted from Z9 Dev messages. @@ -77,6 +78,7 @@ public class OsdpReaderConfig public int? DoorContactInputNumber { get; set; } public int? RexInputNumber { get; set; } public bool ActivateStrikeOnRex { get; set; } + public int? StrikeTimeMs { get; set; } } private Thread _thread; private volatile bool _stopping; @@ -597,7 +599,7 @@ private void ProcessDev(Dev dev) } } - // Check for door config (activateStrikeOnRex) + // Check for door config values lock (_doorActivateStrikeOnRex) { if (_doorActivateStrikeOnRex.TryGetValue(osdpConfig.DoorUnid.Value, out var activateStrike)) @@ -605,6 +607,13 @@ private void ProcessDev(Dev dev) osdpConfig.ActivateStrikeOnRex = activateStrike; } } + lock (_doorStrikeTimeMs) + { + if (_doorStrikeTimeMs.TryGetValue(osdpConfig.DoorUnid.Value, out var strikeTimeMs)) + { + osdpConfig.StrikeTimeMs = strikeTimeMs; + } + } } lock (_osdpReaderConfigs) @@ -739,25 +748,36 @@ private void ProcessDoorDev(Dev dev) _doorInfo[dev.Unid] = doorName; } - // Extract activateStrikeOnRex from door config + // Extract door config values if (dev.ExtDoor?.DoorConfig != null) { - var activateStrikeOnRex = dev.ExtDoor.DoorConfig.ActivateStrikeOnRex; + var doorConfig = dev.ExtDoor.DoorConfig; + var activateStrikeOnRex = doorConfig.ActivateStrikeOnRex; + int? strikeTimeMs = doorConfig.StrikeTimeCase == DoorConfig.StrikeTimeOneofCase.StrikeTime + ? doorConfig.StrikeTime : null; + lock (_doorActivateStrikeOnRex) { _doorActivateStrikeOnRex[dev.Unid] = activateStrikeOnRex; } + lock (_doorStrikeTimeMs) + { + _doorStrikeTimeMs[dev.Unid] = strikeTimeMs; + } // Apply to existing reader config if already loaded lock (_osdpReaderConfigs) { var config = _osdpReaderConfigs.Find(c => c.DoorUnid == dev.Unid); if (config != null) + { config.ActivateStrikeOnRex = activateStrikeOnRex; + config.StrikeTimeMs = strikeTimeMs; + } } - _logger.LogInformation("Received Door Dev: unid={Unid}, name={Name}, activateStrikeOnRex={ActivateStrikeOnRex}", - dev.Unid, doorName, activateStrikeOnRex); + _logger.LogInformation("Received Door Dev: unid={Unid}, name={Name}, activateStrikeOnRex={ActivateStrikeOnRex}, strikeTimeMs={StrikeTimeMs}", + dev.Unid, doorName, activateStrikeOnRex, strikeTimeMs); } else { diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index c5673d9..b29a5f2 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 64b920c..4d17236 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -531,11 +531,14 @@ private async Task HandleDoorMomentaryUnlock(int doorUnid) _logger.LogInformation("Activating door strike for door unid={DoorUnid} (endpoint={EndpointId})", doorUnid, strikeDriverEndpointId); + var strikeTimeMs = config.StrikeTimeMs ?? 3000; + await controlPoint.SetState(true); - await Task.Delay(TimeSpan.FromSeconds(3)); + await Task.Delay(TimeSpan.FromMilliseconds(strikeTimeMs)); await controlPoint.SetState(false); - _logger.LogInformation("Door strike deactivated for door unid={DoorUnid}", doorUnid); + _logger.LogInformation("Door strike deactivated for door unid={DoorUnid} (strikeTime={StrikeTimeMs}ms)", + doorUnid, strikeTimeMs); } private void OnStateChanged(object sender, StateChangedEventArgs e) diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index d768670..efcc907 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + From f2c359b64176d89f1e0d499068d3063e87038fd8 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 06:56:45 -0500 Subject: [PATCH 29/86] Detect door forced open when door opens without strike active Track per-door strike state and send DoorForced/DoorNotForced events to Z9 when the door contact opens while the strike is not energized. Co-Authored-By: Claude Opus 4.6 --- src/Aporta/Workers/StartupWorker.cs | 50 ++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 4d17236..ed47409 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -35,6 +35,8 @@ public class StartupWorker : BackgroundService private readonly DoorRepository _doorRepository; private readonly EndpointRepository _endpointRepository; private readonly HashSet _configuredOsdpBuses = new(); + private readonly Dictionary _doorStrikeActive = new(); + private readonly Dictionary _doorForced = new(); public StartupWorker(IDataAccess dataAccess, ExtensionService extensionService, @@ -588,33 +590,51 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) return; } - // Check strike and contact endpoints for door state events - EvtCode? evtCode = null; - + // Check strike endpoint — track state for forced-open detection var strikeDoor = doors.FirstOrDefault(d => d.DoorStrikeEndpointId == endpoint.Id); if (strikeDoor != null) { - evtCode = state ? EvtCode.DoorUnlocked : EvtCode.DoorLocked; + _doorStrikeActive[strikeDoor.Id] = state; + var evtCode = state ? EvtCode.DoorUnlocked : EvtCode.DoorLocked; + var config2 = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); + if (config2 != null) + _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, evtCode); + return; } + // Check contact endpoint — detect forced open var contactDoor = doors.FirstOrDefault(d => d.DoorContactEndpointId == endpoint.Id); if (contactDoor != null) { - evtCode = state ? EvtCode.DoorClosed : EvtCode.DoorOpened; - } + var config2 = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); + if (config2 == null) + return; - if (evtCode == null) - return; + if (!state) // Door opened + { + _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorOpened); - var config2 = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); - if (config2 == null) - { - _logger.LogDebug("No Z9 config found for endpoint {EndpointId}, skipping door state event", - driverEndpointId); + _doorStrikeActive.TryGetValue(contactDoor.Id, out var strikeActive); + if (!strikeActive) + { + _logger.LogWarning("Door forced open: '{DoorName}'", contactDoor.Name); + _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorForced); + _doorForced[contactDoor.Id] = true; + } + } + else // Door closed + { + _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorClosed); + + if (_doorForced.TryGetValue(contactDoor.Id, out var wasForced) && wasForced) + { + _logger.LogInformation("Door forced cleared: '{DoorName}'", contactDoor.Name); + _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorNotForced); + _doorForced[contactDoor.Id] = false; + } + } return; } - - _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, evtCode.Value); } private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) From 73ca1ce4d744892d1524e9f7762d625866908406 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 07:33:05 -0500 Subject: [PATCH 30/86] Support extended strike time from credential door access modifiers When a credential has extDoorTime=true, use the door's extendedStrikeTime instead of the normal strikeTime for access grant strike duration. Also remove unnecessary IsOpen check from OSDPDriver.AddUpdateDevice - devices should be registered in the panel regardless of connection state, as the reader may come online later. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Services/AccessService.cs | 48 ++++++++++++++----- .../Z9OpenCommunityProtocolService.cs | 20 +++++++- src/Aporta/Workers/StartupWorker.cs | 7 +++ src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs | 5 -- 4 files changed, 61 insertions(+), 19 deletions(-) diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 63e4a47..baf0884 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -44,6 +44,7 @@ public class AccessService private readonly ConcurrentDictionary _processAccessCredential = new(); private readonly IHubContext _hubContext; private Func _getDoorUnidForEndpoint; + private Func _getStrikeTimesForEndpoint; /// /// Event raised when an access decision is made (granted or denied). @@ -78,6 +79,14 @@ public void SetDoorUnidLookup(Func getDoorUnidForEndpoint) _getDoorUnidForEndpoint = getDoorUnidForEndpoint; } + /// + /// Sets a function to look up the strike times (strikeTimeMs, extendedStrikeTimeMs) for an endpoint. + /// + public void SetStrikeTimeLookup(Func getStrikeTimesForEndpoint) + { + _getStrikeTimesForEndpoint = getStrikeTimesForEndpoint; + } + public void Startup() { _extensionService.AccessCredentialReceived += ExtensionServiceOnAccessCredentialReceived; @@ -127,12 +136,14 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA return; } - if (await IsAccessGranted(eventArgs.Handler.MatchingCardData, matchingDoor, accessPoint)) + var (granted, useExtendedTime) = await IsAccessGranted(eventArgs.Handler.MatchingCardData, matchingDoor, accessPoint); + if (granted) { // Only open door if strike is assigned - community controllers may not have one if (matchingDoorStrike != null) { - await OpenDoor(eventArgs.Access, matchingDoorStrike, 3); + var strikeTimeMs = GetStrikeTimeMs(accessPoint.DriverEndpointId, useExtendedTime); + await OpenDoor(eventArgs.Access, matchingDoorStrike, strikeTimeMs); } else { @@ -151,7 +162,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA } } - private async Task IsAccessGranted(string matchingCardData, Aporta.Shared.Models.Door matchingDoor, Endpoint accessPoint) + private async Task<(bool granted, bool useExtendedTime)> IsAccessGranted(string matchingCardData, Aporta.Shared.Models.Door matchingDoor, Endpoint accessPoint) { // First try matching by raw bit string var assignedCredential = await _credentialRepository.AssignedCredential(matchingCardData); @@ -212,7 +223,7 @@ await _credentialRepository.Insert(new Credential Reason = EventReason.CredentialNotEnrolled }); - return false; + return (false, false); } // Check Z9 Cred status (enabled, effective date) @@ -248,7 +259,7 @@ await _credentialRepository.Insert(new Credential Reason = EventReason.CredentialDisabled }); - return false; + return (false, false); } // Check if credential is not yet effective @@ -284,7 +295,7 @@ await _credentialRepository.Insert(new Credential Reason = EventReason.CredentialNotYetEffective }); - return false; + return (false, false); } } @@ -321,7 +332,7 @@ await _credentialRepository.Insert(new Credential Reason = EventReason.CredentialExpired }); - return false; + return (false, false); } } } @@ -359,10 +370,15 @@ await _credentialRepository.Insert(new Credential Reason = reason }); - return false; + return (false, false); } - _logger.LogInformation("Door '{Name}' granted access", matchingDoor.Name); + // Check if credential has extended door time modifier + var useExtendedTime = z9Cred?.DoorAccessModifiers?.ExtDoorTimeCase == + DoorAccessModifiers.ExtDoorTimeOneofCase.ExtDoorTime && z9Cred.DoorAccessModifiers.ExtDoorTime; + + _logger.LogInformation("Door '{Name}' granted access{ExtTime}", matchingDoor.Name, + useExtendedTime ? " (extended time)" : ""); eventId = await _eventRepository.Insert(new Event { @@ -390,10 +406,18 @@ await _credentialRepository.Insert(new Credential Reason = EventReason.None }); - return true; + return (true, useExtendedTime); + } + + private int GetStrikeTimeMs(string endpointId, bool useExtendedTime) + { + var (strikeTimeMs, extendedStrikeTimeMs) = _getStrikeTimesForEndpoint?.Invoke(endpointId) ?? (null, null); + if (useExtendedTime && extendedStrikeTimeMs.HasValue) + return extendedStrikeTimeMs.Value; + return strikeTimeMs ?? 3000; } - private async Task OpenDoor(IAccess access, Endpoint matchingDoorStrike, int strikeTimer) + private async Task OpenDoor(IAccess access, Endpoint matchingDoorStrike, int strikeTimeMs) { var controlPoint = _extensionService.GetControlPoint(matchingDoorStrike.ExtensionId, matchingDoorStrike.DriverEndpointId); @@ -401,7 +425,7 @@ private async Task OpenDoor(IAccess access, Endpoint matchingDoorStrike, int str async Task ControlStrike() { await controlPoint.SetState(true); - await Task.Delay(TimeSpan.FromSeconds(strikeTimer)); + await Task.Delay(TimeSpan.FromMilliseconds(strikeTimeMs)); await controlPoint.SetState(false); } diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index d377bea..94743c9 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -61,6 +61,7 @@ public class Z9OpenCommunityProtocolService : IDisposable // Door config values (unid -> value) private readonly Dictionary _doorActivateStrikeOnRex = new(); private readonly Dictionary _doorStrikeTimeMs = new(); + private readonly Dictionary _doorExtendedStrikeTimeMs = new(); /// /// OSDP reader configuration extracted from Z9 Dev messages. @@ -79,6 +80,7 @@ public class OsdpReaderConfig public int? RexInputNumber { get; set; } public bool ActivateStrikeOnRex { get; set; } public int? StrikeTimeMs { get; set; } + public int? ExtendedStrikeTimeMs { get; set; } } private Thread _thread; private volatile bool _stopping; @@ -614,6 +616,13 @@ private void ProcessDev(Dev dev) osdpConfig.StrikeTimeMs = strikeTimeMs; } } + lock (_doorExtendedStrikeTimeMs) + { + if (_doorExtendedStrikeTimeMs.TryGetValue(osdpConfig.DoorUnid.Value, out var extStrikeTimeMs)) + { + osdpConfig.ExtendedStrikeTimeMs = extStrikeTimeMs; + } + } } lock (_osdpReaderConfigs) @@ -755,6 +764,8 @@ private void ProcessDoorDev(Dev dev) var activateStrikeOnRex = doorConfig.ActivateStrikeOnRex; int? strikeTimeMs = doorConfig.StrikeTimeCase == DoorConfig.StrikeTimeOneofCase.StrikeTime ? doorConfig.StrikeTime : null; + int? extendedStrikeTimeMs = doorConfig.ExtendedStrikeTimeCase == DoorConfig.ExtendedStrikeTimeOneofCase.ExtendedStrikeTime + ? doorConfig.ExtendedStrikeTime : null; lock (_doorActivateStrikeOnRex) { @@ -764,6 +775,10 @@ private void ProcessDoorDev(Dev dev) { _doorStrikeTimeMs[dev.Unid] = strikeTimeMs; } + lock (_doorExtendedStrikeTimeMs) + { + _doorExtendedStrikeTimeMs[dev.Unid] = extendedStrikeTimeMs; + } // Apply to existing reader config if already loaded lock (_osdpReaderConfigs) @@ -773,11 +788,12 @@ private void ProcessDoorDev(Dev dev) { config.ActivateStrikeOnRex = activateStrikeOnRex; config.StrikeTimeMs = strikeTimeMs; + config.ExtendedStrikeTimeMs = extendedStrikeTimeMs; } } - _logger.LogInformation("Received Door Dev: unid={Unid}, name={Name}, activateStrikeOnRex={ActivateStrikeOnRex}, strikeTimeMs={StrikeTimeMs}", - dev.Unid, doorName, activateStrikeOnRex, strikeTimeMs); + _logger.LogInformation("Received Door Dev: unid={Unid}, name={Name}, activateStrikeOnRex={ActivateStrikeOnRex}, strikeTimeMs={StrikeTimeMs}, extendedStrikeTimeMs={ExtendedStrikeTimeMs}", + dev.Unid, doorName, activateStrikeOnRex, strikeTimeMs, extendedStrikeTimeMs); } else { diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index ed47409..0041121 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -93,6 +93,13 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) _accessService.SetDoorUnidLookup(endpointId => _z9OpenCommunityProtocolService.GetConfigForEndpoint(endpointId)?.DoorUnid); + // Wire up strike time lookup for access grant strike duration + _accessService.SetStrikeTimeLookup(endpointId => + { + var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(endpointId); + return (config?.StrikeTimeMs, config?.ExtendedStrikeTimeMs); + }); + // Subscribe to OSDP configuration events before starting the service _z9OpenCommunityProtocolService.OsdpConfigurationReceived += OnOsdpConfigurationReceived; diff --git a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs index dfa59d5..cfa47a9 100644 --- a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs +++ b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs @@ -650,11 +650,6 @@ private string AddUpdateDevice(string parameters) var bus = _configuration.Buses.First(bus => bus.PortName == deviceAction.Device.PortName); - if (!_connections[bus.PortName]?.IsOpen ?? true) - { - throw new Exception($"{bus.PortName} is not open"); - } - bus.Devices.Add(deviceAction.Device); AddDeviceToPanel(deviceAction.Device); From ee25200805ee56a26dca306d7b115c1082943fa7 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 08:02:02 -0500 Subject: [PATCH 31/86] Detect door held open and send DoorHeld/DoorNotHeld events When a door stays open longer than the configured heldTime, a timer-based detection sends DoorHeld. When the door closes after a held alarm, DoorNotHeld is sent. Uses CancellationTokenSource per door to cancel timers when the door closes in time. Supports extendedHeldTime via the extDoorTime credential flag. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Services/AccessService.cs | 4 +- .../Z9OpenCommunityProtocolService.cs | 36 +++++++- src/Aporta/Workers/StartupWorker.cs | 82 +++++++++++++++++++ 3 files changed, 119 insertions(+), 3 deletions(-) diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index baf0884..5f12a9d 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -28,6 +28,7 @@ public class AccessDecisionEventArgs : EventArgs public string CardNumber { get; set; } public string PersonName { get; set; } public EventReason Reason { get; set; } + public bool UseExtendedTime { get; set; } } public class AccessService @@ -403,7 +404,8 @@ await _credentialRepository.Insert(new Credential IsGranted = true, CardNumber = matchingCardData, PersonName = assignedCredential.Person.FirstName, - Reason = EventReason.None + Reason = EventReason.None, + UseExtendedTime = useExtendedTime }); return (true, useExtendedTime); diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 94743c9..0fcaa11 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -62,6 +62,8 @@ public class Z9OpenCommunityProtocolService : IDisposable private readonly Dictionary _doorActivateStrikeOnRex = new(); private readonly Dictionary _doorStrikeTimeMs = new(); private readonly Dictionary _doorExtendedStrikeTimeMs = new(); + private readonly Dictionary _doorHeldTimeMs = new(); + private readonly Dictionary _doorExtendedHeldTimeMs = new(); /// /// OSDP reader configuration extracted from Z9 Dev messages. @@ -81,6 +83,8 @@ public class OsdpReaderConfig public bool ActivateStrikeOnRex { get; set; } public int? StrikeTimeMs { get; set; } public int? ExtendedStrikeTimeMs { get; set; } + public int? HeldTimeMs { get; set; } + public int? ExtendedHeldTimeMs { get; set; } } private Thread _thread; private volatile bool _stopping; @@ -623,6 +627,20 @@ private void ProcessDev(Dev dev) osdpConfig.ExtendedStrikeTimeMs = extStrikeTimeMs; } } + lock (_doorHeldTimeMs) + { + if (_doorHeldTimeMs.TryGetValue(osdpConfig.DoorUnid.Value, out var heldTimeMs)) + { + osdpConfig.HeldTimeMs = heldTimeMs; + } + } + lock (_doorExtendedHeldTimeMs) + { + if (_doorExtendedHeldTimeMs.TryGetValue(osdpConfig.DoorUnid.Value, out var extHeldTimeMs)) + { + osdpConfig.ExtendedHeldTimeMs = extHeldTimeMs; + } + } } lock (_osdpReaderConfigs) @@ -766,6 +784,10 @@ private void ProcessDoorDev(Dev dev) ? doorConfig.StrikeTime : null; int? extendedStrikeTimeMs = doorConfig.ExtendedStrikeTimeCase == DoorConfig.ExtendedStrikeTimeOneofCase.ExtendedStrikeTime ? doorConfig.ExtendedStrikeTime : null; + int? heldTimeMs = doorConfig.HeldTimeCase == DoorConfig.HeldTimeOneofCase.HeldTime + ? doorConfig.HeldTime : null; + int? extendedHeldTimeMs = doorConfig.ExtendedHeldTimeCase == DoorConfig.ExtendedHeldTimeOneofCase.ExtendedHeldTime + ? doorConfig.ExtendedHeldTime : null; lock (_doorActivateStrikeOnRex) { @@ -779,6 +801,14 @@ private void ProcessDoorDev(Dev dev) { _doorExtendedStrikeTimeMs[dev.Unid] = extendedStrikeTimeMs; } + lock (_doorHeldTimeMs) + { + _doorHeldTimeMs[dev.Unid] = heldTimeMs; + } + lock (_doorExtendedHeldTimeMs) + { + _doorExtendedHeldTimeMs[dev.Unid] = extendedHeldTimeMs; + } // Apply to existing reader config if already loaded lock (_osdpReaderConfigs) @@ -789,11 +819,13 @@ private void ProcessDoorDev(Dev dev) config.ActivateStrikeOnRex = activateStrikeOnRex; config.StrikeTimeMs = strikeTimeMs; config.ExtendedStrikeTimeMs = extendedStrikeTimeMs; + config.HeldTimeMs = heldTimeMs; + config.ExtendedHeldTimeMs = extendedHeldTimeMs; } } - _logger.LogInformation("Received Door Dev: unid={Unid}, name={Name}, activateStrikeOnRex={ActivateStrikeOnRex}, strikeTimeMs={StrikeTimeMs}, extendedStrikeTimeMs={ExtendedStrikeTimeMs}", - dev.Unid, doorName, activateStrikeOnRex, strikeTimeMs, extendedStrikeTimeMs); + _logger.LogInformation("Received Door Dev: unid={Unid}, name={Name}, activateStrikeOnRex={ActivateStrikeOnRex}, strikeTimeMs={StrikeTimeMs}, extendedStrikeTimeMs={ExtendedStrikeTimeMs}, heldTimeMs={HeldTimeMs}, extendedHeldTimeMs={ExtendedHeldTimeMs}", + dev.Unid, doorName, activateStrikeOnRex, strikeTimeMs, extendedStrikeTimeMs, heldTimeMs, extendedHeldTimeMs); } else { diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 0041121..e05bfbc 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -37,6 +37,9 @@ public class StartupWorker : BackgroundService private readonly HashSet _configuredOsdpBuses = new(); private readonly Dictionary _doorStrikeActive = new(); private readonly Dictionary _doorForced = new(); + private readonly Dictionary _doorHeld = new(); + private readonly Dictionary _doorUseExtendedTime = new(); + private readonly Dictionary _doorHeldTimers = new(); public StartupWorker(IDataAccess dataAccess, ExtensionService extensionService, @@ -135,6 +138,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) stoppingToken.Register(() => { _logger.LogWarning("Application is shutting down"); + CancelAllDoorHeldTimers(); _accessService.AccessDecisionMade -= OnAccessDecisionMade; _extensionService.StateChanged -= OnStateChanged; _z9OpenCommunityProtocolService.DevActionRequested -= OnDevActionRequested; @@ -628,9 +632,13 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorForced); _doorForced[contactDoor.Id] = true; } + + StartDoorHeldTimer(contactDoor.Id, contactDoor.Name, config2); } else // Door closed { + CancelDoorHeldTimer(contactDoor.Id); + _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorClosed); if (_doorForced.TryGetValue(contactDoor.Id, out var wasForced) && wasForced) @@ -639,6 +647,13 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorNotForced); _doorForced[contactDoor.Id] = false; } + + if (_doorHeld.TryGetValue(contactDoor.Id, out var wasHeld) && wasHeld) + { + _logger.LogInformation("Door held cleared: '{DoorName}'", contactDoor.Name); + _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorNotHeld); + _doorHeld[contactDoor.Id] = false; + } } return; } @@ -646,6 +661,16 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) { + // Store extended time flag for door held timer (consumed when door opens) + if (e.IsGranted) + { + var readerConfig = _z9OpenCommunityProtocolService.GetConfigForEndpoint(e.EndpointId); + if (readerConfig?.DoorUnid != null) + { + _doorUseExtendedTime[readerConfig.DoorUnid.Value] = e.UseExtendedTime; + } + } + // Get the Z9 config for this endpoint to send event with correct device unid var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(e.EndpointId); if (config == null) @@ -696,4 +721,61 @@ private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) rawBits: rawBits, subCode: subCode); } + + private void StartDoorHeldTimer(int doorId, string doorName, Z9OpenCommunityProtocolService.OsdpReaderConfig config) + { + // Pick held time: use extended if last access grant had extDoorTime + var useExtended = _doorUseExtendedTime.TryGetValue(doorId, out var ext) && ext; + var heldTimeMs = useExtended && config.ExtendedHeldTimeMs.HasValue + ? config.ExtendedHeldTimeMs.Value + : config.HeldTimeMs ?? 0; + + // Clear one-shot extended time flag + _doorUseExtendedTime.Remove(doorId); + + if (heldTimeMs <= 0) + return; + + // Cancel any existing timer for this door + CancelDoorHeldTimer(doorId); + + var cts = new CancellationTokenSource(); + _doorHeldTimers[doorId] = cts; + + _ = Task.Run(async () => + { + try + { + await Task.Delay(heldTimeMs, cts.Token); + _logger.LogWarning("Door held open: '{DoorName}' (heldTime={HeldTimeMs}ms, extended={UseExtended})", + doorName, heldTimeMs, useExtended); + _doorHeld[doorId] = true; + _z9OpenCommunityProtocolService.SendDoorStateEvent(config, EvtCode.DoorHeld); + } + catch (TaskCanceledException) + { + // Timer cancelled — door closed in time + } + }); + } + + private void CancelDoorHeldTimer(int doorId) + { + if (_doorHeldTimers.TryGetValue(doorId, out var cts)) + { + cts.Cancel(); + cts.Dispose(); + _doorHeldTimers.Remove(doorId); + } + } + + private void CancelAllDoorHeldTimers() + { + foreach (var cts in _doorHeldTimers.Values) + { + cts.Cancel(); + cts.Dispose(); + } + _doorHeldTimers.Clear(); + } } \ No newline at end of file From d1e4622355383e11a5e32f2628dd006a432a9ad3 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 08:22:39 -0500 Subject: [PATCH 32/86] Update README with Z9/Open Community Profile integration features Replace the old roadmap/TODO section with a comprehensive feature list covering connection, device management, credentials, access control, door control, and door alarm monitoring. Co-Authored-By: Claude Opus 4.6 --- README.md | 54 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 6a6cb3e..e491a19 100644 --- a/README.md +++ b/README.md @@ -96,22 +96,44 @@ _appsettings.Production.json_ - Location for Aporta settings } ``` -## Z9 Open Community Integration Roadmap - -Aporta integrates with the Z9 Open Community protocol for centralized management. Current status and upcoming work: - -- Connection & identification with host -- Configuration download (credentials, privileges, schedules, devices) -- Device mapping (doors, OSDP readers over IP) -- OSDP reader online/offline reporting -- Access control decisions (grant, deny, schedule enforcement) -- Access event reporting to host -- Door strike wiring and actuation -- Door state event reporting (unlocked/locked/opened/closed) -- Device actions (door momentary unlock) -- **TODO**: Device actions (door mode change) -- **TODO**: Door forced open alarm -- **TODO**: Door held open alarm +## Z9/Open Community Profile Integration + +This fork adds support for the [Z9/Open Community Profile](https://z9security.com), allowing Aporta to operate as a managed community controller under a host. Aporta connects outbound to the host over TCP using protobuf messaging, receives its full configuration (credentials, privileges, schedules, devices), and reports events back. + +### Connection & Protocol +- Outbound TCP connection from panel to host (panel-initiates model) +- Protobuf-based Z9/Open Community protocol with identification handshake +- Automatic configuration download on connect (DbChange messages) + +### Device Management +- OSDP credential readers over TCP/IP, configured from Z9/Open Community Profile Dev messages +- Door model with strike actuator, door contact sensor, and REX sensor — all wired automatically from the device hierarchy +- Credential reader online/offline status reporting + +### Credential & Data Format Support +- Credential mapping from Z9/Open Community Profile Cred objects (card number, facility code, enabled/disabled, effective/expiry dates) +- BinaryFormatter-based encoding and decoding of card data using Z9/Open Community Profile DataFormat definitions +- Credential templates, data layouts, and data formats persisted to local SQLite database + +### Access Control Decisions +- Privilege-based access control using DoorAccessPriv and CredPrivBinding +- Door-specific privilege checking (precision access and privilege group elements) +- Schedule enforcement with SchedRestriction (time-of-day, day-of-week) +- Holiday calendar support in schedule evaluation +- Credential status checks: disabled, not yet effective, expired +- Access granted and denied events reported to host with appropriate EvtSubCode (NO_PRIV, INACTIVE, NOT_EFFECTIVE, EXPIRED, OUTSIDE_SCHED, UNKNOWN_CRED_NUM) + +### Door Control +- Door strike actuation on access grant with configurable strike time from DoorConfig +- Extended strike time support via credential DoorAccessModifiers (extDoorTime flag) +- Request to Exit (REX) with configurable activateStrikeOnRex +- Door momentary unlock via DevActionReq from host + +### Door Alarm Monitoring +- Door state reporting: unlocked, locked, opened, closed +- Door forced open detection (door opens without strike active) with DoorForced/DoorNotForced events +- Door held open detection (door stays open past configured heldTime) with DoorHeld/DoorNotHeld events +- Extended held time support via credential extDoorTime flag ## Aporta Housekeeping From 63dac356226cf806e2d4e249406249972f1ceca6 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 08:50:22 -0500 Subject: [PATCH 33/86] Support door mode: unlocked, locked, and card-only with DevAction handling Apply default door mode from Z9/Open Community Profile DoorConfig on door creation. Handle DevActionType.DoorModeChange to switch modes at runtime, including reset-to-default. Unlocked mode activates strike permanently and bypasses access control. Locked mode denies all access. Pin-based modes map to card-only for now. REX behavior respects current door mode. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Services/AccessService.cs | 38 +++++ .../Z9OpenCommunityProtocolService.cs | 18 ++ src/Aporta.Shared/Models/EventData.cs | 4 +- src/Aporta/Workers/StartupWorker.cs | 159 +++++++++++++++++- 4 files changed, 217 insertions(+), 2 deletions(-) diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 5f12a9d..e341c62 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -46,6 +46,7 @@ public class AccessService private readonly IHubContext _hubContext; private Func _getDoorUnidForEndpoint; private Func _getStrikeTimesForEndpoint; + private Func _getDoorModeForEndpoint; /// /// Event raised when an access decision is made (granted or denied). @@ -88,6 +89,14 @@ public void SetStrikeTimeLookup(Func getStrikeTimesForEndp _getStrikeTimesForEndpoint = getStrikeTimesForEndpoint; } + /// + /// Sets a function to look up the current door mode for an endpoint. + /// + public void SetDoorModeLookup(Func getDoorModeForEndpoint) + { + _getDoorModeForEndpoint = getDoorModeForEndpoint; + } + public void Startup() { _extensionService.AccessCredentialReceived += ExtensionServiceOnAccessCredentialReceived; @@ -137,6 +146,35 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA return; } + // Check door mode before normal access control + var doorMode = _getDoorModeForEndpoint?.Invoke(accessPoint.DriverEndpointId); + if (doorMode == DoorModeType.StaticStateUnlocked) + { + _logger.LogInformation("Door '{Name}' is unlocked - granting access without credential check", matchingDoor.Name); + await eventArgs.Access.AccessGrantedNotification(); + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = true, + CardNumber = eventArgs.Handler.MatchingCardData, + Reason = EventReason.None + }); + return; + } + if (doorMode == DoorModeType.StaticStateLocked) + { + _logger.LogInformation("Door '{Name}' is locked - denying access", matchingDoor.Name); + await eventArgs.Access.AccessDeniedNotification(); + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = false, + CardNumber = eventArgs.Handler.MatchingCardData, + Reason = EventReason.DoorLocked + }); + return; + } + var (granted, useExtendedTime) = await IsAccessGranted(eventArgs.Handler.MatchingCardData, matchingDoor, accessPoint); if (granted) { diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 0fcaa11..d92ba85 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -64,6 +64,7 @@ public class Z9OpenCommunityProtocolService : IDisposable private readonly Dictionary _doorExtendedStrikeTimeMs = new(); private readonly Dictionary _doorHeldTimeMs = new(); private readonly Dictionary _doorExtendedHeldTimeMs = new(); + private readonly Dictionary _doorDefaultDoorMode = new(); /// /// OSDP reader configuration extracted from Z9 Dev messages. @@ -85,6 +86,7 @@ public class OsdpReaderConfig public int? ExtendedStrikeTimeMs { get; set; } public int? HeldTimeMs { get; set; } public int? ExtendedHeldTimeMs { get; set; } + public DoorMode DefaultDoorMode { get; set; } } private Thread _thread; private volatile bool _stopping; @@ -641,6 +643,13 @@ private void ProcessDev(Dev dev) osdpConfig.ExtendedHeldTimeMs = extHeldTimeMs; } } + lock (_doorDefaultDoorMode) + { + if (_doorDefaultDoorMode.TryGetValue(osdpConfig.DoorUnid.Value, out var defaultDoorMode)) + { + osdpConfig.DefaultDoorMode = defaultDoorMode; + } + } } lock (_osdpReaderConfigs) @@ -809,6 +818,13 @@ private void ProcessDoorDev(Dev dev) { _doorExtendedHeldTimeMs[dev.Unid] = extendedHeldTimeMs; } + if (doorConfig.DefaultDoorMode != null) + { + lock (_doorDefaultDoorMode) + { + _doorDefaultDoorMode[dev.Unid] = doorConfig.DefaultDoorMode; + } + } // Apply to existing reader config if already loaded lock (_osdpReaderConfigs) @@ -821,6 +837,8 @@ private void ProcessDoorDev(Dev dev) config.ExtendedStrikeTimeMs = extendedStrikeTimeMs; config.HeldTimeMs = heldTimeMs; config.ExtendedHeldTimeMs = extendedHeldTimeMs; + if (doorConfig.DefaultDoorMode != null) + config.DefaultDoorMode = doorConfig.DefaultDoorMode; } } diff --git a/src/Aporta.Shared/Models/EventData.cs b/src/Aporta.Shared/Models/EventData.cs index 799b026..289e25e 100644 --- a/src/Aporta.Shared/Models/EventData.cs +++ b/src/Aporta.Shared/Models/EventData.cs @@ -35,5 +35,7 @@ public enum EventReason [Description("No Privilege")] NoPrivilege, [Description("Outside Schedule")] - OutsideSchedule + OutsideSchedule, + [Description("Door Locked")] + DoorLocked } \ No newline at end of file diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index e05bfbc..1ff2e3c 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -10,6 +10,7 @@ using Aporta.Drivers.OSDP.Shared; using Aporta.Extensions.Hardware; using Aporta.Shared.Models; +using Z9.Protobuf; using Z9.Spcore.Proto; using Aporta.Drivers.OSDP.Shared.Actions; using Dapper; @@ -40,6 +41,7 @@ public class StartupWorker : BackgroundService private readonly Dictionary _doorHeld = new(); private readonly Dictionary _doorUseExtendedTime = new(); private readonly Dictionary _doorHeldTimers = new(); + private readonly Dictionary _doorCurrentMode = new(); public StartupWorker(IDataAccess dataAccess, ExtensionService extensionService, @@ -103,6 +105,14 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) return (config?.StrikeTimeMs, config?.ExtendedStrikeTimeMs); }); + // Wire up door mode lookup for access decisions + _accessService.SetDoorModeLookup(endpointId => + { + var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(endpointId); + if (config?.DoorUnid == null) return null; + return _doorCurrentMode.TryGetValue(config.DoorUnid.Value, out var mode) ? mode : null; + }); + // Subscribe to OSDP configuration events before starting the service _z9OpenCommunityProtocolService.OsdpConfigurationReceived += OnOsdpConfigurationReceived; @@ -477,6 +487,12 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea _logger.LogWarning("REX input endpoint {RexEndpointId} not found after retries", rexDriverEndpointId); } } + + // Apply default door mode if configured + if (config?.DefaultDoorMode != null && config.DoorUnid.HasValue) + { + await ApplyDoorMode(config.DoorUnid.Value, config.DefaultDoorMode, config); + } } private void OnDevActionRequested(object sender, DevActionReq req) @@ -498,6 +514,23 @@ private void OnDevActionRequested(object sender, DevActionReq req) } }); } + else if (req.DevActionType == DevActionType.DoorModeChange) + { + var doorUnid = req.DevUnid; + _logger.LogInformation("DevActionReq: DOOR_MODE_CHANGE for door unid={DoorUnid}", doorUnid); + + Task.Run(async () => + { + try + { + await HandleDoorModeChange(doorUnid, req.DevActionParams); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to handle DOOR_MODE_CHANGE for door unid={DoorUnid}", doorUnid); + } + }); + } else { _logger.LogInformation("DevActionReq: unhandled action type {Type} for device unid={DevUnid}", @@ -554,6 +587,116 @@ private async Task HandleDoorMomentaryUnlock(int doorUnid) doorUnid, strikeTimeMs); } + private async Task HandleDoorModeChange(int doorUnid, DevActionParams devActionParams) + { + var modeParams = devActionParams?.ExtDoorModeDevActionParams; + if (modeParams == null) + { + _logger.LogWarning("DOOR_MODE_CHANGE missing DoorModeDevActionParams for door unid={DoorUnid}", doorUnid); + return; + } + + // Find the reader config for this door + var config = _z9OpenCommunityProtocolService.OsdpReaderConfigs + .FirstOrDefault(c => c.DoorUnid == doorUnid); + if (config == null) + { + _logger.LogWarning("No reader config found for door unid={DoorUnid}", doorUnid); + return; + } + + // Determine which DoorMode to apply + DoorMode doorMode; + if (modeParams.ResetToDefaultCase == DoorModeDevActionParams.ResetToDefaultOneofCase.ResetToDefault + && modeParams.ResetToDefault) + { + doorMode = config.DefaultDoorMode; + if (doorMode == null) + { + _logger.LogWarning("ResetToDefault requested but no default door mode for door unid={DoorUnid}", doorUnid); + return; + } + _logger.LogInformation("Resetting door unid={DoorUnid} to default mode", doorUnid); + } + else + { + doorMode = modeParams.DoorMode; + if (doorMode == null) + { + _logger.LogWarning("DOOR_MODE_CHANGE has no DoorMode for door unid={DoorUnid}", doorUnid); + return; + } + } + + await ApplyDoorMode(doorUnid, doorMode, config); + } + + private async Task ApplyDoorMode(int doorUnid, DoorMode doorMode, Z9OpenCommunityProtocolService.OsdpReaderConfig config) + { + var doorModeType = CommonDoorModes.DoorModeToDoorModeType(doorMode); + if (!doorModeType.HasValue) + { + _logger.LogWarning("Could not determine DoorModeType for door unid={DoorUnid}", doorUnid); + return; + } + + // Pin-based modes map to CardOnly for now (no pin support) + var effectiveMode = doorModeType.Value; + if (effectiveMode == DoorModeType.CardAndConfirmingPin || + effectiveMode == DoorModeType.UniquePinOnly || + effectiveMode == DoorModeType.CardOnlyOrUniquePin) + { + _logger.LogWarning("Door unid={DoorUnid}: pin-based mode {Mode} mapped to CardOnly (TODO: pin support)", + doorUnid, effectiveMode); + effectiveMode = DoorModeType.CardOnly; + } + + var previousMode = _doorCurrentMode.TryGetValue(doorUnid, out var prev) ? prev : (DoorModeType?)null; + _doorCurrentMode[doorUnid] = effectiveMode; + + _logger.LogInformation("Door unid={DoorUnid} mode changed to {Mode}", doorUnid, effectiveMode); + + // Actuate strike based on mode + if (config.StrikeOutputNumber != null) + { + var strikeDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:O{config.StrikeOutputNumber}"; + var endpoints = await _endpointRepository.GetAll(); + var strikeEndpoint = endpoints.FirstOrDefault(ep => ep.DriverEndpointId == strikeDriverEndpointId); + + if (strikeEndpoint != null) + { + var controlPoint = _extensionService.GetControlPoint(strikeEndpoint.ExtensionId, strikeEndpoint.DriverEndpointId); + if (controlPoint != null) + { + if (effectiveMode == DoorModeType.StaticStateUnlocked) + { + await controlPoint.SetState(true); + _z9OpenCommunityProtocolService.SendDoorStateEvent(config, EvtCode.DoorUnlocked); + } + else if (previousMode == DoorModeType.StaticStateUnlocked) + { + // Switching away from unlocked — deactivate strike + await controlPoint.SetState(false); + _z9OpenCommunityProtocolService.SendDoorStateEvent(config, EvtCode.DoorLocked); + } + } + } + } + + // Send the door mode event + var modeEvtCode = effectiveMode switch + { + DoorModeType.StaticStateUnlocked => EvtCode.DoorModeStaticStateUnlocked, + DoorModeType.StaticStateLocked => EvtCode.DoorModeStaticStateLocked, + DoorModeType.CardOnly => EvtCode.DoorModeCardOnly, + DoorModeType.CardAndConfirmingPin => EvtCode.DoorModeCardAndConfirmingPin, + DoorModeType.UniquePinOnly => EvtCode.DoorModeUniquePinOnly, + DoorModeType.CardOnlyOrUniquePin => EvtCode.DoorModeCardOnlyOrUniquePin, + _ => EvtCode.DoorModeCardOnly + }; + _z9OpenCommunityProtocolService.SendDoorStateEvent(config, modeEvtCode); + } + private void OnStateChanged(object sender, StateChangedEventArgs e) { var driverEndpointId = e.Endpoint?.Id; @@ -593,7 +736,20 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) _logger.LogInformation("REX activated for door '{DoorName}'", rexDoor.Name); _z9OpenCommunityProtocolService.SendDoorStateEvent(config, EvtCode.ExitRequested); - if (config.ActivateStrikeOnRex && config.DoorUnid.HasValue) + // Determine REX behavior based on door mode + var currentMode = config.DoorUnid.HasValue && _doorCurrentMode.TryGetValue(config.DoorUnid.Value, out var mode) + ? mode : (DoorModeType?)null; + + if (currentMode == DoorModeType.StaticStateUnlocked) + { + // Already unlocked — no need for momentary unlock + } + else if (currentMode == DoorModeType.StaticStateLocked) + { + // Door is locked — do not unlock on REX + _logger.LogInformation("REX ignored for door '{DoorName}' — door is in locked mode", rexDoor.Name); + } + else if (config.ActivateStrikeOnRex && config.DoorUnid.HasValue) { await HandleDoorMomentaryUnlock(config.DoorUnid.Value); } @@ -707,6 +863,7 @@ private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) EventReason.CredentialNotYetEffective => EvtSubCode.AccessDeniedNotEffective, EventReason.CredentialExpired => EvtSubCode.AccessDeniedExpired, EventReason.OutsideSchedule => EvtSubCode.AccessDeniedOutsideSched, + EventReason.DoorLocked => EvtSubCode.AccessDeniedNoPriv, _ => EvtSubCode.AccessDeniedInactive // Default value (0); unused for granted events }; From 05bdc22d385348602d31e2661ac9c93cbb9a5d3d Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 08:51:04 -0500 Subject: [PATCH 34/86] Update README with door mode support features Co-Authored-By: Claude Opus 4.6 --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index e491a19..bae645b 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,11 @@ This fork adds support for the [Z9/Open Community Profile](https://z9security.co - Extended strike time support via credential DoorAccessModifiers (extDoorTime flag) - Request to Exit (REX) with configurable activateStrikeOnRex - Door momentary unlock via DevActionReq from host +- Door mode support: unlocked (strike permanently on, bypasses access control), locked (denies all access), card-only (normal access control) +- Default door mode applied from DoorConfig on door creation +- Runtime door mode change via DevActionReq (DoorModeChange) from host, including reset-to-default +- Pin-based modes (card+pin, pin-only, card-or-pin) mapped to card-only until pin support is implemented +- REX behavior respects current door mode (no unlock action in unlocked or locked modes) ### Door Alarm Monitoring - Door state reporting: unlocked, locked, opened, closed From 539908178bf2248fb7549d15c6f68e2e5dc7ba0f Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 11:34:35 -0500 Subject: [PATCH 35/86] Match credentials by decoded card number in Z9/Open Community mode Instead of encoding credNum into raw bits for storage, store the decimal credNum directly. When a card is read, decode the raw bits using DataFormat definitions via DecodeCardRead(), then look up by credNum. This relies on z9main sending DataFormats to community controllers. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Services/AccessService.cs | 42 +++-- .../Z9OpenCommunityProtocolService.cs | 143 +----------------- src/Aporta/Workers/StartupWorker.cs | 4 + 3 files changed, 38 insertions(+), 151 deletions(-) diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index e341c62..513246c 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -47,6 +47,7 @@ public class AccessService private Func _getDoorUnidForEndpoint; private Func _getStrikeTimesForEndpoint; private Func _getDoorModeForEndpoint; + private Func _decodeCardData; /// /// Event raised when an access decision is made (granted or denied). @@ -97,6 +98,17 @@ public void SetDoorModeLookup(Func getDoorModeForEndpoint _getDoorModeForEndpoint = getDoorModeForEndpoint; } + /// + /// Sets a function to decode raw card bit data into a credential number string. + /// In Z9 mode, credentials are stored by decoded card number, so card reads + /// must be decoded before matching. In standalone mode, this is not set and + /// raw bit strings are matched directly. + /// + public void SetCardDataDecoder(Func decodeCardData) + { + _decodeCardData = decodeCardData; + } + public void Startup() { _extensionService.AccessCredentialReceived += ExtensionServiceOnAccessCredentialReceived; @@ -203,26 +215,24 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA private async Task<(bool granted, bool useExtendedTime)> IsAccessGranted(string matchingCardData, Aporta.Shared.Models.Door matchingDoor, Endpoint accessPoint) { - // First try matching by raw bit string - var assignedCredential = await _credentialRepository.AssignedCredential(matchingCardData); - - // If not found and the card data looks like a bit string, try matching by decoded credential number - if (assignedCredential == null && !string.IsNullOrEmpty(matchingCardData) && - matchingCardData.All(c => c == '0' || c == '1')) + AssignedCredential assignedCredential; + if (_decodeCardData != null) { - // Try to decode as credential number - simple extraction for 35-bit format - // Format: bits 0-1 = unused, bits 2-33 = 32-bit cred num, bit 34 = parity - if (matchingCardData.Length == 35) + // Z9 mode: decode raw bits to credential number, then look up by credNum + var decodedCredNum = _decodeCardData(matchingCardData); + assignedCredential = decodedCredNum != null + ? await _credentialRepository.AssignedCredential(decodedCredNum) + : null; + if (assignedCredential != null) { - var credNumBits = matchingCardData.Substring(2, 32); - var credNum = Convert.ToInt64(credNumBits, 2); - assignedCredential = await _credentialRepository.AssignedCredential(credNum.ToString()); - if (assignedCredential != null) - { - _logger.LogDebug("Matched credential by decoded 35-bit credNum: {CredNum}", credNum); - } + _logger.LogDebug("Matched credential by decoded credNum: {CredNum}", decodedCredNum); } } + else + { + // Standalone mode: match by raw bit string directly + assignedCredential = await _credentialRepository.AssignedCredential(matchingCardData); + } int eventId; if (assignedCredential?.Person == null) { diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index d92ba85..1aab71a 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -253,7 +253,7 @@ private void HandleMessage(SpCoreMessage message) private void HandleDbChange(DbChange dbChange) { - _logger.LogInformation("Processing DbChange (requestId={RequestId})", dbChange.RequestId); + _logger.LogDebug("Processing DbChange (requestId={RequestId})", dbChange.RequestId); // Process deletes first (order: most dependent -> least dependent) // Cred deletes @@ -874,23 +874,14 @@ private void ProcessCredential(Cred cred) } var credNum = SpCoreProtoUtil.ToBigInteger(cred.CardPin.CredNum); - var facilityCode = cred.CardPin.FacilityCodeCase == CardPin.FacilityCodeOneofCase.FacilityCode - ? (int?)cred.CardPin.FacilityCode : null; - // Find the data format to encode the credential number as bits - var bitString = EncodeCredentialAsBits(cred, credNum, facilityCode); - if (string.IsNullOrEmpty(bitString)) - { - // Fallback: store as decimal string if no format available - bitString = credNum.ToString(); - _logger.LogWarning("No data format found for credential {Unid}, storing as decimal: {Number}", - cred.Unid, bitString); - } + // Store credential number as decimal string — card reads will be decoded to match + var credNumString = credNum.ToString(); - var personName = !string.IsNullOrWhiteSpace(cred.Name) ? cred.Name : bitString; + var personName = !string.IsNullOrWhiteSpace(cred.Name) ? cred.Name : credNumString; _logger.LogInformation("Processing credential Unid={Unid} Number={Number} Name={Name} PrivBindings={BindingCount}", - cred.Unid, bitString, personName, cred.PrivBindings.Count); + cred.Unid, credNumString, personName, cred.PrivBindings.Count); // Store the full Z9 Cred proto (for privilege checking) _z9CredRepository.Upsert(cred).GetAwaiter().GetResult(); @@ -907,7 +898,7 @@ private void ProcessCredential(Cred cred) var credential = new Credential { - Number = bitString, + Number = credNumString, Enabled = cred.Enabled }; _credentialRepository.Upsert(credential, cred.Unid).GetAwaiter().GetResult(); @@ -920,126 +911,6 @@ private void ProcessCredential(Cred cred) } } - /// - /// Encodes a credential number as a bit string using the data format from the credential's template. - /// - private string EncodeCredentialAsBits(Cred cred, BigInteger credNum, int? facilityCode) - { - // Find the credential template - if (cred.CredTemplateUnid == 0) - { - _logger.LogDebug("Credential {Unid} has no CredTemplateUnid", cred.Unid); - return null; - } - - var credTemplate = _credTemplateRepository.Get(cred.CredTemplateUnid).GetAwaiter().GetResult(); - if (credTemplate == null) - { - _logger.LogDebug("CredTemplate {Unid} not found", cred.CredTemplateUnid); - return null; - } - - // Get the data layout from the template - var cardPinTemplate = credTemplate.CardPinTemplate; - if (cardPinTemplate == null) - { - _logger.LogDebug("CredTemplate {Unid} has no CardPinTemplate", credTemplate.Unid); - return null; - } - - // If anyDataLayout is true, try all available formats - if (cardPinTemplate.AnyDataLayoutCase == CardPinTemplate.AnyDataLayoutOneofCase.AnyDataLayout - && cardPinTemplate.AnyDataLayout) - { - // Use the first available binary format - var dataFormats = _dataFormatRepository.GetAll().GetAwaiter().GetResult(); - foreach (var df in dataFormats) - { - if (df.DataFormatType == DataFormatType.Binary && df.ExtBinaryFormat != null) - { - var bits = EncodeWithBinaryFormatter(df, credNum, facilityCode); - if (bits != null) - { - _logger.LogDebug("Encoded credential using format {Name}", df.Name); - return bits; - } - } - } - return null; - } - - // Get specific data layout - if (cardPinTemplate.DataLayoutUnidCase != CardPinTemplate.DataLayoutUnidOneofCase.DataLayoutUnid) - { - _logger.LogDebug("CardPinTemplate has no DataLayoutUnid"); - return null; - } - - var dataLayout = _dataLayoutRepository.Get(cardPinTemplate.DataLayoutUnid).GetAwaiter().GetResult(); - if (dataLayout == null) - { - _logger.LogDebug("DataLayout {Unid} not found", cardPinTemplate.DataLayoutUnid); - return null; - } - - // Get the data format from BasicDataLayout - if (dataLayout.ExtBasicDataLayout == null || - dataLayout.ExtBasicDataLayout.DataFormatUnidCase != BasicDataLayout.DataFormatUnidOneofCase.DataFormatUnid) - { - _logger.LogDebug("DataLayout {Unid} has no BasicDataLayout or DataFormatUnid", dataLayout.Unid); - return null; - } - - var dataFormat = _dataFormatRepository.Get(dataLayout.ExtBasicDataLayout.DataFormatUnid).GetAwaiter().GetResult(); - if (dataFormat == null) - { - _logger.LogDebug("DataFormat {Unid} not found", dataLayout.ExtBasicDataLayout.DataFormatUnid); - return null; - } - - if (dataFormat.DataFormatType != DataFormatType.Binary || dataFormat.ExtBinaryFormat == null) - { - _logger.LogDebug("DataFormat {Unid} is not binary", dataFormat.Unid); - return null; - } - - return EncodeWithBinaryFormatter(dataFormat, credNum, facilityCode); - } - - /// - /// Encodes a credential number into a bit string using the existing BinaryFormatter. - /// - private string EncodeWithBinaryFormatter(DataFormat dataFormat, BigInteger credNum, int? facilityCode) - { - try - { - var binaryFormat = dataFormat.ExtBinaryFormat; - var bitCount = binaryFormat.MaxBits; - - // Create a BitBuffer with the required size - var bb = new BitBuffer(bitCount, bitCount); - - // Create DecodedRead with the field values - var decodedRead = new DecodedRead(); - decodedRead.GetElements().Add(new DecodedReadElement(DataFormatField.CredNum, credNum)); - if (facilityCode.HasValue) - { - decodedRead.GetElements().Add(new DecodedReadElement(DataFormatField.FacilityCode, facilityCode.Value)); - } - - // Use BinaryFormatter to encode - var formatter = new BinaryFormatter(dataFormat); - formatter.Encode(bb, decodedRead); - - return bb.ToBinaryString(); - } - catch (BinaryFormatterException ex) - { - _logger.LogDebug(ex, "Failed to encode credential with format {Name}", dataFormat.Name); - return null; - } - } - /// /// Decodes a raw bit string from a card read into a credential number by trying all known formats. /// @@ -1062,6 +933,8 @@ private string EncodeWithBinaryFormatter(DataFormat dataFormat, BigInteger credN } var dataFormats = _dataFormatRepository.GetAll().GetAwaiter().GetResult(); + _logger.LogDebug("DecodeCardRead: trying {Count} data formats for {BitCount}-bit card", + dataFormats.Count(), rawBits.Length); foreach (var dataFormat in dataFormats) { if (dataFormat.DataFormatType != DataFormatType.Binary || dataFormat.ExtBinaryFormat == null) diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 1ff2e3c..0d9759e 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -113,6 +113,10 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) return _doorCurrentMode.TryGetValue(config.DoorUnid.Value, out var mode) ? mode : null; }); + // Wire up card data decoder: decode raw bits to credNum for credential matching + _accessService.SetCardDataDecoder(rawBits => + _z9OpenCommunityProtocolService.DecodeCardRead(rawBits)?.credNum.ToString()); + // Subscribe to OSDP configuration events before starting the service _z9OpenCommunityProtocolService.OsdpConfigurationReceived += OnOsdpConfigurationReceived; From 03049877437dde30fcde4d2714ac98955be1e1de Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 16:02:18 -0500 Subject: [PATCH 36/86] Require credential template for Z9/Open Community access decisions Deny access if the credential does not reference a valid CredTemplate. Also update README to reflect decoded card number matching. Co-Authored-By: Claude Opus 4.6 --- README.md | 2 +- src/Aporta.Core/Services/AccessService.cs | 37 ++++++++++++++++++++++- src/Aporta.Shared/Models/EventData.cs | 4 ++- src/Aporta/Workers/StartupWorker.cs | 1 + 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bae645b..7d0f066 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ This fork adds support for the [Z9/Open Community Profile](https://z9security.co ### Credential & Data Format Support - Credential mapping from Z9/Open Community Profile Cred objects (card number, facility code, enabled/disabled, effective/expiry dates) -- BinaryFormatter-based encoding and decoding of card data using Z9/Open Community Profile DataFormat definitions +- Credentials stored by card number; card reads decoded using Z9/Open Community Profile DataFormat definitions to extract and match by card number - Credential templates, data layouts, and data formats persisted to local SQLite database ### Access Control Decisions diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 513246c..f4af8cd 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -40,6 +40,7 @@ public class AccessService private readonly CredentialRepository _credentialRepository; private readonly EventRepository _eventRepository; private readonly Z9CredRepository _z9CredRepository; + private readonly CredTemplateRepository _credTemplateRepository; private readonly PrivRepository _privRepository; private readonly SchedRepository _schedRepository; private readonly ConcurrentDictionary _processAccessCredential = new(); @@ -66,6 +67,7 @@ public AccessService(IDataAccess dataAccess, ExtensionService extensionService, _endpointRepository = new EndpointRepository(dataAccess); _eventRepository = new EventRepository(dataAccess); _z9CredRepository = new Z9CredRepository(dataAccess); + _credTemplateRepository = new CredTemplateRepository(dataAccess); _privRepository = new PrivRepository(dataAccess); _schedRepository = new SchedRepository(dataAccess); _extensionService = extensionService; @@ -275,10 +277,43 @@ await _credentialRepository.Insert(new Credential return (false, false); } - // Check Z9 Cred status (enabled, effective date) + // Check Z9 Cred status (enabled, effective date, credTemplate) var z9Cred = await _z9CredRepository.Get(assignedCredential.Id); if (z9Cred != null) { + // Check credential template requirement + if (z9Cred.CredTemplateUnidCase != Cred.CredTemplateUnidOneofCase.CredTemplateUnid + || await _credTemplateRepository.Get(z9Cred.CredTemplateUnid) == null) + { + _logger.LogInformation("Door '{Name}' denied access - no credential template", matchingDoor.Name); + + eventId = await _eventRepository.Insert(new Event + { + EndpointId = accessPoint.Id, Type = EventType.AccessDenied, + Data = JsonSerializer.Serialize(new EventData + { + Door = matchingDoor, + Endpoint = accessPoint, + Person = assignedCredential.Person, + EventReason = EventReason.NoCredentialTemplate, + CardNumber = matchingCardData + }) + }); + await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); + + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = false, + CardNumber = matchingCardData, + PersonName = assignedCredential.Person.FirstName, + Reason = EventReason.NoCredentialTemplate + }); + + return (false, false); + } + // Check if credential is disabled if (z9Cred.EnabledCase == Cred.EnabledOneofCase.Enabled && !z9Cred.Enabled) { diff --git a/src/Aporta.Shared/Models/EventData.cs b/src/Aporta.Shared/Models/EventData.cs index 289e25e..09dffc6 100644 --- a/src/Aporta.Shared/Models/EventData.cs +++ b/src/Aporta.Shared/Models/EventData.cs @@ -37,5 +37,7 @@ public enum EventReason [Description("Outside Schedule")] OutsideSchedule, [Description("Door Locked")] - DoorLocked + DoorLocked, + [Description("No Credential Template")] + NoCredentialTemplate } \ No newline at end of file diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 0d9759e..82ae0b1 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -868,6 +868,7 @@ private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) EventReason.CredentialExpired => EvtSubCode.AccessDeniedExpired, EventReason.OutsideSchedule => EvtSubCode.AccessDeniedOutsideSched, EventReason.DoorLocked => EvtSubCode.AccessDeniedNoPriv, + EventReason.NoCredentialTemplate => EvtSubCode.AccessDeniedInactive, _ => EvtSubCode.AccessDeniedInactive // Default value (0); unused for granted events }; From 2bffb69995582110549e9883896afd5946b9bbc2 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 16:07:33 -0500 Subject: [PATCH 37/86] Fix EvtSubCode for missing credential template denial Use AccessDeniedUnknownCredNumFormat (value 15) to match z9main's DoorAccessTransaction behavior when credTemplate is null. Co-Authored-By: Claude Opus 4.6 --- src/Aporta/Workers/StartupWorker.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 82ae0b1..fd1c21b 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -868,7 +868,7 @@ private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) EventReason.CredentialExpired => EvtSubCode.AccessDeniedExpired, EventReason.OutsideSchedule => EvtSubCode.AccessDeniedOutsideSched, EventReason.DoorLocked => EvtSubCode.AccessDeniedNoPriv, - EventReason.NoCredentialTemplate => EvtSubCode.AccessDeniedInactive, + EventReason.NoCredentialTemplate => EvtSubCode.AccessDeniedUnknownCredNumFormat, _ => EvtSubCode.AccessDeniedInactive // Default value (0); unused for granted events }; From 15ef9c2a6c9d9152db2a3fe33cf99889d645face Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 17:57:40 -0500 Subject: [PATCH 38/86] Add standalone/primary mode with Z9 data structures and --primaryConfig support Align standalone mode to create the same Z9/Open data structures (DataFormat, DataLayout, CredTemplate, Z9 Cred) during auto-enrollment so both standalone and Z9 Community modes flow through a single unified access logic path. Add --primaryConfig CLI option to configure OSDP hardware from a JSON file, enabling Aporta to run as a primary controller without a Z9 host. Fix EventService pagination query using non-existent 'timestamp' column (the event table only has 'id' and 'data' columns; order by 'id' instead). Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Services/AccessService.cs | 39 ++++- src/Aporta.Core/Services/EventService.cs | 2 +- .../Z9OpenCommunityProtocolService.cs | 139 +++++++++++++++++ src/Aporta/Workers/StartupWorker.cs | 143 +++++++++++++++++- 4 files changed, 317 insertions(+), 6 deletions(-) diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index f4af8cd..8615b85 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -38,6 +38,7 @@ public class AccessService private readonly DoorRepository _doorRepository; private readonly EndpointRepository _endpointRepository; private readonly CredentialRepository _credentialRepository; + private readonly PersonRepository _personRepository; private readonly EventRepository _eventRepository; private readonly Z9CredRepository _z9CredRepository; private readonly CredTemplateRepository _credTemplateRepository; @@ -49,6 +50,7 @@ public class AccessService private Func _getStrikeTimesForEndpoint; private Func _getDoorModeForEndpoint; private Func _decodeCardData; + private Func> _enrollCredential; /// /// Event raised when an access decision is made (granted or denied). @@ -64,6 +66,7 @@ public AccessService(IDataAccess dataAccess, ExtensionService extensionService, { _doorRepository = new DoorRepository(dataAccess); _credentialRepository = new CredentialRepository(dataAccess); + _personRepository = new PersonRepository(dataAccess); _endpointRepository = new EndpointRepository(dataAccess); _eventRepository = new EventRepository(dataAccess); _z9CredRepository = new Z9CredRepository(dataAccess); @@ -111,6 +114,16 @@ public void SetCardDataDecoder(Func decodeCardData) _decodeCardData = decodeCardData; } + /// + /// Sets a handler called during auto-enrollment to create Z9 data structures + /// (DataFormat, CredTemplate, Z9 Cred) for a newly enrolled credential. + /// Signature: (rawBits, credentialId, doorId) → credNum string. + /// + public void SetEnrollmentHandler(Func> enrollCredential) + { + _enrollCredential = enrollCredential; + } + public void Startup() { _extensionService.AccessCredentialReceived += ExtensionServiceOnAccessCredentialReceived; @@ -254,8 +267,30 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA if (assignedCredential == null) { - await _credentialRepository.Insert(new Credential - { Number = matchingCardData, LastEvent = eventId }); + if (_enrollCredential != null) + { + // Auto-enroll with full Z9 data chain + var credentialId = await _credentialRepository.Insert(new Credential + { Number = matchingCardData, LastEvent = eventId }); + var credNum = await _enrollCredential(matchingCardData, credentialId, matchingDoor.Id); + // Update credential number to decoded credNum + var credential = await _credentialRepository.Get(credentialId); + if (credential != null) + { + credential.Number = credNum; + credential.LastEvent = eventId; + await _credentialRepository.Update(credential); + } + // Auto-create person and assignment so card works on next swipe + var person = new Person { FirstName = credNum, Enabled = true }; + await _personRepository.Upsert(person, credentialId); + await _credentialRepository.AssignPerson(credentialId, credentialId, true); + } + else + { + await _credentialRepository.Insert(new Credential + { Number = matchingCardData, LastEvent = eventId }); + } } else { diff --git a/src/Aporta.Core/Services/EventService.cs b/src/Aporta.Core/Services/EventService.cs index 9f23b35..c79e069 100644 --- a/src/Aporta.Core/Services/EventService.cs +++ b/src/Aporta.Core/Services/EventService.cs @@ -22,6 +22,6 @@ public async Task Get(int eventId) public async Task> GetAll(int pageNumber, int pageSize) { - return await _eventRepository.GetAll(pageNumber, pageSize, "timestamp"); + return await _eventRepository.GetAll(pageNumber, pageSize, "id"); } } \ No newline at end of file diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 1aab71a..697dbd9 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -911,6 +911,123 @@ private void ProcessCredential(Cred cred) } } + /// + /// Creates a raw N-bit DataFormat and BasicDataLayout if one doesn't already exist for that bit count. + /// Used in standalone mode to enable card data decoding without Z9 host configuration. + /// + /// The number of bits in the raw card data. + public void EnsureRawDataFormat(int bitCount) + { + // Check if a DataFormat with this unid already exists + var existing = _dataFormatRepository.Get(bitCount).GetAwaiter().GetResult(); + if (existing != null) + return; + + _logger.LogInformation("Creating raw {BitCount}-bit DataFormat and DataLayout", bitCount); + + var dataFormat = new DataFormat + { + Unid = bitCount, + Name = $"Raw {bitCount}-bit", + DataFormatType = DataFormatType.Binary, + ExtBinaryFormat = new BinaryFormat + { + MinBits = bitCount, + MaxBits = bitCount, + SupportReverseRead = false + } + }; + // Single FIELD element: entire bit range is the credential number + dataFormat.ExtBinaryFormat.Elements.Add(new BinaryElement + { + Num = 0, + Type = BinaryElementType.Field, + Start = 0, + Len = bitCount, + ExtFieldBinaryElement = new FieldBinaryElement + { + Field = DataFormatField.CredNum + } + }); + SpCoreProtoUtil.InitRequired(dataFormat); + _dataFormatRepository.Upsert(dataFormat).GetAwaiter().GetResult(); + + var dataLayout = new DataLayout + { + Unid = bitCount, + Name = $"Raw {bitCount}-bit", + LayoutType = DataLayoutType.Basic, + Enabled = true, + Priority = 0, + ExtBasicDataLayout = new BasicDataLayout + { + DataFormatUnid = bitCount + } + }; + SpCoreProtoUtil.InitRequired(dataLayout); + _dataLayoutRepository.Upsert(dataLayout).GetAwaiter().GetResult(); + } + + /// + /// Creates the default CredTemplate (unid=1) if not already present. + /// Used in standalone mode so credentials have a valid credential template. + /// + public void EnsureDefaultCredTemplate() + { + var existing = _credTemplateRepository.Get(1).GetAwaiter().GetResult(); + if (existing != null) + return; + + _logger.LogInformation("Creating default CredTemplate (unid=1)"); + + var credTemplate = new CredTemplate + { + Unid = 1, + Name = "Card (Auto)", + Priority = 0, + CardPinTemplate = new CardPinTemplate + { + CredComponentPresence = CredComponentPresence.Required, + CredNumPresence = CredComponentPresence.Required, + PinPresence = CredComponentPresence.Absent, + AnyDataLayout = true + } + }; + SpCoreProtoUtil.InitRequired(credTemplate); + _credTemplateRepository.Upsert(credTemplate).GetAwaiter().GetResult(); + } + + /// + /// Creates a Z9 Cred proto and upserts it to the z9_cred table. + /// Used in standalone mode during auto-enrollment to create the full Z9 data chain. + /// + /// The Aporta credential ID (used as the Cred unid). + /// The decoded credential number. + /// The Aporta door ID (stored as devAsDoorAccessPrivUnid for future use). + public void CreateStandaloneCred(int credentialId, BigInteger credNum, int doorId) + { + _logger.LogInformation("Creating standalone Z9 Cred: unid={CredentialId}, credNum={CredNum}, doorId={DoorId}", + credentialId, credNum, doorId); + + var cred = new Cred + { + Unid = credentialId, + Enabled = true, + CredTemplateUnid = 1, + CardPin = new CardPin + { + CredNum = SpCoreProtoUtil.ToBigIntegerData(credNum) + } + }; + cred.PrivBindings.Add(new CredPrivBinding + { + Unid = 1, + DevAsDoorAccessPrivUnid = doorId + }); + SpCoreProtoUtil.InitRequired(cred); + _z9CredRepository.Upsert(cred).GetAwaiter().GetResult(); + } + /// /// Decodes a raw bit string from a card read into a credential number by trying all known formats. /// @@ -1052,6 +1169,28 @@ private void SendDevActionResp(long requestId, string exception = null) WriteMessage(message); } + /// + /// Registers an OsdpReaderConfig directly (for standalone/primary mode where configs + /// come from a config file instead of Z9 Dev messages). + /// + public void RegisterOsdpReaderConfig(OsdpReaderConfig config) + { + lock (_osdpReaderConfigs) + { + _osdpReaderConfigs.RemoveAll(c => c.Unid == config.Unid); + _osdpReaderConfigs.Add(config); + } + + var endpointIdPrefix = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}"; + lock (_endpointToConfig) + { + _endpointToConfig[endpointIdPrefix] = config; + } + + _logger.LogInformation("Registered OSDP reader config: {Name} at {Host}:{TcpPort}:{OsdpAddress}", + config.Name, config.Host, config.TcpPort, config.OsdpAddress); + } + /// /// Gets the OsdpReaderConfig for an endpoint ID, if available. /// diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index fd1c21b..0086779 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -75,11 +75,13 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) await _dataAccess.UpdateSchema(); - // Check if we're in Z9 Open Community mode BEFORE starting extensions - // This prevents OSDP from auto-connecting using stale saved configuration + // Check if we're in Z9 Open Community mode or primary config mode + // BEFORE starting extensions — prevents OSDP from auto-connecting using stale saved configuration var z9OpenCommunityHost = _configuration["z9OpenCommunityHost"]; var isZ9OpenCommunityMode = !string.IsNullOrWhiteSpace(z9OpenCommunityHost); - if (isZ9OpenCommunityMode) + var primaryConfigPath = _configuration["primaryConfig"]; + var isPrimaryConfigMode = !string.IsNullOrWhiteSpace(primaryConfigPath); + if (isZ9OpenCommunityMode || isPrimaryConfigMode) { await DisableOsdpExtensionForZ9OpenCommunityMode(); } @@ -139,6 +141,35 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) _logger.LogInformation( "Z9/Open Community protocol service not started" + " (use --z9OpenCommunityHost to specify upstream host)"); + + // Wire card data decoder — creates raw DataFormat on first encounter + _accessService.SetCardDataDecoder(rawBits => + { + var result = _z9OpenCommunityProtocolService.DecodeCardRead(rawBits); + if (result == null) + { + _z9OpenCommunityProtocolService.EnsureRawDataFormat(rawBits.Length); + result = _z9OpenCommunityProtocolService.DecodeCardRead(rawBits); + } + return result?.credNum.ToString(); + }); + + // Wire enrollment handler — creates Z9 data chain on first enrollment + _accessService.SetEnrollmentHandler((rawBits, credentialId, doorId) => + { + _z9OpenCommunityProtocolService.EnsureRawDataFormat(rawBits.Length); + _z9OpenCommunityProtocolService.EnsureDefaultCredTemplate(); + var decoded = _z9OpenCommunityProtocolService.DecodeCardRead(rawBits); + var credNum = decoded!.Value.credNum; + _z9OpenCommunityProtocolService.CreateStandaloneCred(credentialId, credNum, doorId); + return Task.FromResult(credNum.ToString()); + }); + + // Primary config mode: configure OSDP from a JSON file + if (isPrimaryConfigMode) + { + await ConfigurePrimaryMode(primaryConfigPath); + } } } catch (Exception exception) @@ -227,6 +258,112 @@ await connection.ExecuteAsync( new { id = OsdpDriverId.ToString(), data = newData }); } + /// + /// Configuration model for --primaryConfig JSON file. + /// + public class PrimaryConfig + { + [System.Text.Json.Serialization.JsonPropertyName("readers")] + public List Readers { get; set; } = new(); + } + + public class PrimaryReaderConfig + { + [System.Text.Json.Serialization.JsonPropertyName("name")] + public string Name { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("host")] + public string Host { get; set; } = "localhost"; + + [System.Text.Json.Serialization.JsonPropertyName("tcpPort")] + public int TcpPort { get; set; } = 9843; + + [System.Text.Json.Serialization.JsonPropertyName("osdpAddress")] + public int OsdpAddress { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("baudRate")] + public int BaudRate { get; set; } = 9600; + + [System.Text.Json.Serialization.JsonPropertyName("strikeOutputNumber")] + public int? StrikeOutputNumber { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("doorContactInputNumber")] + public int? DoorContactInputNumber { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("rexInputNumber")] + public int? RexInputNumber { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("activateStrikeOnRex")] + public bool ActivateStrikeOnRex { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("strikeTimeMs")] + public int? StrikeTimeMs { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("extendedStrikeTimeMs")] + public int? ExtendedStrikeTimeMs { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("heldTimeMs")] + public int? HeldTimeMs { get; set; } + + [System.Text.Json.Serialization.JsonPropertyName("extendedHeldTimeMs")] + public int? ExtendedHeldTimeMs { get; set; } + } + + private async Task ConfigurePrimaryMode(string configPath) + { + _logger.LogInformation("Loading primary config from {Path}", configPath); + + var json = await System.IO.File.ReadAllTextAsync(configPath); + var primaryConfig = System.Text.Json.JsonSerializer.Deserialize(json); + + if (primaryConfig?.Readers == null || primaryConfig.Readers.Count == 0) + { + _logger.LogWarning("Primary config has no readers defined"); + return; + } + + // Wire strike time lookup + _accessService.SetStrikeTimeLookup(endpointId => + { + var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(endpointId); + return (config?.StrikeTimeMs, config?.ExtendedStrikeTimeMs); + }); + + // Subscribe to online status changes for auto Door creation + _extensionService.OnlineStatusChanged += OnOnlineStatusChanged; + + // Subscribe to state changes for door contact/REX/strike tracking + _extensionService.StateChanged += OnStateChanged; + + // Convert and register each reader config, then configure the OSDP driver + for (int i = 0; i < primaryConfig.Readers.Count; i++) + { + var reader = primaryConfig.Readers[i]; + var osdpConfig = new Z9OpenCommunityProtocolService.OsdpReaderConfig + { + Unid = i + 1, + Name = reader.Name ?? $"Reader {i + 1}", + Host = reader.Host, + TcpPort = reader.TcpPort, + OsdpAddress = reader.OsdpAddress, + BaudRate = reader.BaudRate, + StrikeOutputNumber = reader.StrikeOutputNumber, + DoorContactInputNumber = reader.DoorContactInputNumber, + RexInputNumber = reader.RexInputNumber, + ActivateStrikeOnRex = reader.ActivateStrikeOnRex, + StrikeTimeMs = reader.StrikeTimeMs, + ExtendedStrikeTimeMs = reader.ExtendedStrikeTimeMs, + HeldTimeMs = reader.HeldTimeMs, + ExtendedHeldTimeMs = reader.ExtendedHeldTimeMs + }; + + _z9OpenCommunityProtocolService.RegisterOsdpReaderConfig(osdpConfig); + await ConfigureOsdpDriver(osdpConfig); + } + + _logger.LogInformation("Primary config loaded: {Count} reader(s) configured", primaryConfig.Readers.Count); + } + private void OnOsdpConfigurationReceived(object sender, Z9OpenCommunityProtocolService.OsdpReaderConfig config) { Task.Run(async () => From 60356dbb8e243a0cf8da2151b257bdd437e83f9e Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 7 Feb 2026 21:14:27 -0500 Subject: [PATCH 39/86] Use manual enrollment flow instead of auto-enrollment in standalone mode First card swipe creates credential + Z9 data chain but leaves it unassigned. Admin must create a person and enroll the credential via API before access is granted, matching the original Aporta workflow. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Services/AccessService.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 8615b85..e66d340 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -38,7 +38,6 @@ public class AccessService private readonly DoorRepository _doorRepository; private readonly EndpointRepository _endpointRepository; private readonly CredentialRepository _credentialRepository; - private readonly PersonRepository _personRepository; private readonly EventRepository _eventRepository; private readonly Z9CredRepository _z9CredRepository; private readonly CredTemplateRepository _credTemplateRepository; @@ -66,7 +65,6 @@ public AccessService(IDataAccess dataAccess, ExtensionService extensionService, { _doorRepository = new DoorRepository(dataAccess); _credentialRepository = new CredentialRepository(dataAccess); - _personRepository = new PersonRepository(dataAccess); _endpointRepository = new EndpointRepository(dataAccess); _eventRepository = new EventRepository(dataAccess); _z9CredRepository = new Z9CredRepository(dataAccess); @@ -269,7 +267,8 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA { if (_enrollCredential != null) { - // Auto-enroll with full Z9 data chain + // Create credential and Z9 data chain (DataFormat, CredTemplate, Z9 Cred) + // but leave unassigned — admin must enroll via API var credentialId = await _credentialRepository.Insert(new Credential { Number = matchingCardData, LastEvent = eventId }); var credNum = await _enrollCredential(matchingCardData, credentialId, matchingDoor.Id); @@ -281,10 +280,6 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA credential.LastEvent = eventId; await _credentialRepository.Update(credential); } - // Auto-create person and assignment so card works on next swipe - var person = new Person { FirstName = credNum, Enabled = true }; - await _personRepository.Upsert(person, credentialId); - await _credentialRepository.AssignPerson(credentialId, credentialId, true); } else { From 9b6367e18ff5ce55bd34f0e691d77ed2e68fe0aa Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 07:10:29 -0500 Subject: [PATCH 40/86] Merge person identity into Z9 Cred, eliminate credential_assignment Person identity (name, enabled) now lives on the z9_cred table instead of separate person and credential_assignment tables. CredentialRepository queries use LEFT JOIN z9_cred instead of credential_assignment subqueries. PeopleService creates a Credential + Z9 Cred pair. Enrollment transfers card data from swipe credential to person credential and merges Z9 Creds. Co-Authored-By: Claude Opus 4.6 --- .../Repositories/CredentialRepository.cs | 156 ++++---- src/Aporta.Core/Services/CredentialService.cs | 50 ++- src/Aporta.Core/Services/PeopleService.cs | 83 +++- .../Z9OpenCommunityProtocolService.cs | 38 +- src/Aporta.Shared/Models/Credential.cs | 4 +- .../Pages/configuration/People.razor | 4 +- .../Repositories/CredentialRepositoryTests.cs | 356 +++++++++--------- .../Z9OpenCommunityProtocolServiceTests.cs | 30 +- 8 files changed, 375 insertions(+), 346 deletions(-) diff --git a/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs b/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs index c1b5892..1a589cc 100644 --- a/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using System.Text.Json; @@ -35,21 +36,19 @@ protected override int GetId(Credential entity) using var connection = DataAccess.CreateDbConnection(); connection.Open(); - var result = await connection.QuerySingleOrDefaultAsync<(int Id, string Data, int? AssignedPersonId, int? Enabled)>( + var result = await connection.QuerySingleOrDefaultAsync<(int Id, string Data, string CredEnabled)>( @"SELECT c.id, c.data, - (SELECT json_extract(ca.data, '$.personId') FROM credential_assignment ca - WHERE json_extract(ca.data, '$.credentialId') = c.id) as AssignedPersonId, - (SELECT json_extract(ca.data, '$.enabled') FROM credential_assignment ca - WHERE json_extract(ca.data, '$.credentialId') = c.id) as Enabled - FROM credential c WHERE c.id = @id", + json_extract(z.data, '$.enabled') as CredEnabled + FROM credential c + LEFT JOIN z9_cred z ON z.id = c.id + WHERE c.id = @id", new { id }); if (result.Data == null) return null; var credential = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); credential.Id = result.Id; - credential.AssignedPersonId = result.AssignedPersonId; - credential.Enabled = result.Enabled.HasValue ? result.Enabled > 0 : (bool?)null; + credential.Enabled = ParseBool(result.CredEnabled); return credential; } @@ -58,20 +57,17 @@ WHERE json_extract(ca.data, '$.credentialId') = c.id) as Enabled using var connection = DataAccess.CreateDbConnection(); connection.Open(); - var results = await connection.QueryAsync<(int Id, string Data, int? AssignedPersonId, int? Enabled)>( + var results = await connection.QueryAsync<(int Id, string Data, string CredEnabled)>( @"SELECT c.id, c.data, - (SELECT json_extract(ca.data, '$.personId') FROM credential_assignment ca - WHERE json_extract(ca.data, '$.credentialId') = c.id) as AssignedPersonId, - (SELECT json_extract(ca.data, '$.enabled') FROM credential_assignment ca - WHERE json_extract(ca.data, '$.credentialId') = c.id) as Enabled - FROM credential c"); + json_extract(z.data, '$.enabled') as CredEnabled + FROM credential c + LEFT JOIN z9_cred z ON z.id = c.id"); return results.Select(r => { var credential = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); credential.Id = r.Id; - credential.AssignedPersonId = r.AssignedPersonId; - credential.Enabled = r.Enabled.HasValue ? r.Enabled > 0 : (bool?)null; + credential.Enabled = ParseBool(r.CredEnabled); return credential; }); } @@ -81,9 +77,13 @@ public async Task AssignedCredential(string cardNumber) using var connection = DataAccess.CreateDbConnection(); connection.Open(); - var result = await connection.QuerySingleOrDefaultAsync<(int Id, string Data)>( - @"SELECT id, data FROM credential - WHERE json_extract(data, '$.number') = @number", + var result = await connection.QuerySingleOrDefaultAsync<(int Id, string Data, string CredName, string CredEnabled)>( + @"SELECT c.id, c.data, + json_extract(z.data, '$.name') as CredName, + json_extract(z.data, '$.enabled') as CredEnabled + FROM credential c + LEFT JOIN z9_cred z ON z.id = c.id + WHERE json_extract(c.data, '$.number') = @number", new { number = cardNumber }); if (result.Data == null) @@ -94,18 +94,11 @@ WHERE json_extract(data, '$.number') = @number", var credential = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); credential.Id = result.Id; - var personAssignment = await connection.QuerySingleOrDefaultAsync<(int PersonId, int Enabled)>( - @"SELECT json_extract(data, '$.personId') as PersonId, - json_extract(data, '$.enabled') as Enabled - FROM credential_assignment - WHERE json_extract(data, '$.credentialId') = @credentialId", - new { credentialId = credential.Id }); - - if (personAssignment.PersonId > 0) + if (!string.IsNullOrWhiteSpace(result.CredName)) { - var personRepository = new PersonRepository(DataAccess); - credential.Person = await personRepository.Get(personAssignment.PersonId); - credential.Enabled = personAssignment.Enabled > 0 && credential.Person.Enabled; + var enabled = ParseBool(result.CredEnabled) ?? true; + credential.Person = ParsePersonFromName(result.CredName, credential.Id, enabled); + credential.Enabled = enabled; } else { @@ -115,46 +108,25 @@ WHERE json_extract(data, '$.credentialId') = @credentialId", return credential; } - public async Task> CredentialsAssignedToPerson(int personId) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - var results = await connection.QueryAsync<(int Id, string Data, int? Enabled)>( - @"SELECT c.id, c.data, json_extract(ca.data, '$.enabled') as Enabled - FROM credential c - INNER JOIN credential_assignment ca ON json_extract(ca.data, '$.credentialId') = c.id - WHERE json_extract(ca.data, '$.personId') = @personId", - new { personId }); - - return results.Select(r => - { - var credential = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); - credential.Id = r.Id; - credential.AssignedPersonId = personId; - credential.Enabled = r.Enabled.HasValue ? r.Enabled > 0 : (bool?)null; - return credential; - }); - } - public async Task> Assigned() { using var connection = DataAccess.CreateDbConnection(); connection.Open(); - var results = await connection.QueryAsync<(int Id, string Data, int PersonId, int Enabled)>( + var results = await connection.QueryAsync<(int Id, string Data, string CredEnabled)>( @"SELECT c.id, c.data, - json_extract(ca.data, '$.personId') as PersonId, - json_extract(ca.data, '$.enabled') as Enabled + json_extract(z.data, '$.enabled') as CredEnabled FROM credential c - INNER JOIN credential_assignment ca ON json_extract(ca.data, '$.credentialId') = c.id"); + INNER JOIN z9_cred z ON z.id = c.id + WHERE json_extract(z.data, '$.name') IS NOT NULL + AND json_extract(c.data, '$.number') IS NOT NULL + AND json_extract(c.data, '$.number') != ''"); return results.Select(r => { var credential = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); credential.Id = r.Id; - credential.AssignedPersonId = r.PersonId; - credential.Enabled = r.Enabled > 0; + credential.Enabled = ParseBool(r.CredEnabled); return credential; }); } @@ -166,9 +138,8 @@ public async Task> Unassigned() var results = await connection.QueryAsync<(int Id, string Data)>( @"SELECT c.id, c.data FROM credential c - WHERE c.id NOT IN ( - SELECT json_extract(ca.data, '$.credentialId') - FROM credential_assignment ca)"); + LEFT JOIN z9_cred z ON z.id = c.id + WHERE json_extract(z.data, '$.name') IS NULL"); return results.Select(r => { @@ -178,33 +149,24 @@ SELECT json_extract(ca.data, '$.credentialId') }); } - public async Task AssignPerson(int credentialId, int personId, bool enabled = true) + public async Task> Named() { using var connection = DataAccess.CreateDbConnection(); connection.Open(); - var json = JsonSerializer.Serialize(new - { - credentialId, - personId, - enabled = enabled ? 1 : 0 - }, GetJsonOptions()); - - await connection.ExecuteAsync( - "INSERT INTO credential_assignment (data) VALUES (@data)", - new { data = json }); - } - - public async Task RevokePerson(int credentialId, int personId) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); + var results = await connection.QueryAsync<(int Id, string CredName, string CredEnabled)>( + @"SELECT c.id, + json_extract(z.data, '$.name') as CredName, + json_extract(z.data, '$.enabled') as CredEnabled + FROM credential c + INNER JOIN z9_cred z ON z.id = c.id + WHERE json_extract(z.data, '$.name') IS NOT NULL"); - await connection.ExecuteAsync( - @"DELETE FROM credential_assignment - WHERE json_extract(data, '$.credentialId') = @credentialId - AND json_extract(data, '$.personId') = @personId", - new { credentialId, personId }); + return results.Select(r => + { + var enabled = ParseBool(r.CredEnabled) ?? true; + return ParsePersonFromName(r.CredName, r.Id, enabled); + }); } public async Task UpdateLastEvent(int credentialId, int lastEventId) @@ -228,4 +190,32 @@ await connection.ExecuteAsync( new { data = newJson, credentialId }); } } + + public static Person ParsePersonFromName(string credName, int id, bool enabled) + { + var person = new Person { Id = id, Enabled = enabled }; + if (credName == null) + return person; + + var commaIndex = credName.IndexOf(", ", StringComparison.Ordinal); + if (commaIndex >= 0) + { + person.LastName = credName.Substring(0, commaIndex); + person.FirstName = credName.Substring(commaIndex + 2); + } + else + { + person.FirstName = credName; + } + return person; + } + + private static bool? ParseBool(string value) + { + if (value == null) return null; + // SQLite json_extract returns "true"/"false" or "1"/"0" + if (bool.TryParse(value, out var b)) return b; + if (int.TryParse(value, out var i)) return i > 0; + return null; + } } diff --git a/src/Aporta.Core/Services/CredentialService.cs b/src/Aporta.Core/Services/CredentialService.cs index 87cbb28..b8134a6 100644 --- a/src/Aporta.Core/Services/CredentialService.cs +++ b/src/Aporta.Core/Services/CredentialService.cs @@ -12,35 +12,37 @@ namespace Aporta.Core.Services; public class CredentialService { private readonly CredentialRepository _credentialRepository; + private readonly Z9CredRepository _z9CredRepository; private readonly IHubContext _hubContext; public CredentialService(IDataAccess dataAccess, IHubContext hubContext) { _hubContext = hubContext; _credentialRepository = new CredentialRepository(dataAccess); + _z9CredRepository = new Z9CredRepository(dataAccess); } - + public async Task> GetAll() { return await _credentialRepository.GetAll(); } - + public async Task Get(int credentialId) { return await _credentialRepository.Get(credentialId); } - + public async Task Insert(Credential credential) { await _credentialRepository.Insert(credential); - + await _hubContext.Clients.All.SendAsync(Methods.CredentialInserted, credential.Id); } - + public async Task Delete(int id) { await _credentialRepository.Delete(id); - + await _hubContext.Clients.All.SendAsync(Methods.CredentialDeleted, id); } @@ -51,8 +53,38 @@ public async Task> GetUnassigned() public async Task Enroll(int credentialId, int personId) { - await _credentialRepository.AssignPerson(credentialId, personId); - + // Get the swipe credential (has Number) + var swipeCredential = await _credentialRepository.Get(credentialId); + if (swipeCredential == null) return; + + // Get the person credential (may not have a Number yet) + var personCredential = await _credentialRepository.Get(personId); + if (personCredential == null) return; + + // Get Z9 Creds for both before deleting + var swipeZ9Cred = await _z9CredRepository.Get(credentialId); + var personZ9Cred = await _z9CredRepository.Get(personId); + + // Delete the swipe credential first (unique index on Number prevents duplicate) + await _z9CredRepository.Delete(credentialId); + await _credentialRepository.Delete(credentialId); + + // Transfer Number from swipe credential to person credential + personCredential.Number = swipeCredential.Number; + personCredential.LastEvent = swipeCredential.LastEvent; + await _credentialRepository.Update(personCredential); + + // Merge card data from swipe Z9 Cred into person Z9 Cred + if (personZ9Cred != null && swipeZ9Cred != null) + { + if (swipeZ9Cred.CardPin != null) + { + personZ9Cred.CardPin = swipeZ9Cred.CardPin; + } + personZ9Cred.PrivBindings.Add(swipeZ9Cred.PrivBindings); + await _z9CredRepository.Upsert(personZ9Cred); + } + await _hubContext.Clients.All.SendAsync(Methods.PersonUpdated, personId); } @@ -60,4 +92,4 @@ public async Task> GetAssigned() { return await _credentialRepository.Assigned(); } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/Services/PeopleService.cs b/src/Aporta.Core/Services/PeopleService.cs index bbcbc36..bdd6732 100644 --- a/src/Aporta.Core/Services/PeopleService.cs +++ b/src/Aporta.Core/Services/PeopleService.cs @@ -6,49 +6,94 @@ using Aporta.Shared.Messaging; using Aporta.Shared.Models; using Microsoft.AspNetCore.SignalR; +using Z9.Protobuf; +using Z9.Spcore.Proto; namespace Aporta.Core.Services; public class PeopleService { - private readonly PersonRepository _personRepository; private readonly CredentialRepository _credentialRepository; + private readonly Z9CredRepository _z9CredRepository; + private readonly CredTemplateRepository _credTemplateRepository; private readonly IHubContext _hubContext; public PeopleService(IDataAccess dataAccess, IHubContext hubContext) { _hubContext = hubContext; - _personRepository = new PersonRepository(dataAccess); _credentialRepository = new CredentialRepository(dataAccess); + _z9CredRepository = new Z9CredRepository(dataAccess); + _credTemplateRepository = new CredTemplateRepository(dataAccess); } - + public async Task> GetAll() { - return await _personRepository.GetAll(); + return await _credentialRepository.Named(); } - + public async Task Get(int personId) { - return await _personRepository.Get(personId); + var z9Cred = await _z9CredRepository.Get(personId); + if (z9Cred == null) return null; + + var enabled = z9Cred.EnabledCase == Cred.EnabledOneofCase.Enabled ? z9Cred.Enabled : true; + return CredentialRepository.ParsePersonFromName(z9Cred.Name, personId, enabled); } - + public async Task Insert(Person person) { - await _personRepository.Insert(person); - + // Create an empty credential (no card number yet) + var credentialId = await _credentialRepository.Insert(new Credential()); + + // Ensure default cred template exists + await EnsureDefaultCredTemplate(); + + // Create Z9 Cred with name="Last, First" and enabled=true + var name = !string.IsNullOrWhiteSpace(person.LastName) + ? $"{person.LastName}, {person.FirstName}" + : person.FirstName; + + var cred = new Cred + { + Unid = credentialId, + Name = name, + Enabled = person.Enabled, + CredTemplateUnid = 1 + }; + SpCoreProtoUtil.InitRequired(cred); + await _z9CredRepository.Upsert(cred); + + person.Id = credentialId; await _hubContext.Clients.All.SendAsync(Methods.PersonInserted, person.Id); } - + public async Task Delete(int personId) { - var credentialsAssignedToPerson = await _credentialRepository.CredentialsAssignedToPerson(personId); - foreach (var credential in credentialsAssignedToPerson) - { - await _credentialRepository.RevokePerson(credential.Id, personId); - } - - await _personRepository.Delete(personId); - + await _z9CredRepository.Delete(personId); + await _credentialRepository.Delete(personId); + await _hubContext.Clients.All.SendAsync(Methods.PersonDeleted, personId); } -} \ No newline at end of file + + private async Task EnsureDefaultCredTemplate() + { + var existing = await _credTemplateRepository.Get(1); + if (existing != null) return; + + var credTemplate = new CredTemplate + { + Unid = 1, + Name = "Card (Auto)", + Priority = 0, + CardPinTemplate = new CardPinTemplate + { + CredComponentPresence = CredComponentPresence.Required, + CredNumPresence = CredComponentPresence.Required, + PinPresence = CredComponentPresence.Absent, + AnyDataLayout = true + } + }; + SpCoreProtoUtil.InitRequired(credTemplate); + await _credTemplateRepository.Upsert(credTemplate); + } +} diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 697dbd9..7b68519 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -18,12 +18,10 @@ namespace Aporta.Core.Services; public class Z9OpenCommunityProtocolService : IDisposable { - private const bool AutoCreatePersonForCredential = true; private const int DefaultOsdpTcpPort = 9843; private readonly ILogger _logger; private readonly CredentialRepository _credentialRepository; - private readonly PersonRepository _personRepository; // Z9 Open protobuf repositories private readonly DataFormatRepository _dataFormatRepository; @@ -109,7 +107,6 @@ public Z9OpenCommunityProtocolService( { _logger = logger; _credentialRepository = new CredentialRepository(dataAccess); - _personRepository = new PersonRepository(dataAccess); _dataFormatRepository = new DataFormatRepository(dataAccess); _dataLayoutRepository = new DataLayoutRepository(dataAccess); _credTemplateRepository = new CredTemplateRepository(dataAccess); @@ -266,12 +263,8 @@ private void HandleDbChange(DbChange dbChange) foreach (var credDelete in dbChange.CredDelete) { _logger.LogInformation("Deleting credential {Unid}", credDelete); - _credentialRepository.RevokePerson(credDelete, credDelete).GetAwaiter().GetResult(); + _z9CredRepository.Delete(credDelete).GetAwaiter().GetResult(); _credentialRepository.Delete(credDelete).GetAwaiter().GetResult(); - if (AutoCreatePersonForCredential) - { - _personRepository.Delete(credDelete).GetAwaiter().GetResult(); - } } // Priv deletes @@ -864,12 +857,8 @@ private void ProcessCredential(Cred cred) { _logger.LogWarning( "Credential Unid={Unid} has no card number, deleting from Aporta if it exists", cred.Unid); - _credentialRepository.RevokePerson(cred.Unid, cred.Unid).GetAwaiter().GetResult(); + _z9CredRepository.Delete(cred.Unid).GetAwaiter().GetResult(); _credentialRepository.Delete(cred.Unid).GetAwaiter().GetResult(); - if (AutoCreatePersonForCredential) - { - _personRepository.Delete(cred.Unid).GetAwaiter().GetResult(); - } return; } @@ -878,37 +867,18 @@ private void ProcessCredential(Cred cred) // Store credential number as decimal string — card reads will be decoded to match var credNumString = credNum.ToString(); - var personName = !string.IsNullOrWhiteSpace(cred.Name) ? cred.Name : credNumString; - _logger.LogInformation("Processing credential Unid={Unid} Number={Number} Name={Name} PrivBindings={BindingCount}", - cred.Unid, credNumString, personName, cred.PrivBindings.Count); + cred.Unid, credNumString, cred.Name, cred.PrivBindings.Count); - // Store the full Z9 Cred proto (for privilege checking) + // Store the full Z9 Cred proto (for privilege checking and name/enabled) _z9CredRepository.Upsert(cred).GetAwaiter().GetResult(); - if (AutoCreatePersonForCredential) - { - var person = new Person - { - FirstName = personName, - Enabled = cred.Enabled - }; - _personRepository.Upsert(person, cred.Unid).GetAwaiter().GetResult(); - } - var credential = new Credential { Number = credNumString, Enabled = cred.Enabled }; _credentialRepository.Upsert(credential, cred.Unid).GetAwaiter().GetResult(); - - if (AutoCreatePersonForCredential) - { - _credentialRepository.RevokePerson(cred.Unid, cred.Unid).GetAwaiter().GetResult(); - _credentialRepository.AssignPerson(cred.Unid, cred.Unid, cred.Enabled) - .GetAwaiter().GetResult(); - } } /// diff --git a/src/Aporta.Shared/Models/Credential.cs b/src/Aporta.Shared/Models/Credential.cs index 990d435..3b555b7 100644 --- a/src/Aporta.Shared/Models/Credential.cs +++ b/src/Aporta.Shared/Models/Credential.cs @@ -7,8 +7,6 @@ public class Credential public string Number { get; set; } public int LastEvent { get; set; } - - public int? AssignedPersonId { get; set; } - + public bool? Enabled { get; set; } } \ No newline at end of file diff --git a/src/Aporta.WebClient/Pages/configuration/People.razor b/src/Aporta.WebClient/Pages/configuration/People.razor index 53b37fe..b4577fc 100644 --- a/src/Aporta.WebClient/Pages/configuration/People.razor +++ b/src/Aporta.WebClient/Pages/configuration/People.razor @@ -449,11 +449,11 @@ else private bool PersonIsEnrolled(int personId) { - return _assigned.Any(credential => credential.AssignedPersonId == personId); + return _assigned.Any(credential => credential.Id == personId); } private string PersonsBadgeIdentifier(int personId) { - return _assigned.FirstOrDefault(credential => credential.AssignedPersonId == personId)?.Number ?? string.Empty; + return _assigned.FirstOrDefault(credential => credential.Id == personId)?.Number ?? string.Empty; } } \ No newline at end of file diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs index f076090..36cfd70 100644 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs @@ -8,6 +8,8 @@ using Aporta.Shared.Models; using Microsoft.Data.Sqlite; using NUnit.Framework; +using Z9.Protobuf; +using Z9.Spcore.Proto; namespace Aporta.Core.Tests.DataAccess.Repositories; @@ -44,74 +46,55 @@ public void TearDown() _persistConnection?.Close(); _persistConnection?.Dispose(); } - + [Test] - public async Task Get_AssignedCredential() + public async Task Get_CredentialWithZ9Cred() { // Arrange - var credentials = new[] - { - new Credential {Number = "2345342"}, - new Credential {Number = "5345234"} - }; - var credentialRepository = new CredentialRepository(_dataAccess); - foreach (var credential in credentials) - { - await credentialRepository.Insert(credential); - } - - var people = new[] - { - new Person {FirstName = "First1", LastName = "Last1", Enabled = false}, - new Person {FirstName = "First2", LastName = "Last2", Enabled = true}, - }; + var z9CredRepository = new Z9CredRepository(_dataAccess); - var personRepository = new PersonRepository(_dataAccess); - foreach (var person in people) - { - await personRepository.Insert(person); - } + var credential = new Credential { Number = "5345234" }; + await credentialRepository.Insert(credential); - await credentialRepository.AssignPerson(credentials[1].Id, people[1].Id); + var cred = new Cred + { + Unid = credential.Id, + Name = "Smith, John", + Enabled = true, + CredTemplateUnid = 1 + }; + SpCoreProtoUtil.InitRequired(cred); + await z9CredRepository.Upsert(cred); - // Act - var actual = await credentialRepository.Get(credentials[1].Id); + // Act + var actual = await credentialRepository.Get(credential.Id); // Assert Assert.That(actual.Number, Is.EqualTo("5345234")); - Assert.That(actual.AssignedPersonId, Is.EqualTo(people[1].Id)); Assert.That(actual.Enabled, Is.True); } - + [Test] - public async Task Get_UnassignedCredential() + public async Task Get_CredentialWithoutZ9Cred() { // Arrange - var credentials = new[] - { - new Credential {Number = "2345342"}, - new Credential {Number = "5345234"} - }; - var credentialRepository = new CredentialRepository(_dataAccess); - foreach (var credential in credentials) - { - await credentialRepository.Insert(credential); - } - // Act - var actual = await credentialRepository.Get(credentials[1].Id); + var credential = new Credential { Number = "5345234" }; + await credentialRepository.Insert(credential); + + // Act + var actual = await credentialRepository.Get(credential.Id); // Assert Assert.That(actual.Number, Is.EqualTo("5345234")); - Assert.That(actual.AssignedPersonId, Is.Null); Assert.That(actual.Enabled, Is.Null); } [Test] public async Task Insert() - { + { // Arrange var credentials = new[] { @@ -125,7 +108,7 @@ public async Task Insert() await credentialRepository.Insert(credential); } - // Act + // Act var actualCredential = await credentialRepository.Get(2); // Assert @@ -134,7 +117,7 @@ public async Task Insert() Assert.That(actualCredential.LastEvent, Is.EqualTo(5)); Assert.That(actualCredential.Number, Is.EqualTo("5345234")); } - + [Test] public async Task Insert_DuplicateCardNumber() { @@ -144,7 +127,7 @@ public async Task Insert_DuplicateCardNumber() var credentialRepository = new CredentialRepository(_dataAccess); await credentialRepository.Insert(credential); - + // Assert async Task InsertCredential() { @@ -164,199 +147,193 @@ public async Task Delete() new Credential {Number = "2345342"}, new Credential {Number = "5345234"}, }; - + var credentialRepository = new CredentialRepository(_dataAccess); foreach (var credential in credentials) { await credentialRepository.Insert(credential); } - // Act + // Act await credentialRepository.Delete(2); // Assert var actualCredentials = await credentialRepository.GetAll(); Assert.That(actualCredentials.Count(), Is.EqualTo(1)); } - + [Test] - public async Task AssignedCredential_NoAssignedPerson() + public async Task AssignedCredential_NoZ9CredName() { - // Arrange - var credentials = new[] - { - new Credential {Number = "2345342"}, - new Credential {Number = "5345234"} - }; - + // Arrange - credential exists but no z9_cred with a name var credentialRepository = new CredentialRepository(_dataAccess); - foreach (var credential in credentials) - { - await credentialRepository.Insert(credential); - } - // Act + var credential = new Credential { Number = "5345234" }; + await credentialRepository.Insert(credential); + + // Act var actual = await credentialRepository.AssignedCredential("5345234"); - // Assert - Null person + // Assert - Person should be null (not enrolled) Assert.That(actual.Person, Is.Null); } - + [Test] - public async Task AssignedCredential_ActivePerson() + public async Task AssignedCredential_WithZ9CredName_Enabled() { // Arrange - var credentials = new[] - { - new Credential {Number = "2345342"}, - new Credential {Number = "5345234"} - }; - var credentialRepository = new CredentialRepository(_dataAccess); - foreach (var credential in credentials) - { - await credentialRepository.Insert(credential); - } - - var people = new[] - { - new Person {FirstName = "First1", LastName = "Last1", Enabled = false}, - new Person {FirstName = "First2", LastName = "Last2", Enabled = true}, - }; + var z9CredRepository = new Z9CredRepository(_dataAccess); - var personRepository = new PersonRepository(_dataAccess); - foreach (var person in people) - { - await personRepository.Insert(person); - } + var credential = new Credential { Number = "5345234" }; + await credentialRepository.Insert(credential); - await credentialRepository.AssignPerson(credentials[1].Id, people[1].Id); + var cred = new Cred + { + Unid = credential.Id, + Name = "Smith, John", + Enabled = true, + CredTemplateUnid = 1 + }; + SpCoreProtoUtil.InitRequired(cred); + await z9CredRepository.Upsert(cred); - // Act + // Act var actual = await credentialRepository.AssignedCredential("5345234"); // Assert Assert.That(actual.Number, Is.EqualTo("5345234")); Assert.That(actual.Enabled, Is.True); - Assert.That(actual.Person.Id, Is.EqualTo(people[1].Id)); + Assert.That(actual.Person, Is.Not.Null); + Assert.That(actual.Person.FirstName, Is.EqualTo("John")); + Assert.That(actual.Person.LastName, Is.EqualTo("Smith")); + Assert.That(actual.Person.Enabled, Is.True); } - + [Test] - public async Task AssignedCredential_InactivePerson() + public async Task AssignedCredential_WithZ9CredName_Disabled() { // Arrange - var credentials = new[] - { - new Credential {Number = "2345342"}, - new Credential {Number = "5345234"} - }; - var credentialRepository = new CredentialRepository(_dataAccess); - foreach (var credential in credentials) - { - await credentialRepository.Insert(credential); - } - - var people = new[] - { - new Person {FirstName = "First1", LastName = "Last1", Enabled = false}, - new Person {FirstName = "First2", LastName = "Last2", Enabled = true}, - }; + var z9CredRepository = new Z9CredRepository(_dataAccess); - var personRepository = new PersonRepository(_dataAccess); - foreach (var person in people) - { - await personRepository.Insert(person); - } + var credential = new Credential { Number = "5345234" }; + await credentialRepository.Insert(credential); - await credentialRepository.AssignPerson(credentials[1].Id, people[0].Id); + var cred = new Cred + { + Unid = credential.Id, + Name = "Jones, Jane", + Enabled = false, + CredTemplateUnid = 1 + }; + SpCoreProtoUtil.InitRequired(cred); + await z9CredRepository.Upsert(cred); - // Act + // Act var actual = await credentialRepository.AssignedCredential("5345234"); // Assert Assert.That(actual.Number, Is.EqualTo("5345234")); Assert.That(actual.Enabled, Is.False); - Assert.That(actual.Person.Id, Is.EqualTo(people[0].Id)); + Assert.That(actual.Person, Is.Not.Null); + Assert.That(actual.Person.FirstName, Is.EqualTo("Jane")); + Assert.That(actual.Person.LastName, Is.EqualTo("Jones")); + Assert.That(actual.Person.Enabled, Is.False); } - + [Test] - public async Task AssignedCredential_AssignmentNotEnabled() + public async Task Assigned_ReturnsOnlyNamedCredentialsWithNumber() { // Arrange - var credentials = new[] - { - new Credential {Number = "2345342"}, - new Credential {Number = "5345234"} - }; - var credentialRepository = new CredentialRepository(_dataAccess); - foreach (var credential in credentials) - { - await credentialRepository.Insert(credential); - } - - var people = new[] - { - new Person {FirstName = "First1", LastName = "Last1", Enabled = true}, - new Person {FirstName = "First2", LastName = "Last2", Enabled = true}, - }; + var z9CredRepository = new Z9CredRepository(_dataAccess); + + // Credential with name AND number (enrolled) + var enrolled = new Credential { Number = "1111" }; + await credentialRepository.Insert(enrolled); + var enrolledCred = new Cred { Unid = enrolled.Id, Name = "Smith, John", Enabled = true, CredTemplateUnid = 1 }; + SpCoreProtoUtil.InitRequired(enrolledCred); + await z9CredRepository.Upsert(enrolledCred); + + // Credential with name but no number (person not yet enrolled) + var personOnly = new Credential(); + await credentialRepository.Insert(personOnly); + var personCred = new Cred { Unid = personOnly.Id, Name = "Doe, Jane", Enabled = true, CredTemplateUnid = 1 }; + SpCoreProtoUtil.InitRequired(personCred); + await z9CredRepository.Upsert(personCred); + + // Credential with number but no name (raw swipe) + var swipe = new Credential { Number = "2222" }; + await credentialRepository.Insert(swipe); + + // Act + var assigned = (await credentialRepository.Assigned()).ToList(); + + // Assert - only the enrolled credential + Assert.That(assigned, Has.Exactly(1).Items); + Assert.That(assigned[0].Id, Is.EqualTo(enrolled.Id)); + Assert.That(assigned[0].Number, Is.EqualTo("1111")); + } - var personRepository = new PersonRepository(_dataAccess); - foreach (var person in people) - { - await personRepository.Insert(person); - } + [Test] + public async Task Unassigned_ReturnsCredentialsWithoutZ9CredName() + { + // Arrange + var credentialRepository = new CredentialRepository(_dataAccess); + var z9CredRepository = new Z9CredRepository(_dataAccess); - await credentialRepository.AssignPerson(credentials[1].Id, people[0].Id, false); + // Named credential (not unassigned) + var named = new Credential { Number = "1111" }; + await credentialRepository.Insert(named); + var namedCred = new Cred { Unid = named.Id, Name = "Smith, John", Enabled = true, CredTemplateUnid = 1 }; + SpCoreProtoUtil.InitRequired(namedCred); + await z9CredRepository.Upsert(namedCred); - // Act - var actual = await credentialRepository.AssignedCredential("5345234"); + // Raw swipe (no z9_cred name → unassigned) + var swipe = new Credential { Number = "2222" }; + await credentialRepository.Insert(swipe); + + // Act + var unassigned = (await credentialRepository.Unassigned()).ToList(); // Assert - Assert.That(actual.Number, Is.EqualTo("5345234")); - Assert.That(actual.Enabled, Is.False); - Assert.That(actual.Person.Id, Is.EqualTo(people[0].Id)); + Assert.That(unassigned, Has.Exactly(1).Items); + Assert.That(unassigned[0].Id, Is.EqualTo(swipe.Id)); } - + [Test] - public async Task RevokeCredential() + public async Task Named_ReturnsAllPersonDTOs() { // Arrange - var credentials = new[] - { - new Credential {Number = "2345342"}, - new Credential {Number = "5345234"} - }; - var credentialRepository = new CredentialRepository(_dataAccess); - foreach (var credential in credentials) - { - await credentialRepository.Insert(credential); - } - - var people = new[] - { - new Person {FirstName = "First1", LastName = "Last1", Enabled = false}, - new Person {FirstName = "First2", LastName = "Last2", Enabled = true}, - }; - - var personRepository = new PersonRepository(_dataAccess); - foreach (var person in people) - { - await personRepository.Insert(person); - } - - await credentialRepository.AssignPerson(credentials[1].Id, people[1].Id); - - // Act - await credentialRepository.RevokePerson(credentials[1].Id, people[1].Id); - - // Assert - var unassignedCredentials = await credentialRepository.Unassigned(); - Assert.That(unassignedCredentials, Has.Exactly(2).Items); + var z9CredRepository = new Z9CredRepository(_dataAccess); + + var cred1 = new Credential(); + await credentialRepository.Insert(cred1); + var z9Cred1 = new Cred { Unid = cred1.Id, Name = "Smith, John", Enabled = true, CredTemplateUnid = 1 }; + SpCoreProtoUtil.InitRequired(z9Cred1); + await z9CredRepository.Upsert(z9Cred1); + + var cred2 = new Credential(); + await credentialRepository.Insert(cred2); + var z9Cred2 = new Cred { Unid = cred2.Id, Name = "Doe, Jane", Enabled = false, CredTemplateUnid = 1 }; + SpCoreProtoUtil.InitRequired(z9Cred2); + await z9CredRepository.Upsert(z9Cred2); + + // Raw swipe (no name) + var swipe = new Credential { Number = "9999" }; + await credentialRepository.Insert(swipe); + + // Act + var people = (await credentialRepository.Named()).ToList(); + + // Assert - only 2 named people + Assert.That(people, Has.Exactly(2).Items); + Assert.That(people.Any(p => p.FirstName == "John" && p.LastName == "Smith" && p.Enabled), Is.True); + Assert.That(people.Any(p => p.FirstName == "Jane" && p.LastName == "Doe" && !p.Enabled), Is.True); } - + [Test] public async Task UpdateLastEvent() { @@ -365,11 +342,30 @@ public async Task UpdateLastEvent() var credentialRepository = new CredentialRepository(_dataAccess); int credentialId = await credentialRepository.Insert(credential); - // Act + // Act await credentialRepository.UpdateLastEvent(credentialId, 5); // Assert var actualCredential = await credentialRepository.Get(credentialId); Assert.That(actualCredential.LastEvent, Is.EqualTo(5)); } -} \ No newline at end of file + + [Test] + public void ParsePersonFromName_WithComma() + { + var person = CredentialRepository.ParsePersonFromName("Smith, John", 42, true); + Assert.That(person.Id, Is.EqualTo(42)); + Assert.That(person.FirstName, Is.EqualTo("John")); + Assert.That(person.LastName, Is.EqualTo("Smith")); + Assert.That(person.Enabled, Is.True); + } + + [Test] + public void ParsePersonFromName_WithoutComma() + { + var person = CredentialRepository.ParsePersonFromName("JohnOnly", 42, false); + Assert.That(person.FirstName, Is.EqualTo("JohnOnly")); + Assert.That(person.LastName, Is.Null); + Assert.That(person.Enabled, Is.False); + } +} diff --git a/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs index b4cdb5f..1bae6ac 100644 --- a/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs @@ -187,15 +187,14 @@ public void DbChange_HostSendsCredential_CredentialAndPersonCreatedInDb() var credential = credentialRepository.Get(100).GetAwaiter().GetResult(); Assert.That(credential, Is.Not.Null); Assert.That(credential.Number, Is.EqualTo("123456")); - Assert.That(credential.AssignedPersonId, Is.EqualTo(100)); Assert.That(credential.Enabled, Is.True); - // Verify person was auto-created - var personRepository = new PersonRepository(_dataAccess); - var person = personRepository.Get(100).GetAwaiter().GetResult(); - Assert.That(person, Is.Not.Null); - Assert.That(person.FirstName, Is.EqualTo("John Doe")); - Assert.That(person.Enabled, Is.True); + // Verify Z9 Cred was stored + var z9CredRepository = new Z9CredRepository(_dataAccess); + var z9Cred = z9CredRepository.Get(100).GetAwaiter().GetResult(); + Assert.That(z9Cred, Is.Not.Null); + Assert.That(z9Cred.Name, Is.EqualTo("John Doe")); + Assert.That(z9Cred.Enabled, Is.True); } [Test] @@ -241,10 +240,10 @@ public void DbChange_HostSendsCredentialWithNoCredNum_CredentialNotCreatedInDb() var credential = credentialRepository.Get(200).GetAwaiter().GetResult(); Assert.That(credential, Is.Null); - // Verify person was NOT created - var personRepository = new PersonRepository(_dataAccess); - var person = personRepository.Get(200).GetAwaiter().GetResult(); - Assert.That(person, Is.Null); + // Verify Z9 Cred was NOT created + var z9CredRepository = new Z9CredRepository(_dataAccess); + var z9Cred = z9CredRepository.Get(200).GetAwaiter().GetResult(); + Assert.That(z9Cred, Is.Null); } [Test] @@ -294,11 +293,10 @@ public void DbChange_HostSendsCredentialWithBlankName_UsesCardNumberAsName() Assert.That(credential, Is.Not.Null); Assert.That(credential.Number, Is.EqualTo("789012")); - // Verify person was created with card number as name - var personRepository = new PersonRepository(_dataAccess); - var person = personRepository.Get(300).GetAwaiter().GetResult(); - Assert.That(person, Is.Not.Null); - Assert.That(person.FirstName, Is.EqualTo("789012")); + // Verify Z9 Cred was stored (no name since cred had blank name) + var z9CredRepository = new Z9CredRepository(_dataAccess); + var z9Cred = z9CredRepository.Get(300).GetAwaiter().GetResult(); + Assert.That(z9Cred, Is.Not.Null); } [Test] From c3b66b98ead8748d1744d1fd1393f6f89afa6219 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 08:59:13 -0500 Subject: [PATCH 41/86] Unify classic Aporta events with Z9/Open Evt protos All access events now write to z9_evt table as Evt protos (via Z9EvtRepository) instead of the classic event table. EventService reads from z9_evt and maps Evt protos back to Event DTOs so the UI is unchanged. - Add EventReasonMapping for bidirectional EventType/EventReason <-> EvtCode/EvtSubCode - Fix DoorLocked mapping to AccessDeniedDoorModeStaticLocked (was AccessDeniedNoPriv) - AccessService writes Evt protos with EventData JSON in Evt.Data field - Z9OpenCommunityProtocolService persists door state and cred reader events to z9_evt before TCP send (events stored even when Z9 host disconnected) - StartupWorker uses shared EventReasonMapping instead of inline switch - Migration tool converts old column-based events directly to z9_evt Evt proto JSON - Remove event table from initial schema and delete EventRepository (dead code) Co-Authored-By: Claude Opus 4.6 --- .../Migrations/_0000_InitialCreate.cs | 7 +- .../Migrations/_0003_AddZ9EvtTable.cs | 24 +++ .../Repositories/EventRepository.cs | 44 ----- .../Repositories/Z9EvtRepository.cs | 88 +++++++++ .../DataAccess/SqLiteDataAccess.cs | 3 +- src/Aporta.Core/Services/AccessService.cs | 90 ++++----- .../Services/EventReasonMapping.cs | 66 +++++++ src/Aporta.Core/Services/EventService.cs | 38 +++- .../Z9OpenCommunityProtocolService.cs | 31 +-- src/Aporta.Migration/Aporta.Migration.csproj | 1 + src/Aporta.Migration/Program.cs | 63 +++++- src/Aporta/Workers/StartupWorker.cs | 18 +- .../DataAccess/MigrationTests.cs | 2 +- .../Repositories/EventRepositoryTests.cs | 119 ------------ .../Repositories/Z9EvtRepositoryTests.cs | 183 ++++++++++++++++++ .../Services/EventReasonMappingTests.cs | 82 ++++++++ .../Services/EventServiceTests.cs | 157 +++++++++++++++ .../Aporta.Migration.Tests.csproj | 1 + test/Aporta.Migration.Tests/MigrationTests.cs | 29 ++- 19 files changed, 781 insertions(+), 265 deletions(-) create mode 100644 src/Aporta.Core/DataAccess/Migrations/_0003_AddZ9EvtTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Repositories/EventRepository.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs create mode 100644 src/Aporta.Core/Services/EventReasonMapping.cs delete mode 100644 test/Aporta.Core.Tests/DataAccess/Repositories/EventRepositoryTests.cs create mode 100644 test/Aporta.Core.Tests/DataAccess/Repositories/Z9EvtRepositoryTests.cs create mode 100644 test/Aporta.Core.Tests/Services/EventReasonMappingTests.cs create mode 100644 test/Aporta.Core.Tests/Services/EventServiceTests.cs diff --git a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs index 3bbf68d..4b41f5a 100644 --- a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs +++ b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs @@ -81,12 +81,7 @@ data TEXT NOT NULL CREATE INDEX idx_ca_credential ON credential_assignment (json_extract(data, '$.credentialId')); CREATE INDEX idx_ca_person ON credential_assignment (json_extract(data, '$.personId')); - -- Event table (always local, uses AUTOINCREMENT) - CREATE TABLE event ( - id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - data TEXT NOT NULL - ); - ", +", transaction: transaction); } } diff --git a/src/Aporta.Core/DataAccess/Migrations/_0003_AddZ9EvtTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0003_AddZ9EvtTable.cs new file mode 100644 index 0000000..e3f6bf7 --- /dev/null +++ b/src/Aporta.Core/DataAccess/Migrations/_0003_AddZ9EvtTable.cs @@ -0,0 +1,24 @@ +using System.Data; +using System.Threading.Tasks; +using Dapper; + +namespace Aporta.Core.DataAccess.Migrations; + +public class _0003_AddZ9EvtTable : IMigration +{ + public int Version => 103; + + public string Name => "Add Z9 Evt table for storing event proto messages"; + + public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) + { + await connection.ExecuteAsync( + @" + CREATE TABLE z9_evt ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + data TEXT NOT NULL + ); + ", + transaction: transaction); + } +} diff --git a/src/Aporta.Core/DataAccess/Repositories/EventRepository.cs b/src/Aporta.Core/DataAccess/Repositories/EventRepository.cs deleted file mode 100644 index 576d042..0000000 --- a/src/Aporta.Core/DataAccess/Repositories/EventRepository.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Text.Json; -using System.Threading.Tasks; -using Aporta.Shared.Models; -using Dapper; - -namespace Aporta.Core.DataAccess.Repositories; - -public class EventRepository : JsonDocumentRepository -{ - public EventRepository(IDataAccess dataAccess) - { - DataAccess = dataAccess; - } - - protected override IDataAccess DataAccess { get; } - - protected override string TableName => "event"; - - protected override string SqlRowCount => "SELECT COUNT(*) FROM event"; - - public async Task Insert(Event record) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - var json = JsonSerializer.Serialize(record, GetJsonOptions()); - int id = await connection.QueryFirstAsync( - "INSERT INTO event (data) VALUES (@data); SELECT last_insert_rowid()", - new { data = json }); - - SetId(record, id); - return id; - } - - protected override void SetId(Event entity, int id) - { - entity.Id = id; - } - - protected override int GetId(Event entity) - { - return entity.Id; - } -} diff --git a/src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs b/src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs new file mode 100644 index 0000000..6538f1e --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs @@ -0,0 +1,88 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Aporta.Shared.Models; +using Dapper; +using Google.Protobuf; +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +/// +/// Repository for storing Z9 Evt proto messages with auto-increment IDs. +/// Events are append-only, so this uses INSERT with AUTOINCREMENT rather than upsert-by-unid. +/// +public class Z9EvtRepository : ProtoJsonRepository +{ + private static readonly JsonFormatter Formatter = new(JsonFormatter.Settings.Default); + private static readonly JsonParser Parser = new(JsonParser.Settings.Default); + + private readonly IDataAccess _dataAccess; + + public Z9EvtRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "z9_evt"; + protected override int GetUnid(Evt message) => (int)message.Unid; + + /// + /// Inserts an event with auto-increment ID. Sets message.Unid to the new ID. + /// + public async Task Insert(Evt message) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var json = Formatter.Format(message); + int id = await connection.QueryFirstAsync( + "INSERT INTO z9_evt (data) VALUES (@data); SELECT last_insert_rowid()", + new { data = json }); + + message.Unid = id; + return id; + } + + /// + /// Gets an event by its auto-increment ID, setting Unid from the row ID. + /// + public new async Task Get(int id) + { + var evt = await base.Get(id); + if (evt != null) + evt.Unid = id; + return evt; + } + + /// + /// Returns a paginated list of events ordered by id descending (most recent first). + /// Sets Unid from the row ID on each event. + /// + public async Task> GetAll(int pageNumber, int pageSize) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + int offset = (pageNumber - 1) * pageSize; + var results = await connection.QueryAsync<(int id, string data)>( + "SELECT id, data FROM z9_evt ORDER BY id DESC LIMIT @offset, @pageSize", + new { offset, pageSize }); + + var items = results.Select(row => + { + var evt = Parser.Parse(row.data); + evt.Unid = row.id; + return evt; + }); + + return new PaginatedItemsDto + { + Items = items, + PageNumber = pageNumber, + PageSize = pageSize, + TotalItems = await connection.ExecuteScalarAsync("SELECT COUNT(*) FROM z9_evt") + }; + } +} diff --git a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs index 1f579d2..cec8c67 100644 --- a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs +++ b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs @@ -20,7 +20,8 @@ public class SqLiteDataAccess : IDataAccess { new _0000_InitialCreate(), new _0001_AddZ9OpenTables(), - new _0002_AddZ9CredTable() + new _0002_AddZ9CredTable(), + new _0003_AddZ9EvtTable() }; /// diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index e66d340..213b29d 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -38,7 +38,7 @@ public class AccessService private readonly DoorRepository _doorRepository; private readonly EndpointRepository _endpointRepository; private readonly CredentialRepository _credentialRepository; - private readonly EventRepository _eventRepository; + private readonly Z9EvtRepository _z9EvtRepository; private readonly Z9CredRepository _z9CredRepository; private readonly CredTemplateRepository _credTemplateRepository; private readonly PrivRepository _privRepository; @@ -66,7 +66,7 @@ public AccessService(IDataAccess dataAccess, ExtensionService extensionService, _doorRepository = new DoorRepository(dataAccess); _credentialRepository = new CredentialRepository(dataAccess); _endpointRepository = new EndpointRepository(dataAccess); - _eventRepository = new EventRepository(dataAccess); + _z9EvtRepository = new Z9EvtRepository(dataAccess); _z9CredRepository = new Z9CredRepository(dataAccess); _credTemplateRepository = new CredTemplateRepository(dataAccess); _privRepository = new PrivRepository(dataAccess); @@ -251,17 +251,14 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA { _logger.LogInformation("Door '{Name}' badge requires enrollment", matchingDoor.Name); - eventId = await _eventRepository.Insert(new Event - { - EndpointId = accessPoint.Id, Type = EventType.AccessDenied, - Data = JsonSerializer.Serialize(new EventData + eventId = await InsertAccessEvt(EventType.AccessDenied, EventReason.CredentialNotEnrolled, + new EventData { Door = matchingDoor, Endpoint = accessPoint, EventReason = EventReason.CredentialNotEnrolled, CardNumber = matchingCardData - }) - }); + }); if (assignedCredential == null) { @@ -317,18 +314,15 @@ await _credentialRepository.Insert(new Credential { _logger.LogInformation("Door '{Name}' denied access - no credential template", matchingDoor.Name); - eventId = await _eventRepository.Insert(new Event - { - EndpointId = accessPoint.Id, Type = EventType.AccessDenied, - Data = JsonSerializer.Serialize(new EventData + eventId = await InsertAccessEvt(EventType.AccessDenied, EventReason.NoCredentialTemplate, + new EventData { Door = matchingDoor, Endpoint = accessPoint, Person = assignedCredential.Person, EventReason = EventReason.NoCredentialTemplate, CardNumber = matchingCardData - }) - }); + }); await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); @@ -349,18 +343,15 @@ await _credentialRepository.Insert(new Credential { _logger.LogInformation("Door '{Name}' denied access - credential disabled", matchingDoor.Name); - eventId = await _eventRepository.Insert(new Event - { - EndpointId = accessPoint.Id, Type = EventType.AccessDenied, - Data = JsonSerializer.Serialize(new EventData + eventId = await InsertAccessEvt(EventType.AccessDenied, EventReason.CredentialDisabled, + new EventData { Door = matchingDoor, Endpoint = accessPoint, Person = assignedCredential.Person, EventReason = EventReason.CredentialDisabled, CardNumber = matchingCardData - }) - }); + }); await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); @@ -385,18 +376,15 @@ await _credentialRepository.Insert(new Credential _logger.LogInformation("Door '{Name}' denied access - credential not yet effective (effective {Date})", matchingDoor.Name, effectiveDate.ToShortDateString()); - eventId = await _eventRepository.Insert(new Event - { - EndpointId = accessPoint.Id, Type = EventType.AccessDenied, - Data = JsonSerializer.Serialize(new EventData + eventId = await InsertAccessEvt(EventType.AccessDenied, EventReason.CredentialNotYetEffective, + new EventData { Door = matchingDoor, Endpoint = accessPoint, Person = assignedCredential.Person, EventReason = EventReason.CredentialNotYetEffective, CardNumber = matchingCardData - }) - }); + }); await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); @@ -422,18 +410,15 @@ await _credentialRepository.Insert(new Credential _logger.LogInformation("Door '{Name}' denied access - credential expired (expired {Date})", matchingDoor.Name, expiresDate.ToShortDateString()); - eventId = await _eventRepository.Insert(new Event - { - EndpointId = accessPoint.Id, Type = EventType.AccessDenied, - Data = JsonSerializer.Serialize(new EventData + eventId = await InsertAccessEvt(EventType.AccessDenied, EventReason.CredentialExpired, + new EventData { Door = matchingDoor, Endpoint = accessPoint, Person = assignedCredential.Person, EventReason = EventReason.CredentialExpired, CardNumber = matchingCardData - }) - }); + }); await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); @@ -458,18 +443,15 @@ await _credentialRepository.Insert(new Credential var reasonText = reason == EventReason.OutsideSchedule ? "outside schedule" : "no privilege"; _logger.LogInformation("Door '{Name}' denied access - {Reason}", matchingDoor.Name, reasonText); - eventId = await _eventRepository.Insert(new Event - { - EndpointId = accessPoint.Id, Type = EventType.AccessDenied, - Data = JsonSerializer.Serialize(new EventData + eventId = await InsertAccessEvt(EventType.AccessDenied, reason, + new EventData { Door = matchingDoor, Endpoint = accessPoint, Person = assignedCredential.Person, EventReason = reason, CardNumber = matchingCardData - }) - }); + }); await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); @@ -494,18 +476,15 @@ await _credentialRepository.Insert(new Credential _logger.LogInformation("Door '{Name}' granted access{ExtTime}", matchingDoor.Name, useExtendedTime ? " (extended time)" : ""); - eventId = await _eventRepository.Insert(new Event - { - EndpointId = accessPoint.Id, Type = EventType.AccessGranted, - Data = JsonSerializer.Serialize(new EventData + eventId = await InsertAccessEvt(EventType.AccessGranted, EventReason.None, + new EventData { Door = matchingDoor, Endpoint = accessPoint, Person = assignedCredential.Person, EventReason = EventReason.None, CardNumber = matchingCardData - }) - }); + }); await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); @@ -524,6 +503,29 @@ await _credentialRepository.Insert(new Credential return (true, useExtendedTime); } + private async Task InsertAccessEvt(EventType eventType, EventReason reason, EventData eventData) + { + var (evtCode, evtSubCode) = EventReasonMapping.ToEvtCodes(eventType, reason); + var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); + + var evt = new Evt + { + EvtCode = evtCode, + HwTime = new DateTimeData { Millis = nowMillis }, + DbTime = new DateTimeData { Millis = nowMillis }, + Consumed = false, + Priority = 0, + Data = JsonSerializer.Serialize(eventData) + }; + + if (evtSubCode.HasValue) + { + evt.EvtSubCode = evtSubCode.Value; + } + + return await _z9EvtRepository.Insert(evt); + } + private int GetStrikeTimeMs(string endpointId, bool useExtendedTime) { var (strikeTimeMs, extendedStrikeTimeMs) = _getStrikeTimesForEndpoint?.Invoke(endpointId) ?? (null, null); diff --git a/src/Aporta.Core/Services/EventReasonMapping.cs b/src/Aporta.Core/Services/EventReasonMapping.cs new file mode 100644 index 0000000..dff64a6 --- /dev/null +++ b/src/Aporta.Core/Services/EventReasonMapping.cs @@ -0,0 +1,66 @@ +using System; +using Aporta.Shared.Models; +using Z9.Spcore.Proto; + +namespace Aporta.Core.Services; + +/// +/// Bidirectional mapping between classic Aporta EventType/EventReason +/// and Z9/Open EvtCode/EvtSubCode. +/// +public static class EventReasonMapping +{ + /// + /// Maps classic EventType + EventReason to Z9/Open EvtCode + EvtSubCode. + /// evtSubCode is null for granted events. + /// + public static (EvtCode evtCode, EvtSubCode? evtSubCode) ToEvtCodes( + EventType eventType, EventReason reason) + { + if (eventType == EventType.AccessGranted) + return (EvtCode.DoorAccessGranted, null); + + var subCode = reason switch + { + EventReason.CredentialNotEnrolled => EvtSubCode.AccessDeniedUnknownCredNum, + EventReason.NoCredentialTemplate => EvtSubCode.AccessDeniedUnknownCredNumFormat, + EventReason.CredentialDisabled => EvtSubCode.AccessDeniedInactive, + EventReason.CredentialNotYetEffective => EvtSubCode.AccessDeniedNotEffective, + EventReason.CredentialExpired => EvtSubCode.AccessDeniedExpired, + EventReason.NoPrivilege => EvtSubCode.AccessDeniedNoPriv, + EventReason.AccessNotAssigned => EvtSubCode.AccessDeniedNoPriv, + EventReason.OutsideSchedule => EvtSubCode.AccessDeniedOutsideSched, + EventReason.DoorLocked => EvtSubCode.AccessDeniedDoorModeStaticLocked, + _ => throw new ArgumentOutOfRangeException(nameof(reason), reason, + $"No EvtSubCode mapping for EventReason.{reason}") + }; + + return (EvtCode.DoorAccessDenied, subCode); + } + + /// + /// Reverse mapping: Z9/Open EvtCode + EvtSubCode back to classic EventType + EventReason. + /// Used by EventService to reconstruct Event DTOs from Evt protos. + /// + public static (EventType eventType, EventReason reason) ToEventTypeAndReason( + EvtCode evtCode, EvtSubCode evtSubCode) + { + if (evtCode == EvtCode.DoorAccessGranted) + return (EventType.AccessGranted, EventReason.None); + + var reason = evtSubCode switch + { + EvtSubCode.AccessDeniedUnknownCredNum => EventReason.CredentialNotEnrolled, + EvtSubCode.AccessDeniedUnknownCredNumFormat => EventReason.NoCredentialTemplate, + EvtSubCode.AccessDeniedInactive => EventReason.CredentialDisabled, + EvtSubCode.AccessDeniedNotEffective => EventReason.CredentialNotYetEffective, + EvtSubCode.AccessDeniedExpired => EventReason.CredentialExpired, + EvtSubCode.AccessDeniedNoPriv => EventReason.NoPrivilege, + EvtSubCode.AccessDeniedOutsideSched => EventReason.OutsideSchedule, + EvtSubCode.AccessDeniedDoorModeStaticLocked => EventReason.DoorLocked, + _ => EventReason.None + }; + + return (EventType.AccessDenied, reason); + } +} diff --git a/src/Aporta.Core/Services/EventService.cs b/src/Aporta.Core/Services/EventService.cs index c79e069..42d92e0 100644 --- a/src/Aporta.Core/Services/EventService.cs +++ b/src/Aporta.Core/Services/EventService.cs @@ -1,27 +1,53 @@ +using System; +using System.Linq; using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; using Aporta.Shared.Models; +using Z9.Spcore.Proto; namespace Aporta.Core.Services; public class EventService { - private readonly EventRepository _eventRepository; + private readonly Z9EvtRepository _z9EvtRepository; public EventService(IDataAccess dataAccess) { - _eventRepository = new EventRepository(dataAccess); + _z9EvtRepository = new Z9EvtRepository(dataAccess); } - + public async Task Get(int eventId) { - return await _eventRepository.Get(eventId); + var evt = await _z9EvtRepository.Get(eventId); + return evt != null ? EvtToEvent(evt) : null; } public async Task> GetAll(int pageNumber, int pageSize) { - return await _eventRepository.GetAll(pageNumber, pageSize, "id"); + var page = await _z9EvtRepository.GetAll(pageNumber, pageSize); + return new PaginatedItemsDto + { + Items = page.Items.Select(EvtToEvent), + PageNumber = page.PageNumber, + PageSize = page.PageSize, + TotalItems = page.TotalItems + }; + } + + private static Event EvtToEvent(Evt evt) + { + var (eventType, _) = EventReasonMapping.ToEventTypeAndReason( + evt.EvtCode, + evt.EvtSubCodeCase == Evt.EvtSubCodeOneofCase.EvtSubCode ? evt.EvtSubCode : 0); + + return new Event + { + Id = (int)evt.Unid, + Timestamp = DateTimeOffset.FromUnixTimeMilliseconds(evt.DbTime.Millis).UtcDateTime, + Type = eventType, + Data = evt.Data + }; } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 7b68519..0e53047 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -33,6 +33,7 @@ public class Z9OpenCommunityProtocolService : IDisposable private readonly HolCalRepository _holCalRepository; private readonly HolTypeRepository _holTypeRepository; private readonly Z9CredRepository _z9CredRepository; + private readonly Z9EvtRepository _z9EvtRepository; // Received OSDP CredReader configurations from Z9 private readonly List _osdpReaderConfigs = new(); @@ -116,6 +117,7 @@ public Z9OpenCommunityProtocolService( _holCalRepository = new HolCalRepository(dataAccess); _holTypeRepository = new HolTypeRepository(dataAccess); _z9CredRepository = new Z9CredRepository(dataAccess); + _z9EvtRepository = new Z9EvtRepository(dataAccess); } public void Start(string host, int port, string id = null) @@ -1199,12 +1201,6 @@ public void SendCredReaderOnlineEvent(OsdpReaderConfig config, bool isOnline) return; } - if (!IsConnected) - { - _logger.LogWarning("Cannot send cred reader event: not connected"); - return; - } - var evtCode = isOnline ? EvtCode.CredReaderOnline : EvtCode.CredReaderOffline; var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); @@ -1223,6 +1219,14 @@ public void SendCredReaderOnlineEvent(OsdpReaderConfig config, bool isOnline) } }; + _z9EvtRepository.Insert(evt).GetAwaiter().GetResult(); + + if (!IsConnected) + { + _logger.LogWarning("Cannot send cred reader event: not connected"); + return; + } + var message = new SpCoreMessage { Type = SpCoreMessage.Types.Type.Evt @@ -1237,6 +1241,7 @@ public void SendCredReaderOnlineEvent(OsdpReaderConfig config, bool isOnline) /// /// Sends an access event (granted or denied) to Z9. + /// Access events are NOT persisted here — AccessService already persists them to z9_evt. /// /// The OSDP reader configuration (to determine the device). /// True if access was granted, false if denied. @@ -1325,12 +1330,6 @@ public void SendDoorStateEvent(OsdpReaderConfig config, EvtCode evtCode) return; } - if (!IsConnected) - { - _logger.LogWarning("Cannot send door state event: not connected"); - return; - } - if (!config.DoorUnid.HasValue) { _logger.LogWarning("Cannot send door state event: reader {Name} has no DoorUnid", config.Name); @@ -1364,6 +1363,14 @@ public void SendDoorStateEvent(OsdpReaderConfig config, EvtCode evtCode) } }; + _z9EvtRepository.Insert(evt).GetAwaiter().GetResult(); + + if (!IsConnected) + { + _logger.LogWarning("Cannot send door state event: not connected"); + return; + } + var message = new SpCoreMessage { Type = SpCoreMessage.Types.Type.Evt diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index b585e32..ca85d8c 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,6 +10,7 @@ + diff --git a/src/Aporta.Migration/Program.cs b/src/Aporta.Migration/Program.cs index 2d7045c..fc3ee78 100644 --- a/src/Aporta.Migration/Program.cs +++ b/src/Aporta.Migration/Program.cs @@ -1,7 +1,9 @@ using System.Data; using System.Text.Json; using Dapper; +using Google.Protobuf; using Microsoft.Data.Sqlite; +using Z9.Spcore.Proto; namespace Aporta.Migration; @@ -456,35 +458,76 @@ await _connection.ExecuteAsync( transaction: transaction); } + private static readonly JsonFormatter ProtoFormatter = new(JsonFormatter.Settings.Default); + private async Task TransformEventTableAsync(IDbTransaction? transaction) { - Console.WriteLine(" Transforming event table..."); + Console.WriteLine(" Migrating event table to z9_evt..."); if (_dryRun) return; var oldData = await _connection.QueryAsync<(int Id, int EndpointId, DateTime Timestamp, int EventType, string Data)>( "SELECT id, endpoint_id, timestamp, event_type, data FROM event", transaction: transaction); await _connection.ExecuteAsync( - @"CREATE TABLE event_new (id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, data TEXT NOT NULL)", + @"CREATE TABLE z9_evt (id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, data TEXT NOT NULL)", transaction: transaction); foreach (var row in oldData) { - var json = JsonSerializer.Serialize(new + var millis = new DateTimeOffset(row.Timestamp, TimeSpan.Zero).ToUnixTimeMilliseconds(); + var isGranted = row.EventType == 0; // EventType.AccessGranted = 0 + + var evt = new Evt { - endpointId = row.EndpointId, - timestamp = row.Timestamp, - type = row.EventType, - data = row.Data - }); + EvtCode = isGranted ? EvtCode.DoorAccessGranted : EvtCode.DoorAccessDenied, + HwTime = new DateTimeData { Millis = millis }, + DbTime = new DateTimeData { Millis = millis }, + Consumed = false, + Priority = 0, + Data = row.Data + }; + + // Parse EventData to get EventReason for denied events + if (!isGranted && !string.IsNullOrEmpty(row.Data)) + { + try + { + using var doc = JsonDocument.Parse(row.Data); + if (doc.RootElement.TryGetProperty("EventReason", out var reasonProp) || + doc.RootElement.TryGetProperty("eventReason", out reasonProp)) + { + var reasonInt = reasonProp.GetInt32(); + var subCode = reasonInt switch + { + 4 => EvtSubCode.AccessDeniedUnknownCredNum, // CredentialNotEnrolled + 11 => EvtSubCode.AccessDeniedUnknownCredNumFormat, // NoCredentialTemplate + 5 => EvtSubCode.AccessDeniedInactive, // CredentialDisabled + 6 => EvtSubCode.AccessDeniedNotEffective, // CredentialNotYetEffective + 7 => EvtSubCode.AccessDeniedExpired, // CredentialExpired + 8 => EvtSubCode.AccessDeniedNoPriv, // NoPrivilege + 3 => EvtSubCode.AccessDeniedNoPriv, // AccessNotAssigned + 9 => EvtSubCode.AccessDeniedOutsideSched, // OutsideSchedule + 10 => EvtSubCode.AccessDeniedDoorModeStaticLocked, // DoorLocked + _ => (EvtSubCode?)null + }; + if (subCode.HasValue) + evt.EvtSubCode = subCode.Value; + } + } + catch (JsonException) + { + // Old data may not be parseable — leave without sub-code + } + } + + var json = ProtoFormatter.Format(evt); await _connection.ExecuteAsync( - "INSERT INTO event_new (id, data) VALUES (@id, @data)", + "INSERT INTO z9_evt (id, data) VALUES (@id, @data)", new { id = row.Id, data = json }, transaction: transaction); } await _connection.ExecuteAsync("DROP TABLE event", transaction: transaction); - await _connection.ExecuteAsync("ALTER TABLE event_new RENAME TO event", transaction: transaction); } private static List<(int Version, string Name, string Sql)> GetOldMigrations() diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 0086779..069327a 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -994,20 +994,10 @@ private void OnAccessDecisionMade(object sender, AccessDecisionEventArgs e) } } - // Map EventReason to EvtSubCode (for granted, subCode is ignored so use default 0 value) - var subCode = e.Reason switch - { - EventReason.CredentialNotEnrolled => EvtSubCode.AccessDeniedUnknownCredNum, - EventReason.AccessNotAssigned => EvtSubCode.AccessDeniedNoPriv, - EventReason.NoPrivilege => EvtSubCode.AccessDeniedNoPriv, - EventReason.CredentialDisabled => EvtSubCode.AccessDeniedInactive, - EventReason.CredentialNotYetEffective => EvtSubCode.AccessDeniedNotEffective, - EventReason.CredentialExpired => EvtSubCode.AccessDeniedExpired, - EventReason.OutsideSchedule => EvtSubCode.AccessDeniedOutsideSched, - EventReason.DoorLocked => EvtSubCode.AccessDeniedNoPriv, - EventReason.NoCredentialTemplate => EvtSubCode.AccessDeniedUnknownCredNumFormat, - _ => EvtSubCode.AccessDeniedInactive // Default value (0); unused for granted events - }; + // Map EventReason to EvtSubCode via shared mapping + var eventType = e.IsGranted ? EventType.AccessGranted : EventType.AccessDenied; + var (_, evtSubCode) = EventReasonMapping.ToEvtCodes(eventType, e.Reason); + var subCode = evtSubCode ?? EvtSubCode.AccessDeniedInactive; _logger.LogInformation("Access {Decision} for reader {Name}: person={Person}, reason={Reason}", e.IsGranted ? "GRANTED" : "DENIED", config.Name, e.PersonName ?? "(unknown)", e.Reason); diff --git a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs index 4fe31eb..7c1c888 100644 --- a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs @@ -8,7 +8,7 @@ namespace Aporta.Core.Tests.DataAccess; [TestFixture] public class MigrationTests { - private const int CurrentVersion = 102; + private const int CurrentVersion = 103; private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); private IDbConnection _persistConnection; diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/EventRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/EventRepositoryTests.cs deleted file mode 100644 index c9871b2..0000000 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/EventRepositoryTests.cs +++ /dev/null @@ -1,119 +0,0 @@ -using System; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using Aporta.Core.DataAccess; -using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models; -using Aporta.Shared.Models; -using NUnit.Framework; - -namespace Aporta.Core.Tests.DataAccess.Repositories; - -public class EventRepositoryTests -{ - private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); - private IDbConnection _persistConnection; - private Guid _extensionId; - private int _accessEndpoint1Id; - private int _accessEndpoint2Id; - - [SetUp] - public async Task Setup() - { - _persistConnection = _dataAccess.CreateDbConnection(); - _persistConnection.Open(); - - await _dataAccess.UpdateSchema(); - - _extensionId = Guid.NewGuid(); - var extensions = new[] - { - new ExtensionHost {Id = _extensionId, Name = "ExtensionTest", Enabled = false} - }; - - var extensionRepository = new ExtensionRepository(_dataAccess); - foreach (var extension in extensions) - { - await extensionRepository.Insert(extension); - } - - var accessEndpoint1 = new Endpoint - {Name = "AccessTest1", Type = EndpointType.Reader, ExtensionId = _extensionId}; - var accessEndpoint2 = new Endpoint - {Name = "AccessTest2", Type = EndpointType.Reader, ExtensionId = _extensionId}; - - var endpointRepository = new EndpointRepository(_dataAccess); - - await endpointRepository.Insert(accessEndpoint1); - _accessEndpoint1Id = accessEndpoint1.Id; - await endpointRepository.Insert(accessEndpoint2); - _accessEndpoint2Id = accessEndpoint2.Id; - } - - [TearDown] - public void TearDown() - { - _persistConnection?.Close(); - _persistConnection?.Dispose(); - } - - [Test] - public async Task Insert() - { - // Arrange - var events = new[] - { - new Event {EndpointId = _accessEndpoint1Id, Timestamp = new DateTime(2022, 1, 1), Type = EventType.AccessDenied}, - new Event {EndpointId = _accessEndpoint2Id, Timestamp = new DateTime(2024, 4, 4), Type = EventType.AccessGranted, Data = "{}"}, - }; - - var eventRepository = new EventRepository(_dataAccess); - foreach (var @event in events) - { - await eventRepository.Insert(@event); - } - - // Act - var actualEvent = await eventRepository.Get(2); - - // Assert - Assert.That(events[1].Id, Is.EqualTo(2)); - Assert.That(actualEvent.Id, Is.EqualTo(2)); - Assert.That(actualEvent.EndpointId, Is.EqualTo(_accessEndpoint2Id)); - Assert.That(actualEvent.Timestamp, Is.EqualTo(new DateTime(2024, 4, 4))); - Assert.That(actualEvent.Type, Is.EqualTo(EventType.AccessGranted)); - Assert.That(actualEvent.Data, Is.EqualTo("{}")); - } - - [Test] - public async Task Delete() - { - // Arrange - var events = new[] - { - new Event - { - EndpointId = _accessEndpoint1Id, Timestamp = new DateTime(2022, 1, 1), Type = EventType.AccessDenied - }, - new Event - { - EndpointId = _accessEndpoint2Id, Timestamp = new DateTime(2024, 4, 4), - Type = EventType.AccessGranted, Data = "{}" - }, - }; - - var eventRepository = new EventRepository(_dataAccess); - foreach (var @event in events) - { - await eventRepository.Insert(@event); - } - - // Act - await eventRepository.Delete(2); - - // Assert - var actualEvents = await eventRepository.GetAll(); - Assert.That(1, Is.EqualTo(actualEvents.Count())); - } -} \ No newline at end of file diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/Z9EvtRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/Z9EvtRepositoryTests.cs new file mode 100644 index 0000000..3fd374b --- /dev/null +++ b/test/Aporta.Core.Tests/DataAccess/Repositories/Z9EvtRepositoryTests.cs @@ -0,0 +1,183 @@ +using System; +using System.Data; +using System.Linq; +using System.Text.Json; +using System.Threading.Tasks; +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Shared.Models; +using NUnit.Framework; +using Z9.Spcore.Proto; + +namespace Aporta.Core.Tests.DataAccess.Repositories; + +public class Z9EvtRepositoryTests +{ + private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); + private IDbConnection _persistConnection; + + [SetUp] + public async Task Setup() + { + _persistConnection = _dataAccess.CreateDbConnection(); + _persistConnection.Open(); + + await _dataAccess.UpdateSchema(); + } + + [TearDown] + public void TearDown() + { + _persistConnection?.Close(); + _persistConnection?.Dispose(); + } + + [Test] + public async Task Insert() + { + // Arrange + var repository = new Z9EvtRepository(_dataAccess); + + var evt1 = new Evt + { + EvtCode = EvtCode.DoorAccessGranted, + HwTime = new DateTimeData { Millis = 1000 }, + DbTime = new DateTimeData { Millis = 1000 }, + Priority = 0 + }; + var evt2 = new Evt + { + EvtCode = EvtCode.DoorAccessDenied, + HwTime = new DateTimeData { Millis = 2000 }, + DbTime = new DateTimeData { Millis = 2000 }, + Priority = 0 + }; + + // Act + int id1 = await repository.Insert(evt1); + int id2 = await repository.Insert(evt2); + + // Assert — auto-increment IDs + Assert.That(id1, Is.EqualTo(1)); + Assert.That(id2, Is.EqualTo(2)); + Assert.That(evt1.Unid, Is.EqualTo(1)); + Assert.That(evt2.Unid, Is.EqualTo(2)); + + // Verify round-trip via Get + var retrieved = await repository.Get(id1); + Assert.That(retrieved, Is.Not.Null); + Assert.That(retrieved.EvtCode, Is.EqualTo(EvtCode.DoorAccessGranted)); + Assert.That(retrieved.HwTime.Millis, Is.EqualTo(1000)); + } + + [Test] + public async Task GetAll_Paginated() + { + // Arrange + var repository = new Z9EvtRepository(_dataAccess); + + for (int i = 0; i < 5; i++) + { + await repository.Insert(new Evt + { + EvtCode = EvtCode.DoorAccessGranted, + HwTime = new DateTimeData { Millis = i * 1000 }, + DbTime = new DateTimeData { Millis = i * 1000 }, + Priority = 0 + }); + } + + // Act — page 1, size 2 (should get IDs 5,4 since ORDER BY id DESC) + var page1 = await repository.GetAll(1, 2); + + // Assert + Assert.That(page1.TotalItems, Is.EqualTo(5)); + Assert.That(page1.PageNumber, Is.EqualTo(1)); + Assert.That(page1.PageSize, Is.EqualTo(2)); + var page1Items = page1.Items.ToList(); + Assert.That(page1Items, Has.Count.EqualTo(2)); + Assert.That(page1Items[0].HwTime.Millis, Is.EqualTo(4000)); // most recent first + Assert.That(page1Items[1].HwTime.Millis, Is.EqualTo(3000)); + + // Act — page 3, size 2 (should get 1 item: ID 1) + var page3 = await repository.GetAll(3, 2); + var page3Items = page3.Items.ToList(); + Assert.That(page3Items, Has.Count.EqualTo(1)); + Assert.That(page3Items[0].HwTime.Millis, Is.EqualTo(0)); + } + + [Test] + public async Task Delete() + { + // Arrange + var repository = new Z9EvtRepository(_dataAccess); + + var evt = new Evt + { + EvtCode = EvtCode.CredReaderOnline, + HwTime = new DateTimeData { Millis = 1000 }, + DbTime = new DateTimeData { Millis = 1000 } + }; + int id = await repository.Insert(evt); + + // Act + await repository.Delete(id); + + // Assert + Assert.That(await repository.Count(), Is.EqualTo(0)); + } + + [Test] + public async Task Count() + { + // Arrange + var repository = new Z9EvtRepository(_dataAccess); + Assert.That(await repository.Count(), Is.EqualTo(0)); + + // Act + await repository.Insert(new Evt { EvtCode = EvtCode.DoorAccessGranted }); + await repository.Insert(new Evt { EvtCode = EvtCode.DoorAccessDenied }); + await repository.Insert(new Evt { EvtCode = EvtCode.DoorUnlocked }); + + // Assert + Assert.That(await repository.Count(), Is.EqualTo(3)); + } + + [Test] + public async Task Insert_WithEventDataJson_RoundTrips() + { + // Arrange + var repository = new Z9EvtRepository(_dataAccess); + + var eventData = new EventData + { + EventReason = EventReason.CredentialExpired, + Endpoint = new Endpoint { Id = 1, Name = "Reader 1", DriverEndpointId = "ep1", ExtensionId = Guid.Empty }, + CardNumber = "12345" + }; + var eventDataJson = JsonSerializer.Serialize(eventData); + + var evt = new Evt + { + EvtCode = EvtCode.DoorAccessDenied, + EvtSubCode = EvtSubCode.AccessDeniedExpired, + HwTime = new DateTimeData { Millis = 1000 }, + DbTime = new DateTimeData { Millis = 1000 }, + Data = eventDataJson + }; + + // Act + int id = await repository.Insert(evt); + var retrieved = await repository.Get(id); + + // Assert + Assert.That(retrieved, Is.Not.Null); + Assert.That(retrieved.Data, Is.EqualTo(eventDataJson)); + Assert.That(retrieved.EvtCode, Is.EqualTo(EvtCode.DoorAccessDenied)); + Assert.That(retrieved.EvtSubCode, Is.EqualTo(EvtSubCode.AccessDeniedExpired)); + + var roundTrippedData = JsonSerializer.Deserialize(retrieved.Data); + Assert.That(roundTrippedData.EventReason, Is.EqualTo(EventReason.CredentialExpired)); + Assert.That(roundTrippedData.CardNumber, Is.EqualTo("12345")); + } +} diff --git a/test/Aporta.Core.Tests/Services/EventReasonMappingTests.cs b/test/Aporta.Core.Tests/Services/EventReasonMappingTests.cs new file mode 100644 index 0000000..a4e992b --- /dev/null +++ b/test/Aporta.Core.Tests/Services/EventReasonMappingTests.cs @@ -0,0 +1,82 @@ +using System; +using Aporta.Core.Services; +using Aporta.Shared.Models; +using NUnit.Framework; +using Z9.Spcore.Proto; + +namespace Aporta.Core.Tests.Services; + +public class EventReasonMappingTests +{ + [Test] + public void AccessGranted_MapsToEvtCode() + { + var (evtCode, evtSubCode) = + EventReasonMapping.ToEvtCodes(EventType.AccessGranted, EventReason.None); + + Assert.That(evtCode, Is.EqualTo(EvtCode.DoorAccessGranted)); + Assert.That(evtSubCode, Is.Null); + } + + [TestCase(EventReason.CredentialNotEnrolled, EvtSubCode.AccessDeniedUnknownCredNum)] + [TestCase(EventReason.NoCredentialTemplate, EvtSubCode.AccessDeniedUnknownCredNumFormat)] + [TestCase(EventReason.CredentialDisabled, EvtSubCode.AccessDeniedInactive)] + [TestCase(EventReason.CredentialNotYetEffective, EvtSubCode.AccessDeniedNotEffective)] + [TestCase(EventReason.CredentialExpired, EvtSubCode.AccessDeniedExpired)] + [TestCase(EventReason.NoPrivilege, EvtSubCode.AccessDeniedNoPriv)] + [TestCase(EventReason.AccessNotAssigned, EvtSubCode.AccessDeniedNoPriv)] + [TestCase(EventReason.OutsideSchedule, EvtSubCode.AccessDeniedOutsideSched)] + public void AccessDenied_MapsToCorrectSubCode(EventReason reason, EvtSubCode expectedSubCode) + { + var (evtCode, evtSubCode) = + EventReasonMapping.ToEvtCodes(EventType.AccessDenied, reason); + + Assert.That(evtCode, Is.EqualTo(EvtCode.DoorAccessDenied)); + Assert.That(evtSubCode, Is.EqualTo(expectedSubCode)); + } + + [Test] + public void DoorLocked_MapsToStaticLocked_NotNoPriv() + { + var (evtCode, evtSubCode) = + EventReasonMapping.ToEvtCodes(EventType.AccessDenied, EventReason.DoorLocked); + + Assert.That(evtCode, Is.EqualTo(EvtCode.DoorAccessDenied)); + Assert.That(evtSubCode, Is.EqualTo(EvtSubCode.AccessDeniedDoorModeStaticLocked)); + } + + [TestCase(EventReason.DoorUsed)] + [TestCase(EventReason.DoorNotUsed)] + public void UnmappedReason_Throws(EventReason reason) + { + Assert.Throws(() => + EventReasonMapping.ToEvtCodes(EventType.AccessDenied, reason)); + } + + [Test] + public void ReverseMapping_AccessGranted() + { + var (eventType, reason) = + EventReasonMapping.ToEventTypeAndReason(EvtCode.DoorAccessGranted, 0); + + Assert.That(eventType, Is.EqualTo(EventType.AccessGranted)); + Assert.That(reason, Is.EqualTo(EventReason.None)); + } + + [TestCase(EvtSubCode.AccessDeniedUnknownCredNum, EventReason.CredentialNotEnrolled)] + [TestCase(EvtSubCode.AccessDeniedUnknownCredNumFormat, EventReason.NoCredentialTemplate)] + [TestCase(EvtSubCode.AccessDeniedInactive, EventReason.CredentialDisabled)] + [TestCase(EvtSubCode.AccessDeniedNotEffective, EventReason.CredentialNotYetEffective)] + [TestCase(EvtSubCode.AccessDeniedExpired, EventReason.CredentialExpired)] + [TestCase(EvtSubCode.AccessDeniedNoPriv, EventReason.NoPrivilege)] + [TestCase(EvtSubCode.AccessDeniedOutsideSched, EventReason.OutsideSchedule)] + [TestCase(EvtSubCode.AccessDeniedDoorModeStaticLocked, EventReason.DoorLocked)] + public void ReverseMapping_AccessDenied(EvtSubCode subCode, EventReason expectedReason) + { + var (eventType, reason) = + EventReasonMapping.ToEventTypeAndReason(EvtCode.DoorAccessDenied, subCode); + + Assert.That(eventType, Is.EqualTo(EventType.AccessDenied)); + Assert.That(reason, Is.EqualTo(expectedReason)); + } +} diff --git a/test/Aporta.Core.Tests/Services/EventServiceTests.cs b/test/Aporta.Core.Tests/Services/EventServiceTests.cs new file mode 100644 index 0000000..5c96136 --- /dev/null +++ b/test/Aporta.Core.Tests/Services/EventServiceTests.cs @@ -0,0 +1,157 @@ +using System; +using System.Data; +using System.Linq; +using System.Text.Json; +using System.Threading.Tasks; +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Services; +using Aporta.Shared.Models; +using NUnit.Framework; +using Z9.Spcore.Proto; + +namespace Aporta.Core.Tests.Services; + +public class EventServiceTests +{ + private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); + private IDbConnection _persistConnection; + + [SetUp] + public async Task Setup() + { + _persistConnection = _dataAccess.CreateDbConnection(); + _persistConnection.Open(); + + await _dataAccess.UpdateSchema(); + } + + [TearDown] + public void TearDown() + { + _persistConnection?.Close(); + _persistConnection?.Dispose(); + } + + [Test] + public async Task Get_ReturnsCorrectEventDto() + { + // Arrange + var repository = new Z9EvtRepository(_dataAccess); + var service = new EventService(_dataAccess); + + var eventData = new EventData + { + EventReason = EventReason.None, + Endpoint = new Endpoint { Id = 1, Name = "Reader 1", DriverEndpointId = "ep1", ExtensionId = Guid.Empty } + }; + var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); + + var evt = new Evt + { + EvtCode = EvtCode.DoorAccessGranted, + HwTime = new DateTimeData { Millis = nowMillis }, + DbTime = new DateTimeData { Millis = nowMillis }, + Consumed = false, + Priority = 0, + Data = JsonSerializer.Serialize(eventData) + }; + + int id = await repository.Insert(evt); + + // Act + var result = await service.Get(id); + + // Assert + Assert.That(result, Is.Not.Null); + Assert.That(result.Id, Is.EqualTo(id)); + Assert.That(result.Type, Is.EqualTo(EventType.AccessGranted)); + Assert.That(result.Data, Is.Not.Null.And.Not.Empty); + + var roundTrippedData = JsonSerializer.Deserialize(result.Data); + Assert.That(roundTrippedData.EventReason, Is.EqualTo(EventReason.None)); + + // Verify timestamp is close to now + var expectedTime = DateTimeOffset.FromUnixTimeMilliseconds(nowMillis).UtcDateTime; + Assert.That(result.Timestamp, Is.EqualTo(expectedTime)); + } + + [Test] + public async Task Get_DeniedEvent_ReturnsCorrectType() + { + // Arrange + var repository = new Z9EvtRepository(_dataAccess); + var service = new EventService(_dataAccess); + + var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); + + var evt = new Evt + { + EvtCode = EvtCode.DoorAccessDenied, + EvtSubCode = EvtSubCode.AccessDeniedExpired, + HwTime = new DateTimeData { Millis = nowMillis }, + DbTime = new DateTimeData { Millis = nowMillis }, + Data = JsonSerializer.Serialize(new EventData + { + EventReason = EventReason.CredentialExpired, + Endpoint = new Endpoint { Id = 1, Name = "Reader 1", DriverEndpointId = "ep1", ExtensionId = Guid.Empty } + }) + }; + + int id = await repository.Insert(evt); + + // Act + var result = await service.Get(id); + + // Assert + Assert.That(result.Type, Is.EqualTo(EventType.AccessDenied)); + } + + [Test] + public async Task Get_NonExistentId_ReturnsNull() + { + // Arrange + var service = new EventService(_dataAccess); + + // Act + var result = await service.Get(999); + + // Assert + Assert.That(result, Is.Null); + } + + [Test] + public async Task GetAll_ReturnsPaginatedEvents() + { + // Arrange + var repository = new Z9EvtRepository(_dataAccess); + var service = new EventService(_dataAccess); + + for (int i = 0; i < 5; i++) + { + var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() + i; + await repository.Insert(new Evt + { + EvtCode = EvtCode.DoorAccessGranted, + HwTime = new DateTimeData { Millis = nowMillis }, + DbTime = new DateTimeData { Millis = nowMillis }, + Data = JsonSerializer.Serialize(new EventData + { + EventReason = EventReason.None, + Endpoint = new Endpoint { Id = 1, Name = "Reader 1", DriverEndpointId = "ep1", ExtensionId = Guid.Empty } + }) + }); + } + + // Act + var page = await service.GetAll(1, 3); + + // Assert + Assert.That(page.TotalItems, Is.EqualTo(5)); + Assert.That(page.PageNumber, Is.EqualTo(1)); + Assert.That(page.PageSize, Is.EqualTo(3)); + var items = page.Items.ToList(); + Assert.That(items, Has.Count.EqualTo(3)); + Assert.That(items.All(e => e.Type == EventType.AccessGranted), Is.True); + } +} diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index 1ac4524..7267f73 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,6 +10,7 @@ + diff --git a/test/Aporta.Migration.Tests/MigrationTests.cs b/test/Aporta.Migration.Tests/MigrationTests.cs index 3186ec8..79e6ff1 100644 --- a/test/Aporta.Migration.Tests/MigrationTests.cs +++ b/test/Aporta.Migration.Tests/MigrationTests.cs @@ -1,8 +1,10 @@ using System.Data; using System.Text.Json; using Dapper; +using Google.Protobuf; using Microsoft.Data.Sqlite; using NUnit.Framework; +using Z9.Spcore.Proto; namespace Aporta.Migration.Tests; @@ -47,7 +49,8 @@ public async Task Migrate_FromVersion10_TransformsAllTables() await VerifyPersonTable(); await VerifyCredentialTable(); await VerifyCredentialAssignmentTable(); - await VerifyEventTable(); + await VerifyZ9EvtTable(); + await VerifyEventTableDropped(); await VerifySchemaInfo(); } @@ -68,7 +71,8 @@ public async Task Migrate_FromVersion5_AppliesRemainingMigrationsFirst() Assert.That(tables, Does.Contain("person")); Assert.That(tables, Does.Contain("credential")); Assert.That(tables, Does.Contain("credential_assignment")); - Assert.That(tables, Does.Contain("event")); + Assert.That(tables, Does.Contain("z9_evt")); + Assert.That(tables, Does.Not.Contain("event")); } [Test] @@ -175,7 +179,6 @@ await _connection.ExecuteAsync(@" CREATE TABLE person (id INTEGER PRIMARY KEY, data TEXT NOT NULL); CREATE TABLE credential (id INTEGER PRIMARY KEY, data TEXT NOT NULL); CREATE TABLE credential_assignment (id INTEGER PRIMARY KEY, data TEXT NOT NULL); - CREATE TABLE event (id INTEGER PRIMARY KEY AUTOINCREMENT, data TEXT NOT NULL); "); } @@ -297,14 +300,24 @@ private async Task VerifyCredentialAssignmentTable() Assert.That(json.RootElement.GetProperty("enabled").GetInt32(), Is.EqualTo(1)); } - private async Task VerifyEventTable() + private static readonly JsonParser ProtoParser = new(JsonParser.Settings.Default); + + private async Task VerifyZ9EvtTable() { var result = await _connection.QueryFirstAsync<(int Id, string Data)>( - "SELECT id, data FROM event WHERE id = 1"); + "SELECT id, data FROM z9_evt WHERE id = 1"); - var json = JsonDocument.Parse(result.Data); - Assert.That(json.RootElement.GetProperty("endpointId").GetInt32(), Is.EqualTo(1)); - Assert.That(json.RootElement.GetProperty("type").GetInt32(), Is.EqualTo(1)); + var evt = ProtoParser.Parse(result.Data); + Assert.That(evt.EvtCode, Is.EqualTo(EvtCode.DoorAccessDenied)); // event_type=1 is AccessDenied + Assert.That(evt.Data, Is.EqualTo("{\"card\":\"12345678\"}")); + Assert.That(evt.DbTime.Millis, Is.GreaterThan(0)); + } + + private async Task VerifyEventTableDropped() + { + var tables = await _connection.QueryAsync( + "SELECT name FROM sqlite_master WHERE type='table' AND name='event'"); + Assert.That(tables, Is.Empty); } private async Task VerifySchemaInfo() From 02b2d9ed1b09d41a72c57524263c06fcda503deb Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 09:18:10 -0500 Subject: [PATCH 42/86] Restructure README with Completed/TODO sections for Aporta and Z9/Open Co-Authored-By: Claude Opus 4.6 --- README.md | 121 +++++++++++++++++++++++++++--------------------------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index 7d0f066..cc00c75 100644 --- a/README.md +++ b/README.md @@ -11,28 +11,73 @@ Aporta doesn't intend to recreate what is already available by existing physical - Open standards are embraced and built into the software. - Features are not to be restricted by licensing. All the software's capabilities are available without being overburden with expensive and confusing license terms. -## Release Plan ## +## Completed ## -The project is early in its development. After working on access control products for many years, my inclination is that there are a large number of features required for a viable access controller. The list below is an attempt to limit the feature targeted in the first release. - -- Easy installation **(Done)** - - Windows installer **(Done)** - - Debian packages **(Done)** +### Aporta +- Easy installation + - Windows installer + - Debian packages +- Self hosted web management + - SSL required by default +- OSDP Driver + - Install new devices with security channel encryption + - Process standard Wiegand card reads + - Detect if device is online + - Control output +- Access Control + - Enroll new cardholder + - Read entire card data for card number + - Log access events + +### Z9/Open Community Profile +- Connection & Protocol + - Outbound TCP connection from panel to host (panel-initiates model) + - Protobuf-based Z9/Open Community protocol with identification handshake + - Automatic configuration download on connect (DbChange messages) +- Device Management + - OSDP credential readers over TCP/IP, configured from Dev messages + - Door model with strike actuator, door contact sensor, and REX sensor — all wired automatically from the device hierarchy + - Credential reader online/offline status reporting +- Credential & Data Format Support + - Credential mapping from Cred objects (card number, facility code, enabled/disabled, effective/expiry dates) + - Credentials stored by card number; card reads decoded using DataFormat definitions to extract and match by card number + - Credential templates, data layouts, and data formats persisted to local SQLite database +- Access Control Decisions + - Privilege-based access control using DoorAccessPriv and CredPrivBinding + - Door-specific privilege checking (precision access and privilege group elements) + - Schedule enforcement with SchedRestriction (time-of-day, day-of-week) + - Credential status checks: disabled, not yet effective, expired + - Access granted and denied events reported to host with appropriate EvtSubCode +- Door Control + - Door strike actuation on access grant with configurable strike time from DoorConfig + - Extended strike time support via credential DoorAccessModifiers (extDoorTime flag) + - Request to Exit (REX) with configurable activateStrikeOnRex + - Door momentary unlock via DevActionReq from host + - Door mode support: unlocked, locked, card-only + - Default door mode applied from DoorConfig on door creation + - Runtime door mode change via DevActionReq (DoorModeChange) from host, including reset-to-default + - REX behavior respects current door mode +- Door Alarm Monitoring + - Door state reporting: unlocked, locked, opened, closed + - Door forced open detection with DoorForced/DoorNotForced events + - Door held open detection with DoorHeld/DoorNotHeld events + - Extended held time support via credential extDoorTime flag + +## TODO ## + +### Aporta - Self hosted web management - - SSL required by default **(Done)** - A master password to gain access - OSDP Driver - - Install new devices with security channel encryption **(Done)** - - Process standard Wiegand card reads **(Done)** - - Detect if device is online **(Done)** - - Control output **(Done)** - Notify when input is tripped - - Access Control - - Enroll new cardholder **(Done)** +- Access Control - Basic access level assignment - - Read entire card data for card number **(Done)** - - Card number is a non-reversible hash **(Done)** - - Log access events **(Done)** + +### Z9/Open Community Profile +- Holiday calendar support in schedule evaluation +- Element-level schedules +- Holiday support +- PIN support ## Installation ## @@ -96,50 +141,6 @@ _appsettings.Production.json_ - Location for Aporta settings } ``` -## Z9/Open Community Profile Integration - -This fork adds support for the [Z9/Open Community Profile](https://z9security.com), allowing Aporta to operate as a managed community controller under a host. Aporta connects outbound to the host over TCP using protobuf messaging, receives its full configuration (credentials, privileges, schedules, devices), and reports events back. - -### Connection & Protocol -- Outbound TCP connection from panel to host (panel-initiates model) -- Protobuf-based Z9/Open Community protocol with identification handshake -- Automatic configuration download on connect (DbChange messages) - -### Device Management -- OSDP credential readers over TCP/IP, configured from Z9/Open Community Profile Dev messages -- Door model with strike actuator, door contact sensor, and REX sensor — all wired automatically from the device hierarchy -- Credential reader online/offline status reporting - -### Credential & Data Format Support -- Credential mapping from Z9/Open Community Profile Cred objects (card number, facility code, enabled/disabled, effective/expiry dates) -- Credentials stored by card number; card reads decoded using Z9/Open Community Profile DataFormat definitions to extract and match by card number -- Credential templates, data layouts, and data formats persisted to local SQLite database - -### Access Control Decisions -- Privilege-based access control using DoorAccessPriv and CredPrivBinding -- Door-specific privilege checking (precision access and privilege group elements) -- Schedule enforcement with SchedRestriction (time-of-day, day-of-week) -- Holiday calendar support in schedule evaluation -- Credential status checks: disabled, not yet effective, expired -- Access granted and denied events reported to host with appropriate EvtSubCode (NO_PRIV, INACTIVE, NOT_EFFECTIVE, EXPIRED, OUTSIDE_SCHED, UNKNOWN_CRED_NUM) - -### Door Control -- Door strike actuation on access grant with configurable strike time from DoorConfig -- Extended strike time support via credential DoorAccessModifiers (extDoorTime flag) -- Request to Exit (REX) with configurable activateStrikeOnRex -- Door momentary unlock via DevActionReq from host -- Door mode support: unlocked (strike permanently on, bypasses access control), locked (denies all access), card-only (normal access control) -- Default door mode applied from DoorConfig on door creation -- Runtime door mode change via DevActionReq (DoorModeChange) from host, including reset-to-default -- Pin-based modes (card+pin, pin-only, card-or-pin) mapped to card-only until pin support is implemented -- REX behavior respects current door mode (no unlock action in unlocked or locked modes) - -### Door Alarm Monitoring -- Door state reporting: unlocked, locked, opened, closed -- Door forced open detection (door opens without strike active) with DoorForced/DoorNotForced events -- Door held open detection (door stays open past configured heldTime) with DoorHeld/DoorNotHeld events -- Extended held time support via credential extDoorTime flag - ## Aporta Housekeeping General information about configuring and setting up the Aporta project for development and running locally. From 512815b1735997640ac4bdcfd50d40dadbba5d09 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 09:41:51 -0500 Subject: [PATCH 43/86] Enforce element-level schedule restrictions on DoorAccessPrivElements CheckDoorAccessPrivElements now checks each matching element's SchedRestriction via IsInSchedule(), returning a tuple so the caller can distinguish "door not in privilege" from "door found but outside element schedule." This closes the gap where element-level schedules were downloaded but ignored at access decision time. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Services/AccessService.cs | 54 ++++++++++++++++++----- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 213b29d..aed1572 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -623,8 +623,8 @@ async Task ControlStrike() // Check if this is a door access privilege if (priv.PrivType == PrivType.Door && priv.Enabled) { - // Check if any DoorAccessPrivElement matches our door - bool doorMatches = await CheckDoorAccessPrivElements(priv, z9DoorUnid); + // Check if any DoorAccessPrivElement matches our door and element schedule + var (doorMatches, outsideElementSchedule) = await CheckDoorAccessPrivElements(priv, z9DoorUnid); if (!doorMatches) { _logger.LogDebug("Credential {Unid} has privilege {PrivName} but it doesn't include door {DoorUnid}", @@ -634,6 +634,13 @@ async Task ControlStrike() foundValidPrivilege = true; + if (outsideElementSchedule) + { + _logger.LogDebug("Credential {Unid} has privilege {PrivName} but outside element schedule", + credentialUnid, priv.Name); + continue; // Try other bindings + } + // Check schedule restriction on the binding if (!await IsInSchedule(binding.SchedRestriction)) { @@ -642,8 +649,6 @@ async Task ControlStrike() continue; // Try other bindings } - // TODO: Also check element-level schedule restrictions - _logger.LogDebug("Credential {Unid} has door access privilege {PrivUnid} ({PrivName})", credentialUnid, priv.Unid, priv.Name); return null; // Access granted @@ -665,16 +670,17 @@ async Task ControlStrike() } /// - /// Checks if a DoorAccessPriv includes the specified door. + /// Checks if a DoorAccessPriv includes the specified door and whether the element-level schedule allows access. + /// Returns (doorMatches: true if any element covers this door, outsideElementSchedule: true if door matched but all matching elements denied by schedule). /// - private Task CheckDoorAccessPrivElements(Priv priv, int? z9DoorUnid) + private async Task<(bool doorMatches, bool outsideElementSchedule)> CheckDoorAccessPrivElements(Priv priv, int? z9DoorUnid) { var doorAccessPriv = priv.ExtDoorAccessPriv; if (doorAccessPriv == null || doorAccessPriv.Elements == null || doorAccessPriv.Elements.Count == 0) { // No elements means no doors covered _logger.LogDebug("DoorAccessPriv {PrivUnid} has no elements", priv.Unid); - return Task.FromResult(false); + return (false, false); } // If we don't know the Z9 door unid, we can't do door-specific checking @@ -682,18 +688,21 @@ private Task CheckDoorAccessPrivElements(Priv priv, int? z9DoorUnid) if (!z9DoorUnid.HasValue) { _logger.LogDebug("No Z9 door unid available, allowing any DoorAccessPriv element"); - return Task.FromResult(true); + return (true, false); } + bool anyDoorMatch = false; + foreach (var element in doorAccessPriv.Elements) { + bool matchesDoor = false; + // Check if element specifies a door if (element.DoorUnidCase == DoorAccessPrivElement.DoorUnidOneofCase.DoorUnid) { if (element.DoorUnid == z9DoorUnid.Value) { - _logger.LogDebug("DoorAccessPrivElement matches door {DoorUnid}", z9DoorUnid.Value); - return Task.FromResult(true); + matchesDoor = true; } } else @@ -701,12 +710,33 @@ private Task CheckDoorAccessPrivElements(Priv priv, int? z9DoorUnid) // Element has no specific door - means "all doors" // (community profile doesn't support devGroup or controlledArea) _logger.LogDebug("DoorAccessPrivElement has no specific door, treating as 'all doors'"); - return Task.FromResult(true); + matchesDoor = true; } + + if (matchesDoor) + { + anyDoorMatch = true; + + // Check element-level schedule restriction + if (await IsInSchedule(element.SchedRestriction)) + { + _logger.LogDebug("DoorAccessPrivElement matches door {DoorUnid} and is in schedule", z9DoorUnid.Value); + return (true, false); + } + + _logger.LogDebug("DoorAccessPrivElement matches door {DoorUnid} but outside element schedule", z9DoorUnid.Value); + // Continue checking other elements — another may grant via a different schedule + } + } + + if (anyDoorMatch) + { + _logger.LogDebug("All matching DoorAccessPrivElements for door {DoorUnid} are outside schedule", z9DoorUnid.Value); + return (true, true); } _logger.LogDebug("No DoorAccessPrivElement matches door {DoorUnid}", z9DoorUnid.Value); - return Task.FromResult(false); + return (false, false); } /// From 7b0922e25bc9068313079e9feaecb2e55e927ac8 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 12:05:49 -0500 Subject: [PATCH 44/86] Wire holiday support into schedule evaluation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pass holidays from HolRepository to SchedEvaluator.InSched() so that holiday-aware schedule elements are evaluated correctly. The entire holiday pipeline (proto messages, SQLite tables, repositories, DbChange processing, evaluator logic) was already built — only the final wiring in AccessService.IsInSchedule() was missing. Co-Authored-By: Claude Opus 4.6 --- README.md | 7 +++---- src/Aporta.Core/Services/AccessService.cs | 6 ++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cc00c75..2ebae2d 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,9 @@ Aporta doesn't intend to recreate what is already available by existing physical - Access Control Decisions - Privilege-based access control using DoorAccessPriv and CredPrivBinding - Door-specific privilege checking (precision access and privilege group elements) + - Element-level schedule restrictions on DoorAccessPrivElements - Schedule enforcement with SchedRestriction (time-of-day, day-of-week) + - Holiday-aware schedule evaluation - Credential status checks: disabled, not yet effective, expired - Access granted and denied events reported to host with appropriate EvtSubCode - Door Control @@ -71,12 +73,9 @@ Aporta doesn't intend to recreate what is already available by existing physical - OSDP Driver - Notify when input is tripped - Access Control - - Basic access level assignment + - Standalone UI for access level assignment (Z9/Open handles backend privilege management) ### Z9/Open Community Profile -- Holiday calendar support in schedule evaluation -- Element-level schedules -- Holiday support - PIN support ## Installation ## diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index aed1572..66cec57 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -43,6 +43,7 @@ public class AccessService private readonly CredTemplateRepository _credTemplateRepository; private readonly PrivRepository _privRepository; private readonly SchedRepository _schedRepository; + private readonly HolRepository _holRepository; private readonly ConcurrentDictionary _processAccessCredential = new(); private readonly IHubContext _hubContext; private Func _getDoorUnidForEndpoint; @@ -71,6 +72,7 @@ public AccessService(IDataAccess dataAccess, ExtensionService extensionService, _credTemplateRepository = new CredTemplateRepository(dataAccess); _privRepository = new PrivRepository(dataAccess); _schedRepository = new SchedRepository(dataAccess); + _holRepository = new HolRepository(dataAccess); _extensionService = extensionService; _hubContext = hubContext; _logger = logger; @@ -760,8 +762,8 @@ private async Task IsInSchedule(SchedRestriction schedRestriction) return true; } - // TODO: Pass holidays when we have HolRepository - bool inSched = SchedEvaluator.InSched(DateTime.Now, sched, null); + var holidays = await _holRepository.GetAll(); + bool inSched = SchedEvaluator.InSched(DateTime.Now, sched, holidays); // Apply invert flag if (schedRestriction.Invert) From 3621058c253162094f4347641ecc125dc0fd4387 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 14:38:43 -0500 Subject: [PATCH 45/86] Add PIN support: keypad buffering, confirming PIN validation, unique PIN lookup Enable PIN-based door modes (CardAndConfirmingPin, UniquePinOnly, CardOnlyOrUniquePin) that were previously downgraded to CardOnly. OSDPDriver now subscribes to keypad events, buffers PIN entries with a 5s timeout, and combines them with subsequent card reads. AccessService validates confirming PINs against credential data and performs unique PIN lookup across all credentials for PIN-only access. Co-Authored-By: Claude Opus 4.6 --- README.md | 4 +- src/Aporta.Core/Services/AccessService.cs | 99 ++++++++++++++- .../Services/EventReasonMapping.cs | 6 + .../AccessCredentialReceivedEventArgs.cs | 14 +++ src/Aporta.Shared/Models/EventData.cs | 8 +- src/Aporta/Workers/StartupWorker.cs | 9 -- src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs | 117 +++++++++++++++++- 7 files changed, 236 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 2ebae2d..daf9465 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,8 @@ Aporta doesn't intend to recreate what is already available by existing physical - Extended strike time support via credential DoorAccessModifiers (extDoorTime flag) - Request to Exit (REX) with configurable activateStrikeOnRex - Door momentary unlock via DevActionReq from host - - Door mode support: unlocked, locked, card-only + - Door mode support: unlocked, locked, card-only, card+confirming PIN, unique PIN only, card-only or unique PIN + - PIN support: keypad entry buffering, confirming PIN validation, unique PIN lookup - Default door mode applied from DoorConfig on door creation - Runtime door mode change via DevActionReq (DoorModeChange) from host, including reset-to-default - REX behavior respects current door mode @@ -76,7 +77,6 @@ Aporta doesn't intend to recreate what is already available by existing physical - Standalone UI for access level assignment (Z9/Open handles backend privilege management) ### Z9/Open Community Profile -- PIN support ## Installation ## diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 66cec57..45b7f05 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -202,7 +202,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA return; } - var (granted, useExtendedTime) = await IsAccessGranted(eventArgs.Handler.MatchingCardData, matchingDoor, accessPoint); + var (granted, useExtendedTime) = await IsAccessGranted(eventArgs.Handler.MatchingCardData, eventArgs.PinData, doorMode, matchingDoor, accessPoint); if (granted) { // Only open door if strike is assigned - community controllers may not have one @@ -228,10 +228,48 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA } } - private async Task<(bool granted, bool useExtendedTime)> IsAccessGranted(string matchingCardData, Aporta.Shared.Models.Door matchingDoor, Endpoint accessPoint) + private async Task<(bool granted, bool useExtendedTime)> IsAccessGranted(string matchingCardData, string pinData, DoorModeType? doorMode, Aporta.Shared.Models.Door matchingDoor, Endpoint accessPoint) { + // Guard: need at least a card or a PIN + if (matchingCardData == null && pinData == null) + return (false, false); + AssignedCredential assignedCredential; - if (_decodeCardData != null) + + if (matchingCardData == null && pinData != null) + { + // PIN-only path: look up credential by unique PIN + var allZ9Creds = await _z9CredRepository.GetAll(); + var matchingCred = allZ9Creds.FirstOrDefault(c => + c.CardPin?.PinUniqueCase == CardPin.PinUniqueOneofCase.PinUnique && + c.CardPin.PinUnique && + c.CardPin?.PinCase == CardPin.PinOneofCase.Pin && + c.CardPin.Pin == pinData); + + if (matchingCred == null) + { + _logger.LogInformation("Door '{Name}' denied access - unknown unique PIN", matchingDoor.Name); + var evtId = await InsertAccessEvt(EventType.AccessDenied, EventReason.UnknownUniquePin, + new EventData + { + Door = matchingDoor, + Endpoint = accessPoint, + EventReason = EventReason.UnknownUniquePin + }); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, evtId); + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = false, + Reason = EventReason.UnknownUniquePin + }); + return (false, false); + } + + var credNum = SpCoreProtoUtil.ToBigInteger(matchingCred.CardPin.CredNum).ToString(); + assignedCredential = await _credentialRepository.AssignedCredential(credNum); + } + else if (_decodeCardData != null) { // Z9 mode: decode raw bits to credential number, then look up by credNum var decodedCredNum = _decodeCardData(matchingCardData); @@ -471,6 +509,61 @@ await _credentialRepository.Insert(new Credential return (false, false); } + // PIN validation based on door mode + if (doorMode == DoorModeType.CardAndConfirmingPin && matchingCardData != null) + { + var z9CredForPin = await _z9CredRepository.Get(assignedCredential.Id); + if (pinData == null) + { + _logger.LogInformation("Door '{Name}' denied access - no confirming PIN entered", matchingDoor.Name); + eventId = await InsertAccessEvt(EventType.AccessDenied, EventReason.NoConfirmingPin, + new EventData + { + Door = matchingDoor, + Endpoint = accessPoint, + Person = assignedCredential.Person, + EventReason = EventReason.NoConfirmingPin, + CardNumber = matchingCardData + }); + await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = false, + CardNumber = matchingCardData, + PersonName = assignedCredential.Person.FirstName, + Reason = EventReason.NoConfirmingPin + }); + return (false, false); + } + if (z9CredForPin?.CardPin?.PinCase == CardPin.PinOneofCase.Pin && + z9CredForPin.CardPin.Pin != pinData) + { + _logger.LogInformation("Door '{Name}' denied access - incorrect confirming PIN", matchingDoor.Name); + eventId = await InsertAccessEvt(EventType.AccessDenied, EventReason.IncorrectConfirmingPin, + new EventData + { + Door = matchingDoor, + Endpoint = accessPoint, + Person = assignedCredential.Person, + EventReason = EventReason.IncorrectConfirmingPin, + CardNumber = matchingCardData + }); + await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); + AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs + { + EndpointId = accessPoint.DriverEndpointId, + IsGranted = false, + CardNumber = matchingCardData, + PersonName = assignedCredential.Person.FirstName, + Reason = EventReason.IncorrectConfirmingPin + }); + return (false, false); + } + } + // Check if credential has extended door time modifier var useExtendedTime = z9Cred?.DoorAccessModifiers?.ExtDoorTimeCase == DoorAccessModifiers.ExtDoorTimeOneofCase.ExtDoorTime && z9Cred.DoorAccessModifiers.ExtDoorTime; diff --git a/src/Aporta.Core/Services/EventReasonMapping.cs b/src/Aporta.Core/Services/EventReasonMapping.cs index dff64a6..b3b8247 100644 --- a/src/Aporta.Core/Services/EventReasonMapping.cs +++ b/src/Aporta.Core/Services/EventReasonMapping.cs @@ -31,6 +31,9 @@ public static (EvtCode evtCode, EvtSubCode? evtSubCode) ToEvtCodes( EventReason.AccessNotAssigned => EvtSubCode.AccessDeniedNoPriv, EventReason.OutsideSchedule => EvtSubCode.AccessDeniedOutsideSched, EventReason.DoorLocked => EvtSubCode.AccessDeniedDoorModeStaticLocked, + EventReason.UnknownUniquePin => EvtSubCode.AccessDeniedUnknownCredUniquePin, + EventReason.NoConfirmingPin => EvtSubCode.AccessDeniedNoConfirmingPinForCred, + EventReason.IncorrectConfirmingPin => EvtSubCode.AccessDeniedIncorrectConfirmingPin, _ => throw new ArgumentOutOfRangeException(nameof(reason), reason, $"No EvtSubCode mapping for EventReason.{reason}") }; @@ -58,6 +61,9 @@ public static (EventType eventType, EventReason reason) ToEventTypeAndReason( EvtSubCode.AccessDeniedNoPriv => EventReason.NoPrivilege, EvtSubCode.AccessDeniedOutsideSched => EventReason.OutsideSchedule, EvtSubCode.AccessDeniedDoorModeStaticLocked => EventReason.DoorLocked, + EvtSubCode.AccessDeniedUnknownCredUniquePin => EventReason.UnknownUniquePin, + EvtSubCode.AccessDeniedNoConfirmingPinForCred => EventReason.NoConfirmingPin, + EvtSubCode.AccessDeniedIncorrectConfirmingPin => EventReason.IncorrectConfirmingPin, _ => EventReason.None }; diff --git a/src/Aporta.Extensions/Hardware/AccessCredentialReceivedEventArgs.cs b/src/Aporta.Extensions/Hardware/AccessCredentialReceivedEventArgs.cs index 5bf6088..d451dad 100644 --- a/src/Aporta.Extensions/Hardware/AccessCredentialReceivedEventArgs.cs +++ b/src/Aporta.Extensions/Hardware/AccessCredentialReceivedEventArgs.cs @@ -17,6 +17,15 @@ public AccessCredentialReceivedEventArgs(IAccess access, ICredentialReceivedHand Handler = handler; } + /// + /// Represents the event arguments for when an access credential is received with PIN data. + /// + public AccessCredentialReceivedEventArgs(IAccess access, ICredentialReceivedHandler handler, string pinData) + : this(access, handler) + { + PinData = pinData; + } + /// /// The access hardware that handled the card read. /// @@ -26,6 +35,11 @@ public AccessCredentialReceivedEventArgs(IAccess access, ICredentialReceivedHand /// Implementation of an interface that determines if access should be granted. /// public ICredentialReceivedHandler Handler { get; } + + /// + /// PIN data entered via keypad, or null if no keypad entry. + /// + public string PinData { get; } } /// diff --git a/src/Aporta.Shared/Models/EventData.cs b/src/Aporta.Shared/Models/EventData.cs index 09dffc6..36f3577 100644 --- a/src/Aporta.Shared/Models/EventData.cs +++ b/src/Aporta.Shared/Models/EventData.cs @@ -39,5 +39,11 @@ public enum EventReason [Description("Door Locked")] DoorLocked, [Description("No Credential Template")] - NoCredentialTemplate + NoCredentialTemplate, + [Description("Unknown Unique PIN")] + UnknownUniquePin, + [Description("No Confirming PIN")] + NoConfirmingPin, + [Description("Incorrect Confirming PIN")] + IncorrectConfirmingPin } \ No newline at end of file diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 069327a..f50dd4f 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -781,16 +781,7 @@ private async Task ApplyDoorMode(int doorUnid, DoorMode doorMode, Z9OpenCommunit return; } - // Pin-based modes map to CardOnly for now (no pin support) var effectiveMode = doorModeType.Value; - if (effectiveMode == DoorModeType.CardAndConfirmingPin || - effectiveMode == DoorModeType.UniquePinOnly || - effectiveMode == DoorModeType.CardOnlyOrUniquePin) - { - _logger.LogWarning("Door unid={DoorUnid}: pin-based mode {Mode} mapped to CardOnly (TODO: pin support)", - doorUnid, effectiveMode); - effectiveMode = DoorModeType.CardOnly; - } var previousMode = _doorCurrentMode.TryGetValue(doorUnid, out var prev) ? prev : (DoorModeType?)null; _doorCurrentMode[doorUnid] = effectiveMode; diff --git a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs index cfa47a9..e7004f6 100644 --- a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs +++ b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs @@ -4,6 +4,8 @@ using System.IO.Ports; using System.Linq; using System.Security.Cryptography; +using System.Text; +using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; @@ -34,7 +36,9 @@ public class OSDPDriver : IHardwareDriver private readonly List _endpoints = new(); private readonly ConcurrentDictionary _pkocDevices = new(); private readonly ConcurrentDictionary _connections = new(); - + private readonly ConcurrentDictionary<(Guid connectionId, byte address), (string pin, CancellationTokenSource cts)> _pendingPins = new(); + private const int PinBufferTimeoutMs = 5000; + private ControlPanel _panel; private PKOCControlPanel _pkocPanel; private IDataEncryption _dataEncryption; @@ -56,6 +60,7 @@ public void Load(string configuration, IDataEncryption dataEncryption, ILoggerFa _panel.ConnectionStatusChanged += PanelOnConnectionStatusChanged; _panel.RawCardDataReplyReceived += PanelOnRawCardDataReplyReceived; + _panel.KeypadReplyReceived += PanelOnKeypadReplyReceived; _panel.InputStatusReportReplyReceived += PanelOnInputStatusReportReplyReceived; _panel.OutputStatusReportReplyReceived += PanelOnOutputStatusReportReplyReceived; _panel.NakReplyReceived += PanelOnNakReplyReceived; @@ -330,12 +335,27 @@ private void PanelOnRawCardDataReplyReceived(object sender, ControlPanel.RawCard }); if (accessPoint != null) { - _logger.LogInformation("Card read received on {AccessPointName}", accessPoint.Name); + // Try to consume a buffered PIN for this reader + string pin = null; + var key = (eventArgs.ConnectionId, eventArgs.Address); + if (_pendingPins.TryRemove(key, out var pending)) + { + pending.cts.Cancel(); + pending.cts.Dispose(); + pin = pending.pin; + _logger.LogInformation("Card read received on {AccessPointName} with buffered PIN", accessPoint.Name); + } + else + { + _logger.LogInformation("Card read received on {AccessPointName}", accessPoint.Name); + } + + var handler = new WiegandCredentialHandler(eventArgs.RawCardData.Data, eventArgs.RawCardData.BitCount, + accessPoint.Name, _logger); AccessCredentialReceived?.Invoke(this, - new AccessCredentialReceivedEventArgs( - accessPoint, - new WiegandCredentialHandler(eventArgs.RawCardData.Data, eventArgs.RawCardData.BitCount, - accessPoint.Name, _logger))); + pin != null + ? new AccessCredentialReceivedEventArgs(accessPoint, handler, pin) + : new AccessCredentialReceivedEventArgs(accessPoint, handler)); } else { @@ -345,6 +365,90 @@ private void PanelOnRawCardDataReplyReceived(object sender, ControlPanel.RawCard }); } + private void PanelOnKeypadReplyReceived(object sender, ControlPanel.KeypadReplyEventArgs eventArgs) + { + Task.Run(() => + { + // Decode PIN from KeypadData.Data byte[] → ASCII string (filter to digits only) + var pinBuilder = new StringBuilder(); + foreach (var b in eventArgs.KeypadData.Data) + { + if (b >= 0x30 && b <= 0x39) // ASCII digits '0'-'9' + pinBuilder.Append((char)b); + } + var pin = pinBuilder.ToString(); + if (string.IsNullOrEmpty(pin)) + { + _logger.LogDebug("Keypad reply received but no digits found"); + return; + } + + _logger.LogInformation("Keypad entry received: {DigitCount} digits on address {Address}", + pin.Length, eventArgs.Address); + + var key = (eventArgs.ConnectionId, eventArgs.Address); + + // Cancel any previous pending PIN for this reader + if (_pendingPins.TryRemove(key, out var oldPending)) + { + oldPending.cts.Cancel(); + oldPending.cts.Dispose(); + } + + // Buffer the PIN with a timeout + var cts = new CancellationTokenSource(); + _pendingPins[key] = (pin, cts); + + // Start timeout: if no card read arrives, treat as PIN-only entry + _ = Task.Run(async () => + { + try + { + await Task.Delay(PinBufferTimeoutMs, cts.Token); + + // Timeout expired — no card read arrived, treat as PIN-only + if (!_pendingPins.TryRemove(key, out _)) + return; // Already consumed by card read + + var accessPoint = _endpoints.Where(endpoint => endpoint is IAccess).Cast() + .SingleOrDefault(ap => + { + var (portName, address) = ParseEndpointId(ap.Id); + return _portMapping.TryGetValue(portName, out var connId) && + eventArgs.ConnectionId == connId && + address == eventArgs.Address.ToString(); + }); + + if (accessPoint != null) + { + _logger.LogInformation("PIN-only entry on {AccessPointName} (no card within timeout)", accessPoint.Name); + AccessCredentialReceived?.Invoke(this, + new AccessCredentialReceivedEventArgs(accessPoint, new PinOnlyCredentialHandler(), pin)); + } + else + { + _logger.LogWarning("Unable to find access point at address {Address} for PIN-only entry", + eventArgs.Address); + } + } + catch (TaskCanceledException) + { + // PIN was consumed by a card read — normal flow + } + finally + { + cts.Dispose(); + } + }); + }); + } + + private class PinOnlyCredentialHandler : ICredentialReceivedHandler + { + public bool IsValid() => true; + public string MatchingCardData => null; + } + /// /// Parses an endpoint ID to extract port name and address. /// ID format: "{portName}:{address}:{type}{number}" where portName can contain colons (e.g., "localhost:9843"). @@ -537,6 +641,7 @@ public void Unload() _panel.ConnectionStatusChanged -= PanelOnConnectionStatusChanged; _panel.RawCardDataReplyReceived -= PanelOnRawCardDataReplyReceived; + _panel.KeypadReplyReceived -= PanelOnKeypadReplyReceived; _panel.InputStatusReportReplyReceived -= PanelOnInputStatusReportReplyReceived; _panel.OutputStatusReportReplyReceived -= PanelOnOutputStatusReportReplyReceived; _panel.NakReplyReceived -= PanelOnNakReplyReceived; From 5ccf86e7d7d89a3aff4c37240c9804a1da24266b Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 16:11:58 -0500 Subject: [PATCH 46/86] Add Z9/Flex Community REST API with session auth and CRUD endpoints Implements the Z9/Flex Community REST API at /flex/ routes, running in parallel with the existing Aporta API. Includes session-based authentication, generic CRUD base controller, FlexMapper for proto-to-flex conversion, and controllers for all resource types (cred, credTemplate, dev, evt, sched, priv, hol, dataFormat, etc.). Co-Authored-By: Claude Opus 4.6 --- .../Migrations/_0004_AddFlexTables.cs | 38 + .../Repositories/EncryptionKeyRepository.cs | 17 + .../Repositories/Z9DevRepository.cs | 17 + .../DataAccess/SqLiteDataAccess.cs | 3 +- src/Aporta.Core/Models/Flex/FlexCommon.cs | 116 ++ src/Aporta.Core/Models/Flex/FlexCred.cs | 127 ++ src/Aporta.Core/Models/Flex/FlexDataFormat.cs | 138 +++ src/Aporta.Core/Models/Flex/FlexDev.cs | 193 +++ src/Aporta.Core/Models/Flex/FlexEvt.cs | 180 +++ src/Aporta.Core/Models/Flex/FlexHol.cs | 85 ++ src/Aporta.Core/Models/Flex/FlexPriv.cs | 47 + src/Aporta.Core/Models/Flex/FlexSched.cs | 52 + src/Aporta.Core/Services/FlexMapper.cs | 1070 +++++++++++++++++ .../Services/FlexSessionService.cs | 70 ++ .../Z9OpenCommunityProtocolService.cs | 14 + .../Controllers/Flex/FlexActionController.cs | 68 ++ .../Flex/FlexAuthenticateController.cs | 31 + .../Flex/FlexBasicDataLayoutController.cs | 46 + .../Flex/FlexBinaryFormatController.cs | 50 + .../Controllers/Flex/FlexCredController.cs | 26 + .../Flex/FlexCredTemplateController.cs | 26 + .../Flex/FlexCrudControllerBase.cs | 94 ++ .../Flex/FlexDataFormatController.cs | 26 + .../Flex/FlexDataLayoutController.cs | 26 + .../Controllers/Flex/FlexDevController.cs | 115 ++ .../Flex/FlexDoorAccessPrivController.cs | 26 + .../Flex/FlexEncryptionKeyController.cs | 26 + .../Controllers/Flex/FlexEvtController.cs | 51 + .../Controllers/Flex/FlexHolCalController.cs | 26 + .../Controllers/Flex/FlexHolController.cs | 26 + .../Controllers/Flex/FlexHolTypeController.cs | 26 + .../Controllers/Flex/FlexSchedController.cs | 26 + src/Aporta/Filters/FlexAuthFilter.cs | 38 + src/Aporta/Startup.cs | 6 +- .../DataAccess/MigrationTests.cs | 2 +- 35 files changed, 2925 insertions(+), 3 deletions(-) create mode 100644 src/Aporta.Core/DataAccess/Migrations/_0004_AddFlexTables.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/EncryptionKeyRepository.cs create mode 100644 src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs create mode 100644 src/Aporta.Core/Models/Flex/FlexCommon.cs create mode 100644 src/Aporta.Core/Models/Flex/FlexCred.cs create mode 100644 src/Aporta.Core/Models/Flex/FlexDataFormat.cs create mode 100644 src/Aporta.Core/Models/Flex/FlexDev.cs create mode 100644 src/Aporta.Core/Models/Flex/FlexEvt.cs create mode 100644 src/Aporta.Core/Models/Flex/FlexHol.cs create mode 100644 src/Aporta.Core/Models/Flex/FlexPriv.cs create mode 100644 src/Aporta.Core/Models/Flex/FlexSched.cs create mode 100644 src/Aporta.Core/Services/FlexMapper.cs create mode 100644 src/Aporta.Core/Services/FlexSessionService.cs create mode 100644 src/Aporta/Controllers/Flex/FlexActionController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexAuthenticateController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexCredController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexCredTemplateController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs create mode 100644 src/Aporta/Controllers/Flex/FlexDataFormatController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexDataLayoutController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexDevController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexEvtController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexHolCalController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexHolController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexHolTypeController.cs create mode 100644 src/Aporta/Controllers/Flex/FlexSchedController.cs create mode 100644 src/Aporta/Filters/FlexAuthFilter.cs diff --git a/src/Aporta.Core/DataAccess/Migrations/_0004_AddFlexTables.cs b/src/Aporta.Core/DataAccess/Migrations/_0004_AddFlexTables.cs new file mode 100644 index 0000000..83143e9 --- /dev/null +++ b/src/Aporta.Core/DataAccess/Migrations/_0004_AddFlexTables.cs @@ -0,0 +1,38 @@ +using System.Data; +using System.Threading.Tasks; +using Dapper; + +namespace Aporta.Core.DataAccess.Migrations; + +public class _0004_AddFlexTables : IMigration +{ + public int Version => 104; + + public string Name => "Add tables for Z9/Flex Community REST API"; + + public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) + { + await connection.ExecuteAsync( + @" + -- Z9 Device table (stores full Dev proto messages) + CREATE TABLE z9_dev ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Encryption Key table + CREATE TABLE encryption_key ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Flex session table (for REST API authentication) + CREATE TABLE flex_session ( + token TEXT NOT NULL PRIMARY KEY, + username TEXT NOT NULL, + created_at TEXT NOT NULL + ); + ", + transaction: transaction); + } +} diff --git a/src/Aporta.Core/DataAccess/Repositories/EncryptionKeyRepository.cs b/src/Aporta.Core/DataAccess/Repositories/EncryptionKeyRepository.cs new file mode 100644 index 0000000..c90022f --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/EncryptionKeyRepository.cs @@ -0,0 +1,17 @@ +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +public class EncryptionKeyRepository : ProtoJsonRepository +{ + private readonly IDataAccess _dataAccess; + + public EncryptionKeyRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "encryption_key"; + protected override int GetUnid(EncryptionKey message) => message.Unid; +} diff --git a/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs b/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs new file mode 100644 index 0000000..6825a9b --- /dev/null +++ b/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs @@ -0,0 +1,17 @@ +using Z9.Spcore.Proto; + +namespace Aporta.Core.DataAccess.Repositories; + +public class Z9DevRepository : ProtoJsonRepository +{ + private readonly IDataAccess _dataAccess; + + public Z9DevRepository(IDataAccess dataAccess) + { + _dataAccess = dataAccess; + } + + protected override IDataAccess DataAccess => _dataAccess; + protected override string TableName => "z9_dev"; + protected override int GetUnid(Dev message) => message.Unid; +} diff --git a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs index cec8c67..d7e85e1 100644 --- a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs +++ b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs @@ -21,7 +21,8 @@ public class SqLiteDataAccess : IDataAccess new _0000_InitialCreate(), new _0001_AddZ9OpenTables(), new _0002_AddZ9CredTable(), - new _0003_AddZ9EvtTable() + new _0003_AddZ9EvtTable(), + new _0004_AddFlexTables() }; /// diff --git a/src/Aporta.Core/Models/Flex/FlexCommon.cs b/src/Aporta.Core/Models/Flex/FlexCommon.cs new file mode 100644 index 0000000..bb8642a --- /dev/null +++ b/src/Aporta.Core/Models/Flex/FlexCommon.cs @@ -0,0 +1,116 @@ +using System.Collections.Generic; +using System.Text.Json.Serialization; + +namespace Aporta.Core.Models.Flex; + +public class FlexObjRef +{ + [JsonPropertyName("type")] + public string Type { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("externalId")] + public string ExternalId { get; set; } +} + +public class FlexListResponse +{ + [JsonPropertyName("offset")] + public int Offset { get; set; } + + [JsonPropertyName("max")] + public int Max { get; set; } + + [JsonPropertyName("count")] + public int Count { get; set; } + + [JsonPropertyName("instanceList")] + public List InstanceList { get; set; } = new(); +} + +public class FlexInstanceResponse +{ + [JsonPropertyName("instance")] + public T Instance { get; set; } +} + +public class FlexVoid +{ +} + +public class FlexAuthenticateRequest +{ + [JsonPropertyName("username")] + public string Username { get; set; } + + [JsonPropertyName("password")] + public string Password { get; set; } + + [JsonPropertyName("apiClientType")] + public int? ApiClientType { get; set; } +} + +public class FlexAuthenticateResult +{ + [JsonPropertyName("authenticated")] + public bool Authenticated { get; set; } + + [JsonPropertyName("sessionToken")] + public string SessionToken { get; set; } + + [JsonPropertyName("evtDevRef")] + public FlexEvtDevRef EvtDevRef { get; set; } + + [JsonPropertyName("softwareVersion")] + public string SoftwareVersion { get; set; } + + [JsonPropertyName("softwareVersionTimestamp")] + public string SoftwareVersionTimestamp { get; set; } + + [JsonPropertyName("timeZone")] + public string TimeZone { get; set; } + + [JsonPropertyName("apiVersion")] + public string ApiVersion { get; set; } +} + +public class FlexDoorAccessModifiers +{ + [JsonPropertyName("extDoorTime")] + public bool? ExtDoorTime { get; set; } +} + +public class FlexSchedRestriction +{ + [JsonPropertyName("sched")] + public FlexObjRef Sched { get; set; } + + [JsonPropertyName("invert")] + public bool? Invert { get; set; } +} + +public class FlexDoorMode +{ + [JsonPropertyName("staticState")] + public int? StaticState { get; set; } + + [JsonPropertyName("allowUniquePin")] + public bool? AllowUniquePin { get; set; } + + [JsonPropertyName("allowCard")] + public bool? AllowCard { get; set; } + + [JsonPropertyName("requireConfirmingPinWithCard")] + public bool? RequireConfirmingPinWithCard { get; set; } +} diff --git a/src/Aporta.Core/Models/Flex/FlexCred.cs b/src/Aporta.Core/Models/Flex/FlexCred.cs new file mode 100644 index 0000000..e4be47d --- /dev/null +++ b/src/Aporta.Core/Models/Flex/FlexCred.cs @@ -0,0 +1,127 @@ +using System.Collections.Generic; +using System.Text.Json.Serialization; + +namespace Aporta.Core.Models.Flex; + +public class FlexCred +{ + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("enabled")] + public bool? Enabled { get; set; } + + [JsonPropertyName("effective")] + public string Effective { get; set; } + + [JsonPropertyName("expires")] + public string Expires { get; set; } + + [JsonPropertyName("credTemplate")] + public FlexObjRef CredTemplate { get; set; } + + [JsonPropertyName("cardPin")] + public FlexCardPin CardPin { get; set; } + + [JsonPropertyName("doorAccessModifiers")] + public FlexDoorAccessModifiers DoorAccessModifiers { get; set; } + + [JsonPropertyName("privBindings")] + public List PrivBindings { get; set; } +} + +public class FlexCardPin +{ + [JsonPropertyName("credNum")] + public string CredNum { get; set; } + + [JsonPropertyName("facilityCode")] + public int? FacilityCode { get; set; } + + [JsonPropertyName("pin")] + public string Pin { get; set; } + + [JsonPropertyName("pinUnique")] + public bool? PinUnique { get; set; } +} + +public class FlexCredPrivBinding +{ + [JsonPropertyName("schedRestriction")] + public FlexSchedRestriction SchedRestriction { get; set; } + + [JsonPropertyName("priv")] + public FlexObjRef Priv { get; set; } + + [JsonPropertyName("devAsDoorAccessPriv")] + public FlexObjRef DevAsDoorAccessPriv { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } +} + +public class FlexCredTemplate +{ + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("cardPinTemplate")] + public FlexCardPinTemplate CardPinTemplate { get; set; } + + [JsonPropertyName("priority")] + public int? Priority { get; set; } +} + +public class FlexCardPinTemplate +{ + [JsonPropertyName("credComponentPresence")] + public int? CredComponentPresence { get; set; } + + [JsonPropertyName("credNumPresence")] + public int? CredNumPresence { get; set; } + + [JsonPropertyName("pinPresence")] + public int? PinPresence { get; set; } + + [JsonPropertyName("pinUnique")] + public bool? PinUnique { get; set; } + + [JsonPropertyName("minPinLength")] + public int? MinPinLength { get; set; } + + [JsonPropertyName("maxPinLength")] + public int? MaxPinLength { get; set; } + + [JsonPropertyName("facilityCode")] + public int? FacilityCode { get; set; } + + [JsonPropertyName("dataLayout")] + public FlexObjRef DataLayout { get; set; } + + [JsonPropertyName("anyDataLayout")] + public bool? AnyDataLayout { get; set; } +} diff --git a/src/Aporta.Core/Models/Flex/FlexDataFormat.cs b/src/Aporta.Core/Models/Flex/FlexDataFormat.cs new file mode 100644 index 0000000..8265157 --- /dev/null +++ b/src/Aporta.Core/Models/Flex/FlexDataFormat.cs @@ -0,0 +1,138 @@ +using System.Collections.Generic; +using System.Text.Json.Serialization; + +namespace Aporta.Core.Models.Flex; + +public class FlexDataFormat +{ + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("dataFormatType")] + public int? DataFormatType { get; set; } + + // BinaryFormat extension (dataFormatType == 1) + [JsonPropertyName("minBits")] + public int? MinBits { get; set; } + + [JsonPropertyName("maxBits")] + public int? MaxBits { get; set; } + + [JsonPropertyName("elements")] + public List Elements { get; set; } + + [JsonPropertyName("supportReverseRead")] + public bool? SupportReverseRead { get; set; } +} + +public class FlexBinaryElement +{ + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("num")] + public int? Num { get; set; } + + [JsonPropertyName("type")] + public int? Type { get; set; } + + [JsonPropertyName("start")] + public int? Start { get; set; } + + [JsonPropertyName("len")] + public int? Len { get; set; } + + // FieldBinaryElement (type == 2) + [JsonPropertyName("field")] + public int? Field { get; set; } + + [JsonPropertyName("staticValue")] + public string StaticValue { get; set; } + + // ParityBinaryElement (type == 1) + [JsonPropertyName("odd")] + public bool? Odd { get; set; } + + [JsonPropertyName("srcStart")] + public int? SrcStart { get; set; } + + [JsonPropertyName("srcLen")] + public int? SrcLen { get; set; } + + [JsonPropertyName("mask")] + public string Mask { get; set; } + + // StaticBinaryElement (type == 0) + [JsonPropertyName("value")] + public string Value { get; set; } +} + +public class FlexDataLayout +{ + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("layoutType")] + public int? LayoutType { get; set; } + + [JsonPropertyName("priority")] + public int? Priority { get; set; } + + [JsonPropertyName("enabled")] + public bool? Enabled { get; set; } + + // BasicDataLayout extension (layoutType == 0) + [JsonPropertyName("dataFormat")] + public FlexObjRef DataFormat { get; set; } +} + +public class FlexEncryptionKey +{ + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("algorithm")] + public string Algorithm { get; set; } + + [JsonPropertyName("size")] + public int? Size { get; set; } + + [JsonPropertyName("keyIdentifier")] + public string KeyIdentifier { get; set; } + + [JsonPropertyName("bytes")] + public string Bytes { get; set; } +} diff --git a/src/Aporta.Core/Models/Flex/FlexDev.cs b/src/Aporta.Core/Models/Flex/FlexDev.cs new file mode 100644 index 0000000..dff3c0f --- /dev/null +++ b/src/Aporta.Core/Models/Flex/FlexDev.cs @@ -0,0 +1,193 @@ +using System.Collections.Generic; +using System.Text.Json.Serialization; + +namespace Aporta.Core.Models.Flex; + +public class FlexDev +{ + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("externalId")] + public string ExternalId { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("address")] + public string Address { get; set; } + + [JsonPropertyName("logicalAddress")] + public int? LogicalAddress { get; set; } + + [JsonPropertyName("macAddress")] + public string MacAddress { get; set; } + + [JsonPropertyName("enabled")] + public bool? Enabled { get; set; } + + [JsonPropertyName("port")] + public int? Port { get; set; } + + [JsonPropertyName("speed")] + public int? Speed { get; set; } + + [JsonPropertyName("devType")] + public int? DevType { get; set; } + + [JsonPropertyName("devSubType")] + public int? DevSubType { get; set; } + + [JsonPropertyName("devMod")] + public int? DevMod { get; set; } + + [JsonPropertyName("devPlatform")] + public int? DevPlatform { get; set; } + + [JsonPropertyName("devUse")] + public int? DevUse { get; set; } + + [JsonPropertyName("devModConfig")] + public FlexDevModConfig DevModConfig { get; set; } + + [JsonPropertyName("physicalParent")] + public FlexObjRef PhysicalParent { get; set; } + + [JsonPropertyName("logicalParent")] + public FlexObjRef LogicalParent { get; set; } + + [JsonPropertyName("timeZone")] + public string TimeZone { get; set; } + + [JsonPropertyName("ignoreDaylightSavings")] + public bool? IgnoreDaylightSavings { get; set; } + + [JsonPropertyName("logicalChildren")] + public List LogicalChildren { get; set; } + + [JsonPropertyName("physicalChildren")] + public List PhysicalChildren { get; set; } + + // Type-specific config (polymorphic based on devType) + [JsonPropertyName("doorConfig")] + public FlexDoorConfig DoorConfig { get; set; } + + [JsonPropertyName("credReaderConfig")] + public FlexCredReaderConfig CredReaderConfig { get; set; } + + [JsonPropertyName("controllerConfig")] + public FlexControllerConfig ControllerConfig { get; set; } + + [JsonPropertyName("actuatorConfig")] + public FlexActuatorConfig ActuatorConfig { get; set; } + + [JsonPropertyName("sensorConfig")] + public FlexSensorConfig SensorConfig { get; set; } + + [JsonPropertyName("nodeDevConfig")] + public FlexNodeDevConfig NodeDevConfig { get; set; } +} + +public class FlexDevModConfig +{ + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("type")] + public int? Type { get; set; } +} + +public class FlexBaseDevConfig +{ + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("username")] + public string Username { get; set; } + + [JsonPropertyName("password")] + public string Password { get; set; } + + [JsonPropertyName("devInitiatesConnection")] + public bool? DevInitiatesConnection { get; set; } + + [JsonPropertyName("encryptionKeyRef")] + public FlexObjRef EncryptionKeyRef { get; set; } + + [JsonPropertyName("encryptionKeyRefNext")] + public FlexObjRef EncryptionKeyRefNext { get; set; } + + [JsonPropertyName("disableEncryption")] + public bool? DisableEncryption { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } +} + +public class FlexDoorConfig : FlexBaseDevConfig +{ + [JsonPropertyName("defaultDoorMode")] + public FlexDoorMode DefaultDoorMode { get; set; } + + [JsonPropertyName("activateStrikeOnRex")] + public bool? ActivateStrikeOnRex { get; set; } + + [JsonPropertyName("strikeTime")] + public int? StrikeTime { get; set; } + + [JsonPropertyName("extendedStrikeTime")] + public int? ExtendedStrikeTime { get; set; } + + [JsonPropertyName("heldTime")] + public int? HeldTime { get; set; } + + [JsonPropertyName("extendedHeldTime")] + public int? ExtendedHeldTime { get; set; } +} + +public class FlexCredReaderConfig : FlexBaseDevConfig +{ + [JsonPropertyName("commType")] + public int? CommType { get; set; } + + [JsonPropertyName("tamperType")] + public int? TamperType { get; set; } + + [JsonPropertyName("ledType")] + public int? LedType { get; set; } + + [JsonPropertyName("serialPortAddress")] + public string SerialPortAddress { get; set; } +} + +public class FlexControllerConfig : FlexBaseDevConfig +{ +} + +public class FlexActuatorConfig : FlexBaseDevConfig +{ + [JsonPropertyName("invert")] + public bool? Invert { get; set; } +} + +public class FlexSensorConfig : FlexBaseDevConfig +{ + [JsonPropertyName("invert")] + public bool? Invert { get; set; } +} + +public class FlexNodeDevConfig : FlexBaseDevConfig +{ +} diff --git a/src/Aporta.Core/Models/Flex/FlexEvt.cs b/src/Aporta.Core/Models/Flex/FlexEvt.cs new file mode 100644 index 0000000..ef46685 --- /dev/null +++ b/src/Aporta.Core/Models/Flex/FlexEvt.cs @@ -0,0 +1,180 @@ +using System.Text.Json.Serialization; + +namespace Aporta.Core.Models.Flex; + +public class FlexEvt +{ + [JsonPropertyName("unid")] + public long? Unid { get; set; } + + [JsonPropertyName("hwTime")] + public string HwTime { get; set; } + + [JsonPropertyName("dbTime")] + public string DbTime { get; set; } + + [JsonPropertyName("hwTimeZone")] + public string HwTimeZone { get; set; } + + [JsonPropertyName("evtCode")] + public int? EvtCode { get; set; } + + [JsonPropertyName("externalEvtCodeText")] + public string ExternalEvtCodeText { get; set; } + + [JsonPropertyName("externalEvtCodeId")] + public string ExternalEvtCodeId { get; set; } + + [JsonPropertyName("evtSubCode")] + public int? EvtSubCode { get; set; } + + [JsonPropertyName("externalSubCodeText")] + public string ExternalSubCodeText { get; set; } + + [JsonPropertyName("externalSubCodeId")] + public string ExternalSubCodeId { get; set; } + + [JsonPropertyName("evtModifiers")] + public FlexEvtModifiers EvtModifiers { get; set; } + + [JsonPropertyName("priority")] + public int? Priority { get; set; } + + [JsonPropertyName("data")] + public string Data { get; set; } + + [JsonPropertyName("evtDevRef")] + public FlexEvtDevRef EvtDevRef { get; set; } + + [JsonPropertyName("evtControllerRef")] + public FlexEvtDevRef EvtControllerRef { get; set; } + + [JsonPropertyName("evtCredRef")] + public FlexEvtCredRef EvtCredRef { get; set; } + + [JsonPropertyName("evtSchedRef")] + public FlexEvtSchedRef EvtSchedRef { get; set; } + + [JsonPropertyName("consumed")] + public bool? Consumed { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } +} + +public class FlexEvtModifiers +{ + [JsonPropertyName("usedCard")] + public bool? UsedCard { get; set; } + + [JsonPropertyName("usedPin")] + public bool? UsedPin { get; set; } +} + +public class FlexEvtDevRef +{ + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("logicalAddress")] + public int? LogicalAddress { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("address")] + public string Address { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("externalId")] + public string ExternalId { get; set; } + + [JsonPropertyName("devPlatform")] + public int? DevPlatform { get; set; } + + [JsonPropertyName("devType")] + public int? DevType { get; set; } + + [JsonPropertyName("devSubType")] + public int? DevSubType { get; set; } + + [JsonPropertyName("devMod")] + public int? DevMod { get; set; } + + [JsonPropertyName("devUse")] + public int? DevUse { get; set; } + + [JsonPropertyName("externalDevTypeText")] + public string ExternalDevTypeText { get; set; } + + [JsonPropertyName("externalDevTypeId")] + public string ExternalDevTypeId { get; set; } + + [JsonPropertyName("externalDevModText")] + public string ExternalDevModText { get; set; } + + [JsonPropertyName("externalDevModId")] + public string ExternalDevModId { get; set; } +} + +public class FlexEvtCredRef +{ + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("credTemplateRef")] + public FlexEvtCredTemplateRef CredTemplateRef { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("credNum")] + public string CredNum { get; set; } + + [JsonPropertyName("facilityCode")] + public int? FacilityCode { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } +} + +public class FlexEvtCredTemplateRef +{ + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } +} + +public class FlexEvtSchedRef +{ + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("invert")] + public bool? Invert { get; set; } +} diff --git a/src/Aporta.Core/Models/Flex/FlexHol.cs b/src/Aporta.Core/Models/Flex/FlexHol.cs new file mode 100644 index 0000000..f34c7c6 --- /dev/null +++ b/src/Aporta.Core/Models/Flex/FlexHol.cs @@ -0,0 +1,85 @@ +using System.Collections.Generic; +using System.Text.Json.Serialization; + +namespace Aporta.Core.Models.Flex; + +public class FlexHol +{ + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("holTypes")] + public List HolTypes { get; set; } + + [JsonPropertyName("allHolTypes")] + public bool? AllHolTypes { get; set; } + + [JsonPropertyName("date")] + public string Date { get; set; } + + [JsonPropertyName("numDays")] + public int? NumDays { get; set; } + + [JsonPropertyName("repeat")] + public bool? Repeat { get; set; } + + [JsonPropertyName("numYearsRepeat")] + public int? NumYearsRepeat { get; set; } + + [JsonPropertyName("preserveSchedDay")] + public bool? PreserveSchedDay { get; set; } + + [JsonPropertyName("holCal")] + public FlexObjRef HolCal { get; set; } +} + +public class FlexHolCal +{ + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } +} + +public class FlexHolType +{ + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("externalId")] + public string ExternalId { get; set; } +} diff --git a/src/Aporta.Core/Models/Flex/FlexPriv.cs b/src/Aporta.Core/Models/Flex/FlexPriv.cs new file mode 100644 index 0000000..523491d --- /dev/null +++ b/src/Aporta.Core/Models/Flex/FlexPriv.cs @@ -0,0 +1,47 @@ +using System.Collections.Generic; +using System.Text.Json.Serialization; + +namespace Aporta.Core.Models.Flex; + +public class FlexPriv +{ + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("externalId")] + public string ExternalId { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("enabled")] + public bool? Enabled { get; set; } + + [JsonPropertyName("privType")] + public int? PrivType { get; set; } + + // DoorAccessPriv extension (privType == 0) + [JsonPropertyName("elements")] + public List Elements { get; set; } +} + +public class FlexDoorAccessPrivElement +{ + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("door")] + public FlexObjRef Door { get; set; } + + [JsonPropertyName("schedRestriction")] + public FlexSchedRestriction SchedRestriction { get; set; } +} diff --git a/src/Aporta.Core/Models/Flex/FlexSched.cs b/src/Aporta.Core/Models/Flex/FlexSched.cs new file mode 100644 index 0000000..8399a4f --- /dev/null +++ b/src/Aporta.Core/Models/Flex/FlexSched.cs @@ -0,0 +1,52 @@ +using System.Collections.Generic; +using System.Text.Json.Serialization; + +namespace Aporta.Core.Models.Flex; + +public class FlexSched +{ + [JsonPropertyName("version")] + public int? Version { get; set; } + + [JsonPropertyName("tag")] + public string Tag { get; set; } + + [JsonPropertyName("uuid")] + public string Uuid { get; set; } + + [JsonPropertyName("name")] + public string Name { get; set; } + + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("externalId")] + public string ExternalId { get; set; } + + [JsonPropertyName("elements")] + public List Elements { get; set; } +} + +public class FlexSchedElement +{ + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("schedDays")] + public List SchedDays { get; set; } + + [JsonPropertyName("holidays")] + public bool? Holidays { get; set; } + + [JsonPropertyName("holTypes")] + public List HolTypes { get; set; } + + [JsonPropertyName("start")] + public string Start { get; set; } + + [JsonPropertyName("stop")] + public string Stop { get; set; } + + [JsonPropertyName("plusDays")] + public int? PlusDays { get; set; } +} diff --git a/src/Aporta.Core/Services/FlexMapper.cs b/src/Aporta.Core/Services/FlexMapper.cs new file mode 100644 index 0000000..d5246e1 --- /dev/null +++ b/src/Aporta.Core/Services/FlexMapper.cs @@ -0,0 +1,1070 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Numerics; +using Aporta.Core.Models.Flex; +using Google.Protobuf; +using Z9.Protobuf; +using Z9.Spcore.Proto; + +namespace Aporta.Core.Services; + +public static class FlexMapper +{ + // --- ObjRef helpers --- + + public static FlexObjRef MakeObjRef(string type, int unid, string name = null, string uuid = null, string tag = null, string externalId = null) + { + return new FlexObjRef { Type = type, Unid = unid, Name = name, Uuid = uuid, Tag = tag, ExternalId = externalId }; + } + + // --- DateTime helpers --- + + public static string DateTimeDataToIso(DateTimeData dt) + { + if (dt == null) return null; + return DateTimeOffset.FromUnixTimeMilliseconds(dt.Millis).UtcDateTime.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"); + } + + public static DateTimeData IsoToDateTimeData(string iso) + { + if (string.IsNullOrEmpty(iso)) return null; + if (DateTimeOffset.TryParse(iso, out var dto)) + return new DateTimeData { Millis = dto.ToUnixTimeMilliseconds() }; + return null; + } + + public static string SqlDateToIso(SqlDateData d) + { + if (d == null) return null; + return $"{d.Year:D4}-{d.Month:D2}-{d.Day:D2}"; + } + + public static SqlDateData IsoToSqlDate(string iso) + { + if (string.IsNullOrEmpty(iso)) return null; + if (DateTime.TryParse(iso, out var dt)) + return new SqlDateData { Year = dt.Year, Month = dt.Month, Day = dt.Day }; + return null; + } + + public static string SqlTimeToString(SqlTimeData t) + { + if (t == null) return null; + return $"{t.Hour:D2}:{t.Minute:D2}:{t.Second:D2}"; + } + + public static SqlTimeData StringToSqlTime(string s) + { + if (string.IsNullOrEmpty(s)) return null; + if (TimeSpan.TryParse(s, out var ts)) + return new SqlTimeData { Hour = ts.Hours, Minute = ts.Minutes, Second = ts.Seconds }; + return null; + } + + // --- BigInteger helpers --- + + public static string BigIntegerDataToString(BigIntegerData data) + { + if (data == null || data.BytesCase == BigIntegerData.BytesOneofCase.None) return null; + return SpCoreProtoUtil.ToBigInteger(data).ToString(); + } + + public static BigIntegerData StringToBigIntegerData(string s) + { + if (string.IsNullOrEmpty(s)) return null; + if (BigInteger.TryParse(s, out var val)) + return SpCoreProtoUtil.ToBigIntegerData(val); + return null; + } + + // --- Cred --- + + public static FlexCred ToFlex(Cred proto, Func lookupRef = null) + { + var flex = new FlexCred + { + Version = proto.Version, + Tag = proto.Tag, + Uuid = proto.Uuid, + Unid = proto.Unid, + Name = proto.Name, + Enabled = proto.Enabled, + Effective = proto.Effective != null ? DateTimeDataToIso(proto.Effective) : null, + Expires = proto.Expires != null ? DateTimeDataToIso(proto.Expires) : null, + }; + + if (proto.CredTemplateUnid != 0) + flex.CredTemplate = lookupRef?.Invoke(proto.CredTemplateUnid, "credTemplate") ?? MakeObjRef("credTemplate", proto.CredTemplateUnid); + + if (proto.CardPin != null) + flex.CardPin = ToFlexCardPin(proto.CardPin); + + if (proto.DoorAccessModifiers != null) + flex.DoorAccessModifiers = new FlexDoorAccessModifiers + { + ExtDoorTime = proto.DoorAccessModifiers.ExtDoorTimeCase == DoorAccessModifiers.ExtDoorTimeOneofCase.ExtDoorTime + ? proto.DoorAccessModifiers.ExtDoorTime : null + }; + + if (proto.PrivBindings.Count > 0) + { + flex.PrivBindings = proto.PrivBindings.Select(pb => ToFlexCredPrivBinding(pb, lookupRef)).ToList(); + } + + return flex; + } + + public static Cred ToProto(FlexCred flex) + { + var proto = new Cred + { + Version = flex.Version ?? 0, + Tag = flex.Tag ?? "", + Uuid = flex.Uuid ?? "", + Unid = flex.Unid ?? 0, + Name = flex.Name ?? "", + Enabled = flex.Enabled ?? true, + }; + + if (flex.Effective != null) + proto.Effective = IsoToDateTimeData(flex.Effective); + if (flex.Expires != null) + proto.Expires = IsoToDateTimeData(flex.Expires); + if (flex.CredTemplate?.Unid != null) + proto.CredTemplateUnid = flex.CredTemplate.Unid.Value; + + if (flex.CardPin != null) + proto.CardPin = ToProtoCardPin(flex.CardPin); + + if (flex.DoorAccessModifiers != null) + { + proto.DoorAccessModifiers = new DoorAccessModifiers(); + if (flex.DoorAccessModifiers.ExtDoorTime.HasValue) + proto.DoorAccessModifiers.ExtDoorTime = flex.DoorAccessModifiers.ExtDoorTime.Value; + } + + if (flex.PrivBindings != null) + { + foreach (var pb in flex.PrivBindings) + proto.PrivBindings.Add(ToProtoCredPrivBinding(pb)); + } + + return proto; + } + + private static FlexCardPin ToFlexCardPin(CardPin cp) + { + return new FlexCardPin + { + CredNum = BigIntegerDataToString(cp.CredNum), + FacilityCode = cp.FacilityCodeCase == CardPin.FacilityCodeOneofCase.FacilityCode ? cp.FacilityCode : null, + Pin = cp.Pin, + PinUnique = cp.PinUniqueCase == CardPin.PinUniqueOneofCase.PinUnique ? cp.PinUnique : null, + }; + } + + private static CardPin ToProtoCardPin(FlexCardPin flex) + { + var cp = new CardPin + { + Pin = flex.Pin ?? "", + }; + if (flex.CredNum != null) + cp.CredNum = StringToBigIntegerData(flex.CredNum); + if (flex.FacilityCode.HasValue) + cp.FacilityCode = flex.FacilityCode.Value; + if (flex.PinUnique.HasValue) + cp.PinUnique = flex.PinUnique.Value; + return cp; + } + + private static FlexCredPrivBinding ToFlexCredPrivBinding(CredPrivBinding pb, Func lookupRef) + { + var flex = new FlexCredPrivBinding + { + Unid = pb.Unid, + }; + + if (pb.PrivUnid != 0) + flex.Priv = lookupRef?.Invoke(pb.PrivUnid, "priv") ?? MakeObjRef("priv", pb.PrivUnid); + + if (pb.DevAsDoorAccessPrivUnidCase == CredPrivBinding.DevAsDoorAccessPrivUnidOneofCase.DevAsDoorAccessPrivUnid) + flex.DevAsDoorAccessPriv = lookupRef?.Invoke(pb.DevAsDoorAccessPrivUnid, "dev") ?? MakeObjRef("dev", pb.DevAsDoorAccessPrivUnid); + + if (pb.SchedRestriction != null) + flex.SchedRestriction = ToFlexSchedRestriction(pb.SchedRestriction, lookupRef); + + return flex; + } + + private static CredPrivBinding ToProtoCredPrivBinding(FlexCredPrivBinding flex) + { + var pb = new CredPrivBinding { Unid = flex.Unid ?? 0 }; + if (flex.Priv?.Unid != null) pb.PrivUnid = flex.Priv.Unid.Value; + if (flex.DevAsDoorAccessPriv?.Unid != null) pb.DevAsDoorAccessPrivUnid = flex.DevAsDoorAccessPriv.Unid.Value; + if (flex.SchedRestriction != null) + pb.SchedRestriction = ToProtoSchedRestriction(flex.SchedRestriction); + return pb; + } + + // --- SchedRestriction --- + + private static FlexSchedRestriction ToFlexSchedRestriction(SchedRestriction sr, Func lookupRef) + { + var flex = new FlexSchedRestriction + { + Invert = sr.Invert, + }; + if (sr.SchedUnidCase == SchedRestriction.SchedUnidOneofCase.SchedUnid) + flex.Sched = lookupRef?.Invoke(sr.SchedUnid, "sched") ?? MakeObjRef("sched", sr.SchedUnid); + return flex; + } + + private static SchedRestriction ToProtoSchedRestriction(FlexSchedRestriction flex) + { + var sr = new SchedRestriction { Invert = flex.Invert ?? false }; + if (flex.Sched?.Unid != null) sr.SchedUnid = flex.Sched.Unid.Value; + return sr; + } + + // --- CredTemplate --- + + public static FlexCredTemplate ToFlex(CredTemplate proto, Func lookupRef = null) + { + var flex = new FlexCredTemplate + { + Version = proto.Version, + Tag = proto.Tag, + Uuid = proto.Uuid, + Name = proto.Name, + Unid = proto.Unid, + Priority = proto.Priority, + }; + + if (proto.CardPinTemplate != null) + flex.CardPinTemplate = ToFlexCardPinTemplate(proto.CardPinTemplate, lookupRef); + + return flex; + } + + public static CredTemplate ToProto(FlexCredTemplate flex) + { + var proto = new CredTemplate + { + Version = flex.Version ?? 0, + Tag = flex.Tag ?? "", + Uuid = flex.Uuid ?? "", + Name = flex.Name ?? "", + Unid = flex.Unid ?? 0, + Priority = flex.Priority ?? 0, + }; + + if (flex.CardPinTemplate != null) + proto.CardPinTemplate = ToProtoCardPinTemplate(flex.CardPinTemplate); + + return proto; + } + + private static FlexCardPinTemplate ToFlexCardPinTemplate(CardPinTemplate cpt, Func lookupRef) + { + var flex = new FlexCardPinTemplate + { + CredComponentPresence = (int)cpt.CredComponentPresence, + CredNumPresence = (int)cpt.CredNumPresence, + PinPresence = (int)cpt.PinPresence, + PinUnique = cpt.PinUniqueCase == CardPinTemplate.PinUniqueOneofCase.PinUnique ? cpt.PinUnique : null, + MinPinLength = cpt.MinPinLength, + MaxPinLength = cpt.MaxPinLength, + FacilityCode = cpt.FacilityCode, + AnyDataLayout = cpt.AnyDataLayout, + }; + + if (cpt.DataLayoutUnid != 0) + flex.DataLayout = lookupRef?.Invoke(cpt.DataLayoutUnid, "dataLayout") ?? MakeObjRef("dataLayout", cpt.DataLayoutUnid); + + return flex; + } + + private static CardPinTemplate ToProtoCardPinTemplate(FlexCardPinTemplate flex) + { + var cpt = new CardPinTemplate + { + CredComponentPresence = (CredComponentPresence)(flex.CredComponentPresence ?? 0), + CredNumPresence = (CredComponentPresence)(flex.CredNumPresence ?? 0), + PinPresence = (CredComponentPresence)(flex.PinPresence ?? 0), + MinPinLength = flex.MinPinLength ?? 0, + MaxPinLength = flex.MaxPinLength ?? 0, + FacilityCode = flex.FacilityCode ?? 0, + AnyDataLayout = flex.AnyDataLayout ?? false, + }; + if (flex.PinUnique.HasValue) cpt.PinUnique = flex.PinUnique.Value; + if (flex.DataLayout?.Unid != null) cpt.DataLayoutUnid = flex.DataLayout.Unid.Value; + return cpt; + } + + // --- Evt --- + + public static FlexEvt ToFlex(Evt proto) + { + var flex = new FlexEvt + { + Unid = proto.Unid, + HwTime = DateTimeDataToIso(proto.HwTime), + DbTime = DateTimeDataToIso(proto.DbTime), + HwTimeZone = proto.HwTimeZone, + EvtCode = (int)proto.EvtCode, + ExternalEvtCodeText = string.IsNullOrEmpty(proto.ExternalEvtCodeText) ? null : proto.ExternalEvtCodeText, + ExternalEvtCodeId = string.IsNullOrEmpty(proto.ExternalEvtCodeId) ? null : proto.ExternalEvtCodeId, + EvtSubCode = proto.EvtSubCodeCase == Evt.EvtSubCodeOneofCase.EvtSubCode ? (int)proto.EvtSubCode : null, + ExternalSubCodeText = string.IsNullOrEmpty(proto.ExternalSubCodeText) ? null : proto.ExternalSubCodeText, + ExternalSubCodeId = string.IsNullOrEmpty(proto.ExternalSubCodeId) ? null : proto.ExternalSubCodeId, + Priority = proto.Priority, + Data = string.IsNullOrEmpty(proto.Data) ? null : proto.Data, + Consumed = proto.Consumed, + Uuid = string.IsNullOrEmpty(proto.Uuid) ? null : proto.Uuid, + }; + + if (proto.EvtModifiers != null) + flex.EvtModifiers = new FlexEvtModifiers + { + UsedCard = proto.EvtModifiers.UsedCardCase == EvtModifiers.UsedCardOneofCase.UsedCard ? proto.EvtModifiers.UsedCard : null, + UsedPin = proto.EvtModifiers.UsedPinCase == EvtModifiers.UsedPinOneofCase.UsedPin ? proto.EvtModifiers.UsedPin : null, + }; + + if (proto.EvtDevRef != null) + flex.EvtDevRef = ToFlexEvtDevRef(proto.EvtDevRef); + + if (proto.EvtControllerRef != null) + flex.EvtControllerRef = ToFlexEvtDevRef(proto.EvtControllerRef); + + if (proto.EvtCredRef != null) + flex.EvtCredRef = ToFlexEvtCredRef(proto.EvtCredRef); + + if (proto.EvtSchedRef != null) + flex.EvtSchedRef = ToFlexEvtSchedRef(proto.EvtSchedRef); + + return flex; + } + + private static FlexEvtDevRef ToFlexEvtDevRef(EvtDevRef r) + { + return new FlexEvtDevRef + { + Unid = r.Unid, + LogicalAddress = r.LogicalAddress, + Name = r.Name, + Address = r.Address, + Tag = r.Tag, + Uuid = r.Uuid, + ExternalId = r.ExternalId, + DevPlatform = (int)r.DevPlatform, + DevType = (int)r.DevType, + DevSubType = (int)r.DevSubType, + DevMod = (int)r.DevMod, + DevUse = (int)r.DevUse, + ExternalDevTypeText = string.IsNullOrEmpty(r.ExternalDevTypeText) ? null : r.ExternalDevTypeText, + ExternalDevTypeId = string.IsNullOrEmpty(r.ExternalDevTypeId) ? null : r.ExternalDevTypeId, + ExternalDevModText = string.IsNullOrEmpty(r.ExternalDevModText) ? null : r.ExternalDevModText, + ExternalDevModId = string.IsNullOrEmpty(r.ExternalDevModId) ? null : r.ExternalDevModId, + }; + } + + private static FlexEvtCredRef ToFlexEvtCredRef(EvtCredRef r) + { + return new FlexEvtCredRef + { + Unid = r.Unid, + CredTemplateRef = r.CredTemplateRef != null ? new FlexEvtCredTemplateRef + { + Unid = r.CredTemplateRef.Unid, + Name = r.CredTemplateRef.Name, + Tag = r.CredTemplateRef.Tag, + Uuid = r.CredTemplateRef.Uuid, + } : null, + Name = r.Name, + CredNum = BigIntegerDataToString(r.CredNum), + FacilityCode = r.FacilityCode, + Tag = r.Tag, + Uuid = r.Uuid, + }; + } + + private static FlexEvtSchedRef ToFlexEvtSchedRef(EvtSchedRef r) + { + return new FlexEvtSchedRef + { + Unid = r.Unid, + Name = r.Name, + Tag = r.Tag, + Uuid = r.Uuid, + Invert = r.Invert, + }; + } + + // --- Dev --- + + public static FlexDev ToFlex(Dev proto, Func lookupRef = null) + { + var flex = new FlexDev + { + Version = proto.Version, + Tag = proto.Tag, + Uuid = proto.Uuid, + Name = proto.Name, + ExternalId = proto.ExternalId, + Unid = proto.Unid, + Address = proto.Address, + LogicalAddress = proto.LogicalAddressCase == Dev.LogicalAddressOneofCase.LogicalAddress ? proto.LogicalAddress : null, + MacAddress = string.IsNullOrEmpty(proto.MacAddress) ? null : proto.MacAddress, + Enabled = proto.Enabled, + Port = proto.Port, + Speed = proto.Speed, + DevType = (int)proto.DevType, + DevSubType = (int)proto.DevSubType, + DevMod = (int)proto.DevMod, + DevPlatform = (int)proto.DevPlatform, + DevUse = (int)proto.DevUse, + TimeZone = string.IsNullOrEmpty(proto.TimeZone) ? null : proto.TimeZone, + IgnoreDaylightSavings = proto.IgnoreDaylightSavings, + }; + + if (proto.PhysicalParentUnid != 0) + flex.PhysicalParent = lookupRef?.Invoke(proto.PhysicalParentUnid, "dev") ?? MakeObjRef("dev", proto.PhysicalParentUnid); + if (proto.LogicalParentUnid != 0) + flex.LogicalParent = lookupRef?.Invoke(proto.LogicalParentUnid, "dev") ?? MakeObjRef("dev", proto.LogicalParentUnid); + + if (proto.LogicalChildrenUnid.Count > 0) + flex.LogicalChildren = proto.LogicalChildrenUnid.Select(u => lookupRef?.Invoke(u, "dev") ?? MakeObjRef("dev", u)).ToList(); + if (proto.PhysicalChildrenUnid.Count > 0) + flex.PhysicalChildren = proto.PhysicalChildrenUnid.Select(u => lookupRef?.Invoke(u, "dev") ?? MakeObjRef("dev", u)).ToList(); + + if (proto.DevModConfig != null) + flex.DevModConfig = new FlexDevModConfig + { + Unid = proto.DevModConfig.Unid, + Version = proto.DevModConfig.Version, + Type = (int)proto.DevModConfig.Type, + }; + + // Type-specific extension + switch (proto.ExtensionCase) + { + case Dev.ExtensionOneofCase.ExtDoor: + flex.DoorConfig = ToFlexDoorConfig(proto.ExtDoor, lookupRef); + break; + case Dev.ExtensionOneofCase.ExtCredReader: + flex.CredReaderConfig = ToFlexCredReaderConfig(proto.ExtCredReader, lookupRef); + break; + case Dev.ExtensionOneofCase.ExtController: + flex.ControllerConfig = ToFlexControllerConfig(proto.ExtController, lookupRef); + break; + case Dev.ExtensionOneofCase.ExtActuator: + flex.ActuatorConfig = ToFlexActuatorConfig(proto.ExtActuator, lookupRef); + break; + case Dev.ExtensionOneofCase.ExtSensor: + flex.SensorConfig = ToFlexSensorConfig(proto.ExtSensor, lookupRef); + break; + } + + return flex; + } + + public static Dev ToProto(FlexDev flex) + { + var proto = new Dev + { + Version = flex.Version ?? 0, + Tag = flex.Tag ?? "", + Uuid = flex.Uuid ?? "", + Name = flex.Name ?? "", + ExternalId = flex.ExternalId ?? "", + Unid = flex.Unid ?? 0, + Address = flex.Address ?? "", + Enabled = flex.Enabled ?? true, + Port = flex.Port ?? 0, + Speed = flex.Speed ?? 0, + DevType = (DevType)(flex.DevType ?? 0), + DevSubType = (DevSubType)(flex.DevSubType ?? 0), + DevMod = (DevMod)(flex.DevMod ?? 0), + DevPlatform = (DevPlatform)(flex.DevPlatform ?? 0), + DevUse = (DevUse)(flex.DevUse ?? 0), + TimeZone = flex.TimeZone ?? "", + IgnoreDaylightSavings = flex.IgnoreDaylightSavings ?? false, + }; + + if (flex.LogicalAddress.HasValue) proto.LogicalAddress = flex.LogicalAddress.Value; + if (flex.MacAddress != null) proto.MacAddress = flex.MacAddress; + if (flex.PhysicalParent?.Unid != null) proto.PhysicalParentUnid = flex.PhysicalParent.Unid.Value; + if (flex.LogicalParent?.Unid != null) proto.LogicalParentUnid = flex.LogicalParent.Unid.Value; + + if (flex.LogicalChildren != null) + foreach (var c in flex.LogicalChildren.Where(c => c.Unid.HasValue)) + proto.LogicalChildrenUnid.Add(c.Unid.Value); + if (flex.PhysicalChildren != null) + foreach (var c in flex.PhysicalChildren.Where(c => c.Unid.HasValue)) + proto.PhysicalChildrenUnid.Add(c.Unid.Value); + + return proto; + } + + private static FlexDoorConfig ToFlexDoorConfig(Z9.Spcore.Proto.Door door, Func lookupRef) + { + var config = door.DoorConfig; + if (config == null) return null; + var flex = new FlexDoorConfig + { + Version = config.Version, + Username = config.Username, + Password = config.Password, + DevInitiatesConnection = config.DevInitiatesConnectionCase == DoorConfig.DevInitiatesConnectionOneofCase.DevInitiatesConnection ? config.DevInitiatesConnection : null, + DisableEncryption = config.DisableEncryptionCase == DoorConfig.DisableEncryptionOneofCase.DisableEncryption ? config.DisableEncryption : null, + ActivateStrikeOnRex = config.ActivateStrikeOnRexCase == DoorConfig.ActivateStrikeOnRexOneofCase.ActivateStrikeOnRex ? config.ActivateStrikeOnRex : null, + StrikeTime = config.StrikeTimeCase == DoorConfig.StrikeTimeOneofCase.StrikeTime ? config.StrikeTime : null, + ExtendedStrikeTime = config.ExtendedStrikeTimeCase == DoorConfig.ExtendedStrikeTimeOneofCase.ExtendedStrikeTime ? config.ExtendedStrikeTime : null, + HeldTime = config.HeldTimeCase == DoorConfig.HeldTimeOneofCase.HeldTime ? config.HeldTime : null, + ExtendedHeldTime = config.ExtendedHeldTimeCase == DoorConfig.ExtendedHeldTimeOneofCase.ExtendedHeldTime ? config.ExtendedHeldTime : null, + }; + + if (config.DefaultDoorMode != null) + flex.DefaultDoorMode = ToFlexDoorMode(config.DefaultDoorMode); + + if (config.EncryptionKeyRefUnid != 0) + flex.EncryptionKeyRef = lookupRef?.Invoke(config.EncryptionKeyRefUnid, "encryptionKey") ?? MakeObjRef("encryptionKey", config.EncryptionKeyRefUnid); + if (config.EncryptionKeyRefNextUnid != 0) + flex.EncryptionKeyRefNext = lookupRef?.Invoke(config.EncryptionKeyRefNextUnid, "encryptionKey") ?? MakeObjRef("encryptionKey", config.EncryptionKeyRefNextUnid); + + return flex; + } + + private static FlexCredReaderConfig ToFlexCredReaderConfig(CredReader cr, Func lookupRef) + { + var config = cr.CredReaderConfig; + if (config == null) return null; + return new FlexCredReaderConfig + { + Version = config.Version, + Username = config.Username, + Password = config.Password, + DevInitiatesConnection = config.DevInitiatesConnectionCase == CredReaderConfig.DevInitiatesConnectionOneofCase.DevInitiatesConnection ? config.DevInitiatesConnection : null, + DisableEncryption = config.DisableEncryptionCase == CredReaderConfig.DisableEncryptionOneofCase.DisableEncryption ? config.DisableEncryption : null, + CommType = (int)config.CommType, + TamperType = (int)config.TamperType, + LedType = (int)config.LedType, + SerialPortAddress = string.IsNullOrEmpty(config.SerialPortAddress) ? null : config.SerialPortAddress, + }; + } + + private static FlexControllerConfig ToFlexControllerConfig(Controller ctrl, Func lookupRef) + { + var config = ctrl.ControllerConfig; + if (config == null) return null; + return new FlexControllerConfig + { + Version = config.Version, + Username = config.Username, + Password = config.Password, + DevInitiatesConnection = config.DevInitiatesConnectionCase == ControllerConfig.DevInitiatesConnectionOneofCase.DevInitiatesConnection ? config.DevInitiatesConnection : null, + DisableEncryption = config.DisableEncryptionCase == ControllerConfig.DisableEncryptionOneofCase.DisableEncryption ? config.DisableEncryption : null, + }; + } + + private static FlexActuatorConfig ToFlexActuatorConfig(Actuator act, Func lookupRef) + { + var config = act.ActuatorConfig; + if (config == null) return null; + return new FlexActuatorConfig + { + Version = config.Version, + Username = config.Username, + Password = config.Password, + DevInitiatesConnection = config.DevInitiatesConnectionCase == ActuatorConfig.DevInitiatesConnectionOneofCase.DevInitiatesConnection ? config.DevInitiatesConnection : null, + DisableEncryption = config.DisableEncryptionCase == ActuatorConfig.DisableEncryptionOneofCase.DisableEncryption ? config.DisableEncryption : null, + Invert = config.InvertCase == ActuatorConfig.InvertOneofCase.Invert ? config.Invert : null, + }; + } + + private static FlexSensorConfig ToFlexSensorConfig(Sensor sensor, Func lookupRef) + { + var config = sensor.SensorConfig; + if (config == null) return null; + return new FlexSensorConfig + { + Version = config.Version, + Username = config.Username, + Password = config.Password, + DevInitiatesConnection = config.DevInitiatesConnectionCase == SensorConfig.DevInitiatesConnectionOneofCase.DevInitiatesConnection ? config.DevInitiatesConnection : null, + DisableEncryption = config.DisableEncryptionCase == SensorConfig.DisableEncryptionOneofCase.DisableEncryption ? config.DisableEncryption : null, + Invert = config.InvertCase == SensorConfig.InvertOneofCase.Invert ? config.Invert : null, + }; + } + + public static FlexDoorMode ToFlexDoorMode(DoorMode dm) + { + return new FlexDoorMode + { + StaticState = (int)dm.StaticState, + AllowUniquePin = dm.AllowUniquePinCase == DoorMode.AllowUniquePinOneofCase.AllowUniquePin ? dm.AllowUniquePin : null, + AllowCard = dm.AllowCardCase == DoorMode.AllowCardOneofCase.AllowCard ? dm.AllowCard : null, + RequireConfirmingPinWithCard = dm.RequireConfirmingPinWithCardCase == DoorMode.RequireConfirmingPinWithCardOneofCase.RequireConfirmingPinWithCard ? dm.RequireConfirmingPinWithCard : null, + }; + } + + // --- Priv (DoorAccessPriv) --- + + public static FlexPriv ToFlex(Priv proto, Func lookupRef = null) + { + var flex = new FlexPriv + { + Version = proto.Version, + Tag = proto.Tag, + Uuid = proto.Uuid, + Name = proto.Name, + ExternalId = proto.ExternalId, + Unid = proto.Unid, + Enabled = proto.Enabled, + PrivType = (int)proto.PrivType, + }; + + if (proto.ExtensionCase == Priv.ExtensionOneofCase.ExtDoorAccessPriv && proto.ExtDoorAccessPriv.Elements.Count > 0) + { + flex.Elements = proto.ExtDoorAccessPriv.Elements.Select(e => new FlexDoorAccessPrivElement + { + Unid = e.Unid, + Door = e.DoorUnidCase == DoorAccessPrivElement.DoorUnidOneofCase.DoorUnid + ? (lookupRef?.Invoke(e.DoorUnid, "door") ?? MakeObjRef("door", e.DoorUnid)) + : null, + SchedRestriction = e.SchedRestriction != null ? ToFlexSchedRestriction(e.SchedRestriction, lookupRef) : null, + }).ToList(); + } + + return flex; + } + + public static Priv ToProto(FlexPriv flex) + { + var proto = new Priv + { + Version = flex.Version ?? 0, + Tag = flex.Tag ?? "", + Uuid = flex.Uuid ?? "", + Name = flex.Name ?? "", + ExternalId = flex.ExternalId ?? "", + Unid = flex.Unid ?? 0, + Enabled = flex.Enabled ?? true, + PrivType = (PrivType)(flex.PrivType ?? 0), + }; + + if (flex.Elements != null) + { + var dap = new DoorAccessPriv(); + foreach (var e in flex.Elements) + { + var elem = new DoorAccessPrivElement { Unid = e.Unid ?? 0 }; + if (e.Door?.Unid != null) elem.DoorUnid = e.Door.Unid.Value; + if (e.SchedRestriction != null) + elem.SchedRestriction = ToProtoSchedRestriction(e.SchedRestriction); + dap.Elements.Add(elem); + } + proto.ExtDoorAccessPriv = dap; + } + + return proto; + } + + // --- Sched --- + + public static FlexSched ToFlex(Sched proto, Func lookupRef = null) + { + var flex = new FlexSched + { + Version = proto.Version, + Tag = proto.Tag, + Uuid = proto.Uuid, + Name = proto.Name, + Unid = proto.Unid, + ExternalId = proto.ExternalId, + }; + + if (proto.Elements.Count > 0) + { + flex.Elements = proto.Elements.Select(e => + { + var se = new FlexSchedElement + { + Unid = e.Unid, + SchedDays = e.SchedDays.Select(d => (int)d).ToList(), + Holidays = e.Holidays, + Start = SqlTimeToString(e.Start), + Stop = SqlTimeToString(e.Stop), + PlusDays = e.PlusDays, + }; + if (e.HolTypesUnid.Count > 0) + se.HolTypes = e.HolTypesUnid.Select(u => lookupRef?.Invoke(u, "holType") ?? MakeObjRef("holType", u)).ToList(); + return se; + }).ToList(); + } + + return flex; + } + + public static Sched ToProto(FlexSched flex) + { + var proto = new Sched + { + Version = flex.Version ?? 0, + Tag = flex.Tag ?? "", + Uuid = flex.Uuid ?? "", + Name = flex.Name ?? "", + Unid = flex.Unid ?? 0, + ExternalId = flex.ExternalId ?? "", + }; + + if (flex.Elements != null) + { + foreach (var e in flex.Elements) + { + var se = new SchedElement + { + Unid = e.Unid ?? 0, + Holidays = e.Holidays ?? false, + Start = StringToSqlTime(e.Start) ?? new SqlTimeData(), + Stop = StringToSqlTime(e.Stop) ?? new SqlTimeData(), + PlusDays = e.PlusDays ?? 0, + }; + if (e.SchedDays != null) + foreach (var d in e.SchedDays) + se.SchedDays.Add((SchedDay)d); + if (e.HolTypes != null) + foreach (var ht in e.HolTypes.Where(h => h.Unid.HasValue)) + se.HolTypesUnid.Add(ht.Unid.Value); + proto.Elements.Add(se); + } + } + + return proto; + } + + // --- Hol --- + + public static FlexHol ToFlex(Hol proto, Func lookupRef = null) + { + var flex = new FlexHol + { + Version = proto.Version, + Tag = proto.Tag, + Uuid = proto.Uuid, + Name = proto.Name, + Unid = proto.Unid, + AllHolTypes = proto.AllHolTypes, + Date = SqlDateToIso(proto.Date), + NumDays = proto.NumDays, + Repeat = proto.Repeat, + NumYearsRepeat = proto.NumYearsRepeat, + PreserveSchedDay = proto.PreserveSchedDay, + }; + + if (proto.HolCalUnid != 0) + flex.HolCal = lookupRef?.Invoke(proto.HolCalUnid, "holCal") ?? MakeObjRef("holCal", proto.HolCalUnid); + + if (proto.HolTypesUnid.Count > 0) + flex.HolTypes = proto.HolTypesUnid.Select(u => lookupRef?.Invoke(u, "holType") ?? MakeObjRef("holType", u)).ToList(); + + return flex; + } + + public static Hol ToProto(FlexHol flex) + { + var proto = new Hol + { + Version = flex.Version ?? 0, + Tag = flex.Tag ?? "", + Uuid = flex.Uuid ?? "", + Name = flex.Name ?? "", + Unid = flex.Unid ?? 0, + AllHolTypes = flex.AllHolTypes ?? false, + NumDays = flex.NumDays ?? 1, + Repeat = flex.Repeat ?? false, + NumYearsRepeat = flex.NumYearsRepeat ?? 0, + PreserveSchedDay = flex.PreserveSchedDay ?? false, + }; + + if (flex.Date != null) proto.Date = IsoToSqlDate(flex.Date) ?? new SqlDateData(); + if (flex.HolCal?.Unid != null) proto.HolCalUnid = flex.HolCal.Unid.Value; + if (flex.HolTypes != null) + foreach (var ht in flex.HolTypes.Where(h => h.Unid.HasValue)) + proto.HolTypesUnid.Add(ht.Unid.Value); + + return proto; + } + + // --- HolCal --- + + public static FlexHolCal ToFlex(HolCal proto) + { + return new FlexHolCal + { + Version = proto.Version, + Tag = proto.Tag, + Uuid = proto.Uuid, + Name = proto.Name, + Unid = proto.Unid, + }; + } + + public static HolCal ToProto(FlexHolCal flex) + { + return new HolCal + { + Version = flex.Version ?? 0, + Tag = flex.Tag ?? "", + Uuid = flex.Uuid ?? "", + Name = flex.Name ?? "", + Unid = flex.Unid ?? 0, + }; + } + + // --- HolType --- + + public static FlexHolType ToFlex(HolType proto) + { + return new FlexHolType + { + Version = proto.Version, + Tag = proto.Tag, + Uuid = proto.Uuid, + Name = proto.Name, + Unid = proto.Unid, + ExternalId = proto.ExternalId, + }; + } + + public static HolType ToProto(FlexHolType flex) + { + return new HolType + { + Version = flex.Version ?? 0, + Tag = flex.Tag ?? "", + Uuid = flex.Uuid ?? "", + Name = flex.Name ?? "", + Unid = flex.Unid ?? 0, + ExternalId = flex.ExternalId ?? "", + }; + } + + // --- DataFormat --- + + public static FlexDataFormat ToFlex(DataFormat proto) + { + var flex = new FlexDataFormat + { + Version = proto.Version, + Tag = proto.Tag, + Uuid = proto.Uuid, + Name = proto.Name, + Unid = proto.Unid, + DataFormatType = (int)proto.DataFormatType, + }; + + if (proto.ExtensionCase == DataFormat.ExtensionOneofCase.ExtBinaryFormat) + { + var bf = proto.ExtBinaryFormat; + flex.MinBits = bf.MinBits; + flex.MaxBits = bf.MaxBits; + flex.SupportReverseRead = bf.SupportReverseRead; + if (bf.Elements.Count > 0) + flex.Elements = bf.Elements.Select(ToFlexBinaryElement).ToList(); + } + + return flex; + } + + public static DataFormat ToProto(FlexDataFormat flex) + { + var proto = new DataFormat + { + Version = flex.Version ?? 0, + Tag = flex.Tag ?? "", + Uuid = flex.Uuid ?? "", + Name = flex.Name ?? "", + Unid = flex.Unid ?? 0, + DataFormatType = (DataFormatType)(flex.DataFormatType ?? 0), + }; + + if (flex.DataFormatType == 1) // BINARY + { + var bf = new BinaryFormat + { + MinBits = flex.MinBits ?? 0, + MaxBits = flex.MaxBits ?? 0, + SupportReverseRead = flex.SupportReverseRead ?? false, + }; + if (flex.Elements != null) + foreach (var e in flex.Elements) + bf.Elements.Add(ToProtoBinaryElement(e)); + proto.ExtBinaryFormat = bf; + } + + return proto; + } + + private static FlexBinaryElement ToFlexBinaryElement(BinaryElement e) + { + var flex = new FlexBinaryElement + { + Unid = e.Unid, + Num = e.Num, + Type = (int)e.Type, + Start = e.Start, + Len = e.Len, + }; + + switch (e.ExtensionCase) + { + case BinaryElement.ExtensionOneofCase.ExtFieldBinaryElement: + flex.Field = (int)e.ExtFieldBinaryElement.Field; + flex.StaticValue = BigIntegerDataToString(e.ExtFieldBinaryElement.StaticValue); + break; + case BinaryElement.ExtensionOneofCase.ExtParityBinaryElement: + flex.Odd = e.ExtParityBinaryElement.Odd; + flex.SrcStart = e.ExtParityBinaryElement.SrcStart; + flex.SrcLen = e.ExtParityBinaryElement.SrcLen; + flex.Mask = string.IsNullOrEmpty(e.ExtParityBinaryElement.Mask) ? null : e.ExtParityBinaryElement.Mask; + break; + case BinaryElement.ExtensionOneofCase.ExtStaticBinaryElement: + flex.Value = BigIntegerDataToString(e.ExtStaticBinaryElement.Value); + break; + } + + return flex; + } + + private static BinaryElement ToProtoBinaryElement(FlexBinaryElement flex) + { + var e = new BinaryElement + { + Unid = flex.Unid ?? 0, + Num = flex.Num ?? 0, + Type = (BinaryElementType)(flex.Type ?? 0), + Start = flex.Start ?? 0, + Len = flex.Len ?? 0, + }; + + switch (e.Type) + { + case BinaryElementType.Field: + e.ExtFieldBinaryElement = new FieldBinaryElement + { + Field = (DataFormatField)(flex.Field ?? 0), + }; + if (flex.StaticValue != null) + e.ExtFieldBinaryElement.StaticValue = StringToBigIntegerData(flex.StaticValue); + break; + case BinaryElementType.Parity: + e.ExtParityBinaryElement = new ParityBinaryElement + { + Odd = flex.Odd ?? false, + SrcStart = flex.SrcStart ?? 0, + SrcLen = flex.SrcLen ?? 0, + Mask = flex.Mask ?? "", + }; + break; + case BinaryElementType.Static: + e.ExtStaticBinaryElement = new StaticBinaryElement(); + if (flex.Value != null) + e.ExtStaticBinaryElement.Value = StringToBigIntegerData(flex.Value); + break; + } + + return e; + } + + // --- DataLayout --- + + public static FlexDataLayout ToFlex(DataLayout proto, Func lookupRef = null) + { + var flex = new FlexDataLayout + { + Version = proto.Version, + Tag = proto.Tag, + Uuid = proto.Uuid, + Name = proto.Name, + Unid = proto.Unid, + LayoutType = (int)proto.LayoutType, + Priority = proto.Priority, + Enabled = proto.EnabledCase == DataLayout.EnabledOneofCase.Enabled ? proto.Enabled : null, + }; + + if (proto.ExtensionCase == DataLayout.ExtensionOneofCase.ExtBasicDataLayout) + { + var bdl = proto.ExtBasicDataLayout; + if (bdl.DataFormatUnid != 0) + flex.DataFormat = lookupRef?.Invoke(bdl.DataFormatUnid, "dataFormat") ?? MakeObjRef("dataFormat", bdl.DataFormatUnid); + } + + return flex; + } + + public static DataLayout ToProto(FlexDataLayout flex) + { + var proto = new DataLayout + { + Version = flex.Version ?? 0, + Tag = flex.Tag ?? "", + Uuid = flex.Uuid ?? "", + Name = flex.Name ?? "", + Unid = flex.Unid ?? 0, + LayoutType = (DataLayoutType)(flex.LayoutType ?? 0), + Priority = flex.Priority ?? 0, + }; + if (flex.Enabled.HasValue) proto.Enabled = flex.Enabled.Value; + + if (flex.LayoutType == 0) // BASIC + { + var bdl = new BasicDataLayout(); + if (flex.DataFormat?.Unid != null) + bdl.DataFormatUnid = flex.DataFormat.Unid.Value; + proto.ExtBasicDataLayout = bdl; + } + + return proto; + } + + // --- EncryptionKey --- + + public static FlexEncryptionKey ToFlex(EncryptionKey proto) + { + return new FlexEncryptionKey + { + Unid = proto.Unid, + Tag = proto.Tag, + Uuid = proto.Uuid, + Version = proto.Version, + Algorithm = proto.Algorithm, + Size = proto.Size, + KeyIdentifier = proto.KeyIdentifier, + Bytes = proto.BytesCase == EncryptionKey.BytesOneofCase.Bytes && !proto.Bytes.IsEmpty + ? Convert.ToBase64String(proto.Bytes.ToByteArray()) + : null, + }; + } + + public static EncryptionKey ToProto(FlexEncryptionKey flex) + { + var proto = new EncryptionKey + { + Unid = flex.Unid ?? 0, + Tag = flex.Tag ?? "", + Uuid = flex.Uuid ?? "", + Version = flex.Version ?? 0, + Algorithm = flex.Algorithm ?? "", + Size = flex.Size ?? 0, + KeyIdentifier = flex.KeyIdentifier ?? "", + }; + + if (flex.Bytes != null) + proto.Bytes = ByteString.CopyFrom(Convert.FromBase64String(flex.Bytes)); + + return proto; + } +} diff --git a/src/Aporta.Core/Services/FlexSessionService.cs b/src/Aporta.Core/Services/FlexSessionService.cs new file mode 100644 index 0000000..ce8207a --- /dev/null +++ b/src/Aporta.Core/Services/FlexSessionService.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Concurrent; +using Aporta.Core.Models.Flex; + +namespace Aporta.Core.Services; + +public class FlexSessionService +{ + private readonly ConcurrentDictionary _sessions = new(); + private const int SessionTimeoutMinutes = 30; + + public FlexAuthenticateResult Authenticate(string username, string password) + { + // Default credentials — configurable via global settings in the future + if (username == "admin" && password == "admin") + { + var token = Guid.NewGuid().ToString("N"); + _sessions[token] = new FlexSession + { + Username = username, + CreatedAt = DateTime.UtcNow, + }; + + return new FlexAuthenticateResult + { + Authenticated = true, + SessionToken = token, + SoftwareVersion = "1.0.0", + TimeZone = TimeZoneInfo.Local.Id, + ApiVersion = "1.1", + }; + } + + return new FlexAuthenticateResult + { + Authenticated = false, + }; + } + + public bool ValidateSession(string token) + { + if (string.IsNullOrEmpty(token)) + return false; + + if (!_sessions.TryGetValue(token, out var session)) + return false; + + if (DateTime.UtcNow - session.CreatedAt > TimeSpan.FromMinutes(SessionTimeoutMinutes)) + { + _sessions.TryRemove(token, out _); + return false; + } + + // Refresh the session on each use + session.CreatedAt = DateTime.UtcNow; + return true; + } + + public void Terminate(string token) + { + if (!string.IsNullOrEmpty(token)) + _sessions.TryRemove(token, out _); + } + + private class FlexSession + { + public string Username { get; set; } + public DateTime CreatedAt { get; set; } + } +} diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 0e53047..68788cd 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -34,6 +34,7 @@ public class Z9OpenCommunityProtocolService : IDisposable private readonly HolTypeRepository _holTypeRepository; private readonly Z9CredRepository _z9CredRepository; private readonly Z9EvtRepository _z9EvtRepository; + private readonly Z9DevRepository _z9DevRepository; // Received OSDP CredReader configurations from Z9 private readonly List _osdpReaderConfigs = new(); @@ -118,6 +119,7 @@ public Z9OpenCommunityProtocolService( _holTypeRepository = new HolTypeRepository(dataAccess); _z9CredRepository = new Z9CredRepository(dataAccess); _z9EvtRepository = new Z9EvtRepository(dataAccess); + _z9DevRepository = new Z9DevRepository(dataAccess); } public void Start(string host, int port, string id = null) @@ -495,6 +497,9 @@ private void ProcessDev(Dev dev) { SpCoreProtoUtil.InitRequired(dev); + // Persist to z9_dev table for Z9/Flex REST API + _z9DevRepository.Upsert(dev).GetAwaiter().GetResult(); + if (dev.DevType == DevType.Actuator) { ProcessActuatorDev(dev); @@ -1106,6 +1111,15 @@ private void SendDbChangeResp(long requestId) /// public event EventHandler DevActionRequested; + /// + /// Dispatches a DevActionReq to the same handler as protocol-originated requests. + /// Used by the Z9/Flex REST API to trigger door actions. + /// + public void DispatchDevAction(DevActionReq req) + { + DevActionRequested?.Invoke(this, req); + } + private void HandleDevActionReq(DevActionReq req) { try diff --git a/src/Aporta/Controllers/Flex/FlexActionController.cs b/src/Aporta/Controllers/Flex/FlexActionController.cs new file mode 100644 index 0000000..ffc16af --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexActionController.cs @@ -0,0 +1,68 @@ +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Protobuf; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +public class FlexActionController : ControllerBase +{ + private readonly Z9OpenCommunityProtocolService _protocolService; + + public FlexActionController(Z9OpenCommunityProtocolService protocolService) + { + _protocolService = protocolService; + } + + [HttpGet("flex/json/doorModeChange")] + public IActionResult DoorModeChange([FromQuery] int? unid, [FromQuery] string uuid, [FromQuery] string tag, [FromQuery] string value) + { + var doorUnid = unid ?? 0; + + var req = new DevActionReq + { + RequestId = System.DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), + DevActionType = DevActionType.DoorModeChange, + DevUnid = doorUnid, + }; + + if (string.Equals(value, "RESET", System.StringComparison.OrdinalIgnoreCase)) + { + req.DevActionParams = new DevActionParams + { + Type = DevActionParamsType.DoorMode, + ExtDoorModeDevActionParams = new DoorModeDevActionParams { ResetToDefault = true }, + }; + } + else if (int.TryParse(value, out var modeInt)) + { + var doorMode = CommonDoorModes.ForDoorModeType((DoorModeType)modeInt); + req.DevActionParams = new DevActionParams + { + Type = DevActionParamsType.DoorMode, + ExtDoorModeDevActionParams = new DoorModeDevActionParams { DoorMode = doorMode }, + }; + } + + _protocolService.DispatchDevAction(req); + return Ok(new FlexVoid()); + } + + [HttpGet("flex/json/doorMomentaryUnlock")] + public IActionResult DoorMomentaryUnlock([FromQuery] int? unid, [FromQuery] string uuid, [FromQuery] string tag, [FromQuery] bool? extDoorTime) + { + var doorUnid = unid ?? 0; + + var req = new DevActionReq + { + RequestId = System.DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), + DevActionType = DevActionType.DoorMomentaryUnlock, + DevUnid = doorUnid, + }; + + _protocolService.DispatchDevAction(req); + return Ok(new FlexVoid()); + } +} diff --git a/src/Aporta/Controllers/Flex/FlexAuthenticateController.cs b/src/Aporta/Controllers/Flex/FlexAuthenticateController.cs new file mode 100644 index 0000000..ae20988 --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexAuthenticateController.cs @@ -0,0 +1,31 @@ +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; + +namespace Aporta.Controllers.Flex; + +[ApiController] +public class FlexAuthenticateController : ControllerBase +{ + private readonly FlexSessionService _sessionService; + + public FlexAuthenticateController(FlexSessionService sessionService) + { + _sessionService = sessionService; + } + + [HttpPost("flex/authenticate")] + public IActionResult Authenticate([FromBody] FlexAuthenticateRequest request) + { + var result = _sessionService.Authenticate(request.Username, request.Password); + return Ok(result); + } + + [HttpGet("flex/terminate")] + public IActionResult Terminate() + { + var token = Request.Headers["sessionToken"].ToString(); + _sessionService.Terminate(token); + return Ok(new FlexVoid()); + } +} diff --git a/src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs b/src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs new file mode 100644 index 0000000..46f37fa --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs @@ -0,0 +1,46 @@ +using System.Linq; +using System.Threading.Tasks; +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/basicDataLayout")] +public class FlexBasicDataLayoutController : FlexCrudControllerBase +{ + private readonly DataLayoutRepository _repository; + + public FlexBasicDataLayoutController(IDataAccess dataAccess) + { + _repository = new DataLayoutRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexDataLayout ToFlex(DataLayout proto) => FlexMapper.ToFlex(proto); + protected override DataLayout ToProto(FlexDataLayout flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexDataLayout flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(DataLayout proto) => proto.Uuid; + + [HttpGet("list")] + public override async Task List([FromQuery] int offset = 0, [FromQuery] int max = 50) + { + var all = (await Repository.GetAll()) + .Where(dl => dl.LayoutType == DataLayoutType.Basic) + .ToList(); + var count = all.Count; + var page = all.Skip(offset).Take(max).Select(ToFlex).ToList(); + + return Ok(new FlexListResponse + { + Offset = offset, + Max = max, + Count = count, + InstanceList = page, + }); + } +} diff --git a/src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs b/src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs new file mode 100644 index 0000000..3b3387f --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs @@ -0,0 +1,50 @@ +using System.Linq; +using System.Threading.Tasks; +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +/// +/// BinaryFormat is a subclass of DataFormat with dataFormatType == BINARY (1). +/// This controller filters DataFormats to only those with binary format extensions. +/// +[ApiController] +[Route("flex/binaryFormat")] +public class FlexBinaryFormatController : FlexCrudControllerBase +{ + private readonly DataFormatRepository _repository; + + public FlexBinaryFormatController(IDataAccess dataAccess) + { + _repository = new DataFormatRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexDataFormat ToFlex(DataFormat proto) => FlexMapper.ToFlex(proto); + protected override DataFormat ToProto(FlexDataFormat flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexDataFormat flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(DataFormat proto) => proto.Uuid; + + [HttpGet("list")] + public override async Task List([FromQuery] int offset = 0, [FromQuery] int max = 50) + { + var all = (await Repository.GetAll()) + .Where(df => df.DataFormatType == DataFormatType.Binary) + .ToList(); + var count = all.Count; + var page = all.Skip(offset).Take(max).Select(ToFlex).ToList(); + + return Ok(new FlexListResponse + { + Offset = offset, + Max = max, + Count = count, + InstanceList = page, + }); + } +} diff --git a/src/Aporta/Controllers/Flex/FlexCredController.cs b/src/Aporta/Controllers/Flex/FlexCredController.cs new file mode 100644 index 0000000..93bd033 --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexCredController.cs @@ -0,0 +1,26 @@ +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/cred")] +public class FlexCredController : FlexCrudControllerBase +{ + private readonly Z9CredRepository _repository; + + public FlexCredController(IDataAccess dataAccess) + { + _repository = new Z9CredRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexCred ToFlex(Cred proto) => FlexMapper.ToFlex(proto); + protected override Cred ToProto(FlexCred flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexCred flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(Cred proto) => proto.Uuid; +} diff --git a/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs b/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs new file mode 100644 index 0000000..40f7214 --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs @@ -0,0 +1,26 @@ +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/credTemplate")] +public class FlexCredTemplateController : FlexCrudControllerBase +{ + private readonly CredTemplateRepository _repository; + + public FlexCredTemplateController(IDataAccess dataAccess) + { + _repository = new CredTemplateRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexCredTemplate ToFlex(CredTemplate proto) => FlexMapper.ToFlex(proto); + protected override CredTemplate ToProto(FlexCredTemplate flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexCredTemplate flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(CredTemplate proto) => proto.Uuid; +} diff --git a/src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs b/src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs new file mode 100644 index 0000000..72680b8 --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Google.Protobuf; +using Microsoft.AspNetCore.Mvc; + +namespace Aporta.Controllers.Flex; + +public abstract class FlexCrudControllerBase : ControllerBase + where TProto : IMessage, new() +{ + protected abstract ProtoJsonRepository Repository { get; } + protected abstract TFlex ToFlex(TProto proto); + protected abstract TProto ToProto(TFlex flex); + protected abstract int GetUnid(TFlex flex); + + protected virtual async Task FindByIdString(string id) + { + if (int.TryParse(id, out var unid)) + return await Repository.Get(unid); + + // Try uuid lookup + var all = await Repository.GetAll(); + return all.FirstOrDefault(item => GetUuidFromProto(item) == id); + } + + protected virtual string GetUuidFromProto(TProto proto) => null; + + [HttpGet("list")] + public virtual async Task List([FromQuery] int offset = 0, [FromQuery] int max = 50) + { + var all = (await Repository.GetAll()).ToList(); + var count = all.Count; + var page = all.Skip(offset).Take(max).Select(ToFlex).ToList(); + + return Ok(new FlexListResponse + { + Offset = offset, + Max = max, + Count = count, + InstanceList = page, + }); + } + + [HttpGet("show/{id}")] + public virtual async Task Show(string id) + { + var proto = await FindByIdString(id); + if (proto == null) + return NotFound(); + + return Ok(new FlexInstanceResponse { Instance = ToFlex(proto) }); + } + + [HttpPost("save")] + public virtual async Task Save([FromBody] TFlex body) + { + var proto = ToProto(body); + await Repository.Upsert(proto); + return Ok(new FlexInstanceResponse { Instance = ToFlex(proto) }); + } + + [HttpPost("update/{id}")] + public virtual async Task Update(string id, [FromBody] TFlex body) + { + var existing = await FindByIdString(id); + if (existing == null) + return NotFound(); + + var proto = ToProto(body); + await Repository.Upsert(proto); + return Ok(new FlexInstanceResponse { Instance = ToFlex(proto) }); + } + + [HttpPost("delete/{id}")] + public virtual async Task Delete(string id) + { + if (int.TryParse(id, out var unid)) + { + await Repository.Delete(unid); + return Ok(new FlexVoid()); + } + + var proto = await FindByIdString(id); + if (proto == null) + return NotFound(); + + await Repository.Delete(GetUnid(ToFlex(proto))); + return Ok(new FlexVoid()); + } +} diff --git a/src/Aporta/Controllers/Flex/FlexDataFormatController.cs b/src/Aporta/Controllers/Flex/FlexDataFormatController.cs new file mode 100644 index 0000000..c01a905 --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexDataFormatController.cs @@ -0,0 +1,26 @@ +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/dataFormat")] +public class FlexDataFormatController : FlexCrudControllerBase +{ + private readonly DataFormatRepository _repository; + + public FlexDataFormatController(IDataAccess dataAccess) + { + _repository = new DataFormatRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexDataFormat ToFlex(DataFormat proto) => FlexMapper.ToFlex(proto); + protected override DataFormat ToProto(FlexDataFormat flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexDataFormat flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(DataFormat proto) => proto.Uuid; +} diff --git a/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs b/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs new file mode 100644 index 0000000..9406c13 --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs @@ -0,0 +1,26 @@ +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/dataLayout")] +public class FlexDataLayoutController : FlexCrudControllerBase +{ + private readonly DataLayoutRepository _repository; + + public FlexDataLayoutController(IDataAccess dataAccess) + { + _repository = new DataLayoutRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexDataLayout ToFlex(DataLayout proto) => FlexMapper.ToFlex(proto); + protected override DataLayout ToProto(FlexDataLayout flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexDataLayout flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(DataLayout proto) => proto.Uuid; +} diff --git a/src/Aporta/Controllers/Flex/FlexDevController.cs b/src/Aporta/Controllers/Flex/FlexDevController.cs new file mode 100644 index 0000000..3b856e3 --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexDevController.cs @@ -0,0 +1,115 @@ +using System.Linq; +using System.Threading.Tasks; +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/dev")] +public class FlexDevController : FlexCrudControllerBase +{ + private readonly Z9DevRepository _repository; + + public FlexDevController(IDataAccess dataAccess) + { + _repository = new Z9DevRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexDev ToFlex(Dev proto) => FlexMapper.ToFlex(proto); + protected override Dev ToProto(FlexDev flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexDev flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(Dev proto) => proto.Uuid; +} + +/// +/// Base class for device-type-specific controllers that filter by DevType. +/// +public abstract class FlexDevTypeControllerBase : FlexCrudControllerBase +{ + private readonly Z9DevRepository _repository; + + protected FlexDevTypeControllerBase(IDataAccess dataAccess) + { + _repository = new Z9DevRepository(dataAccess); + } + + protected abstract DevType FilterDevType { get; } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexDev ToFlex(Dev proto) => FlexMapper.ToFlex(proto); + protected override Dev ToProto(FlexDev flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexDev flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(Dev proto) => proto.Uuid; + + [HttpGet("list")] + public override async Task List([FromQuery] int offset = 0, [FromQuery] int max = 50) + { + var all = (await Repository.GetAll()) + .Where(d => d.DevType == FilterDevType) + .ToList(); + var count = all.Count; + var page = all.Skip(offset).Take(max).Select(ToFlex).ToList(); + + return Ok(new FlexListResponse + { + Offset = offset, + Max = max, + Count = count, + InstanceList = page, + }); + } +} + +[ApiController] +[Route("flex/door")] +public class FlexDoorController : FlexDevTypeControllerBase +{ + public FlexDoorController(IDataAccess dataAccess) : base(dataAccess) { } + protected override DevType FilterDevType => DevType.Door; +} + +[ApiController] +[Route("flex/credReader")] +public class FlexCredReaderController : FlexDevTypeControllerBase +{ + public FlexCredReaderController(IDataAccess dataAccess) : base(dataAccess) { } + protected override DevType FilterDevType => DevType.CredReader; +} + +[ApiController] +[Route("flex/controller")] +public class FlexControllerController : FlexDevTypeControllerBase +{ + public FlexControllerController(IDataAccess dataAccess) : base(dataAccess) { } + protected override DevType FilterDevType => DevType.IoController; +} + +[ApiController] +[Route("flex/sensor")] +public class FlexSensorController : FlexDevTypeControllerBase +{ + public FlexSensorController(IDataAccess dataAccess) : base(dataAccess) { } + protected override DevType FilterDevType => DevType.Sensor; +} + +[ApiController] +[Route("flex/actuator")] +public class FlexActuatorController : FlexDevTypeControllerBase +{ + public FlexActuatorController(IDataAccess dataAccess) : base(dataAccess) { } + protected override DevType FilterDevType => DevType.Actuator; +} + +[ApiController] +[Route("flex/nodeDev")] +public class FlexNodeDevController : FlexDevTypeControllerBase +{ + public FlexNodeDevController(IDataAccess dataAccess) : base(dataAccess) { } + protected override DevType FilterDevType => DevType.Reserved0; +} diff --git a/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs b/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs new file mode 100644 index 0000000..59d704f --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs @@ -0,0 +1,26 @@ +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/doorAccessPriv")] +public class FlexDoorAccessPrivController : FlexCrudControllerBase +{ + private readonly PrivRepository _repository; + + public FlexDoorAccessPrivController(IDataAccess dataAccess) + { + _repository = new PrivRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexPriv ToFlex(Priv proto) => FlexMapper.ToFlex(proto); + protected override Priv ToProto(FlexPriv flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexPriv flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(Priv proto) => proto.Uuid; +} diff --git a/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs b/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs new file mode 100644 index 0000000..2b680fe --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs @@ -0,0 +1,26 @@ +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/encryptionKey")] +public class FlexEncryptionKeyController : FlexCrudControllerBase +{ + private readonly EncryptionKeyRepository _repository; + + public FlexEncryptionKeyController(IDataAccess dataAccess) + { + _repository = new EncryptionKeyRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexEncryptionKey ToFlex(EncryptionKey proto) => FlexMapper.ToFlex(proto); + protected override EncryptionKey ToProto(FlexEncryptionKey flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexEncryptionKey flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(EncryptionKey proto) => proto.Uuid; +} diff --git a/src/Aporta/Controllers/Flex/FlexEvtController.cs b/src/Aporta/Controllers/Flex/FlexEvtController.cs new file mode 100644 index 0000000..90acccf --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexEvtController.cs @@ -0,0 +1,51 @@ +using System.Linq; +using System.Threading.Tasks; +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/evt")] +public class FlexEvtController : ControllerBase +{ + private readonly Z9EvtRepository _repository; + + public FlexEvtController(IDataAccess dataAccess) + { + _repository = new Z9EvtRepository(dataAccess); + } + + [HttpGet("list")] + public async Task List([FromQuery] int offset = 0, [FromQuery] int max = 50) + { + // Z9EvtRepository uses page-based pagination; convert offset/max + var pageNumber = (offset / max) + 1; + var page = await _repository.GetAll(pageNumber, max); + + return Ok(new FlexListResponse + { + Offset = offset, + Max = max, + Count = page.TotalItems, + InstanceList = page.Items.Select(FlexMapper.ToFlex).ToList(), + }); + } + + [HttpGet("show/{id}")] + public async Task Show(string id) + { + if (!int.TryParse(id, out var unid)) + return NotFound(); + + var evt = await _repository.Get(unid); + if (evt == null) + return NotFound(); + + return Ok(new FlexInstanceResponse { Instance = FlexMapper.ToFlex(evt) }); + } +} diff --git a/src/Aporta/Controllers/Flex/FlexHolCalController.cs b/src/Aporta/Controllers/Flex/FlexHolCalController.cs new file mode 100644 index 0000000..d6e2990 --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexHolCalController.cs @@ -0,0 +1,26 @@ +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/holCal")] +public class FlexHolCalController : FlexCrudControllerBase +{ + private readonly HolCalRepository _repository; + + public FlexHolCalController(IDataAccess dataAccess) + { + _repository = new HolCalRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexHolCal ToFlex(HolCal proto) => FlexMapper.ToFlex(proto); + protected override HolCal ToProto(FlexHolCal flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexHolCal flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(HolCal proto) => proto.Uuid; +} diff --git a/src/Aporta/Controllers/Flex/FlexHolController.cs b/src/Aporta/Controllers/Flex/FlexHolController.cs new file mode 100644 index 0000000..53a92eb --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexHolController.cs @@ -0,0 +1,26 @@ +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/hol")] +public class FlexHolController : FlexCrudControllerBase +{ + private readonly HolRepository _repository; + + public FlexHolController(IDataAccess dataAccess) + { + _repository = new HolRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexHol ToFlex(Hol proto) => FlexMapper.ToFlex(proto); + protected override Hol ToProto(FlexHol flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexHol flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(Hol proto) => proto.Uuid; +} diff --git a/src/Aporta/Controllers/Flex/FlexHolTypeController.cs b/src/Aporta/Controllers/Flex/FlexHolTypeController.cs new file mode 100644 index 0000000..5ee33b7 --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexHolTypeController.cs @@ -0,0 +1,26 @@ +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/holType")] +public class FlexHolTypeController : FlexCrudControllerBase +{ + private readonly HolTypeRepository _repository; + + public FlexHolTypeController(IDataAccess dataAccess) + { + _repository = new HolTypeRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexHolType ToFlex(HolType proto) => FlexMapper.ToFlex(proto); + protected override HolType ToProto(FlexHolType flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexHolType flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(HolType proto) => proto.Uuid; +} diff --git a/src/Aporta/Controllers/Flex/FlexSchedController.cs b/src/Aporta/Controllers/Flex/FlexSchedController.cs new file mode 100644 index 0000000..a197d98 --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexSchedController.cs @@ -0,0 +1,26 @@ +using Aporta.Core.DataAccess; +using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Z9.Spcore.Proto; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/sched")] +public class FlexSchedController : FlexCrudControllerBase +{ + private readonly SchedRepository _repository; + + public FlexSchedController(IDataAccess dataAccess) + { + _repository = new SchedRepository(dataAccess); + } + + protected override ProtoJsonRepository Repository => _repository; + protected override FlexSched ToFlex(Sched proto) => FlexMapper.ToFlex(proto); + protected override Sched ToProto(FlexSched flex) => FlexMapper.ToProto(flex); + protected override int GetUnid(FlexSched flex) => flex.Unid ?? 0; + protected override string GetUuidFromProto(Sched proto) => proto.Uuid; +} diff --git a/src/Aporta/Filters/FlexAuthFilter.cs b/src/Aporta/Filters/FlexAuthFilter.cs new file mode 100644 index 0000000..a7ab1fc --- /dev/null +++ b/src/Aporta/Filters/FlexAuthFilter.cs @@ -0,0 +1,38 @@ +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; + +namespace Aporta.Filters; + +public class FlexAuthFilter : IActionFilter +{ + private readonly FlexSessionService _sessionService; + + public FlexAuthFilter(FlexSessionService sessionService) + { + _sessionService = sessionService; + } + + public void OnActionExecuting(ActionExecutingContext context) + { + var path = context.HttpContext.Request.Path.Value; + + // Skip auth check for authenticate endpoint + if (path != null && path.StartsWith("/flex/authenticate")) + return; + + // Only apply to /flex/ routes + if (path == null || !path.StartsWith("/flex/")) + return; + + var token = context.HttpContext.Request.Headers["sessionToken"].ToString(); + if (!_sessionService.ValidateSession(token)) + { + context.Result = new UnauthorizedResult(); + } + } + + public void OnActionExecuted(ActionExecutedContext context) + { + } +} diff --git a/src/Aporta/Startup.cs b/src/Aporta/Startup.cs index 8b67140..9fdda21 100644 --- a/src/Aporta/Startup.cs +++ b/src/Aporta/Startup.cs @@ -50,9 +50,13 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSignalR(); - services.AddControllersWithViews(); + services.AddControllersWithViews(options => + { + options.Filters.Add(); + }); services.AddRazorPages(); services.AddResponseCompression(opts => { diff --git a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs index 7c1c888..58ba93f 100644 --- a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs @@ -8,7 +8,7 @@ namespace Aporta.Core.Tests.DataAccess; [TestFixture] public class MigrationTests { - private const int CurrentVersion = 103; + private const int CurrentVersion = 104; private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); private IDbConnection _persistConnection; From 15f86361f4b204ee3853f0171da27aa730639d0e Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 16:23:32 -0500 Subject: [PATCH 47/86] Consolidate flex tables into main migration, change default password to "pass" Move z9_dev and encryption_key tables from separate _0004 migration into _0001_AddZ9OpenTables. Remove flex_session table (sessions are in-memory). Change default flex API credentials from admin/admin to admin/pass. Co-Authored-By: Claude Opus 4.6 --- .../Migrations/_0001_AddZ9OpenTables.cs | 12 ++++++ .../Migrations/_0004_AddFlexTables.cs | 38 ------------------- .../DataAccess/SqLiteDataAccess.cs | 3 +- .../Services/FlexSessionService.cs | 2 +- .../DataAccess/MigrationTests.cs | 2 +- 5 files changed, 15 insertions(+), 42 deletions(-) delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0004_AddFlexTables.cs diff --git a/src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs b/src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs index d159715..5946796 100644 --- a/src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs +++ b/src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs @@ -61,6 +61,18 @@ CREATE TABLE hol_type ( id INTEGER NOT NULL PRIMARY KEY, data TEXT NOT NULL ); + + -- Z9 Device table (stores full Dev proto messages) + CREATE TABLE z9_dev ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Encryption Key table + CREATE TABLE encryption_key ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); ", transaction: transaction); } diff --git a/src/Aporta.Core/DataAccess/Migrations/_0004_AddFlexTables.cs b/src/Aporta.Core/DataAccess/Migrations/_0004_AddFlexTables.cs deleted file mode 100644 index 83143e9..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0004_AddFlexTables.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations; - -public class _0004_AddFlexTables : IMigration -{ - public int Version => 104; - - public string Name => "Add tables for Z9/Flex Community REST API"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @" - -- Z9 Device table (stores full Dev proto messages) - CREATE TABLE z9_dev ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Encryption Key table - CREATE TABLE encryption_key ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Flex session table (for REST API authentication) - CREATE TABLE flex_session ( - token TEXT NOT NULL PRIMARY KEY, - username TEXT NOT NULL, - created_at TEXT NOT NULL - ); - ", - transaction: transaction); - } -} diff --git a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs index d7e85e1..cec8c67 100644 --- a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs +++ b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs @@ -21,8 +21,7 @@ public class SqLiteDataAccess : IDataAccess new _0000_InitialCreate(), new _0001_AddZ9OpenTables(), new _0002_AddZ9CredTable(), - new _0003_AddZ9EvtTable(), - new _0004_AddFlexTables() + new _0003_AddZ9EvtTable() }; /// diff --git a/src/Aporta.Core/Services/FlexSessionService.cs b/src/Aporta.Core/Services/FlexSessionService.cs index ce8207a..a195c17 100644 --- a/src/Aporta.Core/Services/FlexSessionService.cs +++ b/src/Aporta.Core/Services/FlexSessionService.cs @@ -12,7 +12,7 @@ public class FlexSessionService public FlexAuthenticateResult Authenticate(string username, string password) { // Default credentials — configurable via global settings in the future - if (username == "admin" && password == "admin") + if (username == "admin" && password == "pass") { var token = Guid.NewGuid().ToString("N"); _sessions[token] = new FlexSession diff --git a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs index 58ba93f..7c1c888 100644 --- a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs @@ -8,7 +8,7 @@ namespace Aporta.Core.Tests.DataAccess; [TestFixture] public class MigrationTests { - private const int CurrentVersion = 104; + private const int CurrentVersion = 103; private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); private IDbConnection _persistConnection; From 576c4116e3d7c77c262adc31f178593047c07cb7 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 17:30:56 -0500 Subject: [PATCH 48/86] Migrate Monitoring page events to Flex API Move Flex model DTOs from Aporta.Core to Aporta.Shared so the WebClient can reference them. Add FlexApiService for authenticated Flex API calls from the browser, and FlexEvtCodeHelper for event code display text. Update Monitoring.razor to fetch events from /flex/evt/list instead of /api/Events. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Services/FlexMapper.cs | 2 +- .../Services/FlexSessionService.cs | 2 +- src/Aporta.Shared/Calls/FlexApiService.cs | 59 ++++++++++++ .../Models/Flex/FlexCommon.cs | 2 +- .../Models/Flex/FlexCred.cs | 2 +- .../Models/Flex/FlexDataFormat.cs | 2 +- .../Models/Flex/FlexDev.cs | 2 +- .../Models/Flex/FlexEvt.cs | 2 +- .../Models/Flex/FlexEvtCodeHelper.cs | 72 ++++++++++++++ .../Models/Flex/FlexHol.cs | 2 +- .../Models/Flex/FlexPriv.cs | 2 +- .../Models/Flex/FlexSched.cs | 2 +- src/Aporta.WebClient/Pages/Monitoring.razor | 96 ++++++++++--------- src/Aporta.WebClient/Program.cs | 5 +- .../Controllers/Flex/FlexActionController.cs | 2 +- .../Flex/FlexAuthenticateController.cs | 2 +- .../Flex/FlexBasicDataLayoutController.cs | 2 +- .../Flex/FlexBinaryFormatController.cs | 2 +- .../Controllers/Flex/FlexCredController.cs | 2 +- .../Flex/FlexCredTemplateController.cs | 2 +- .../Flex/FlexCrudControllerBase.cs | 2 +- .../Flex/FlexDataFormatController.cs | 2 +- .../Flex/FlexDataLayoutController.cs | 2 +- .../Controllers/Flex/FlexDevController.cs | 2 +- .../Flex/FlexDoorAccessPrivController.cs | 2 +- .../Flex/FlexEncryptionKeyController.cs | 2 +- .../Controllers/Flex/FlexEvtController.cs | 2 +- .../Controllers/Flex/FlexHolCalController.cs | 2 +- .../Controllers/Flex/FlexHolController.cs | 2 +- .../Controllers/Flex/FlexHolTypeController.cs | 2 +- .../Controllers/Flex/FlexSchedController.cs | 2 +- 31 files changed, 213 insertions(+), 73 deletions(-) create mode 100644 src/Aporta.Shared/Calls/FlexApiService.cs rename src/{Aporta.Core => Aporta.Shared}/Models/Flex/FlexCommon.cs (98%) rename src/{Aporta.Core => Aporta.Shared}/Models/Flex/FlexCred.cs (98%) rename src/{Aporta.Core => Aporta.Shared}/Models/Flex/FlexDataFormat.cs (98%) rename src/{Aporta.Core => Aporta.Shared}/Models/Flex/FlexDev.cs (99%) rename src/{Aporta.Core => Aporta.Shared}/Models/Flex/FlexEvt.cs (99%) create mode 100644 src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs rename src/{Aporta.Core => Aporta.Shared}/Models/Flex/FlexHol.cs (98%) rename src/{Aporta.Core => Aporta.Shared}/Models/Flex/FlexPriv.cs (96%) rename src/{Aporta.Core => Aporta.Shared}/Models/Flex/FlexSched.cs (96%) diff --git a/src/Aporta.Core/Services/FlexMapper.cs b/src/Aporta.Core/Services/FlexMapper.cs index d5246e1..28e2bbb 100644 --- a/src/Aporta.Core/Services/FlexMapper.cs +++ b/src/Aporta.Core/Services/FlexMapper.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Numerics; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Google.Protobuf; using Z9.Protobuf; using Z9.Spcore.Proto; diff --git a/src/Aporta.Core/Services/FlexSessionService.cs b/src/Aporta.Core/Services/FlexSessionService.cs index a195c17..a580221 100644 --- a/src/Aporta.Core/Services/FlexSessionService.cs +++ b/src/Aporta.Core/Services/FlexSessionService.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Concurrent; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; namespace Aporta.Core.Services; diff --git a/src/Aporta.Shared/Calls/FlexApiService.cs b/src/Aporta.Shared/Calls/FlexApiService.cs new file mode 100644 index 0000000..ecba6ec --- /dev/null +++ b/src/Aporta.Shared/Calls/FlexApiService.cs @@ -0,0 +1,59 @@ +using System; +using System.Net; +using System.Net.Http; +using System.Net.Http.Json; +using System.Threading.Tasks; +using Aporta.Shared.Models.Flex; + +namespace Aporta.Shared.Calls; + +public class FlexApiService +{ + private readonly HttpClient _httpClient; + private string _sessionToken; + + public FlexApiService(HttpClient httpClient) + { + _httpClient = httpClient; + } + + public async Task> GetEvtListAsync(int offset, int max) + { + return await FlexGetAsync>($"flex/evt/list?offset={offset}&max={max}"); + } + + private async Task EnsureAuthenticated() + { + if (!string.IsNullOrEmpty(_sessionToken)) + return; + + var request = new FlexAuthenticateRequest { Username = "admin", Password = "pass" }; + var response = await _httpClient.PostAsJsonAsync("flex/authenticate", request); + response.EnsureSuccessStatusCode(); + var result = await response.Content.ReadFromJsonAsync(); + _sessionToken = result?.SessionToken; + } + + private async Task FlexGetAsync(string url) + { + await EnsureAuthenticated(); + + var request = new HttpRequestMessage(HttpMethod.Get, url); + request.Headers.Add("sessionToken", _sessionToken); + var response = await _httpClient.SendAsync(request); + + if (response.StatusCode == HttpStatusCode.Unauthorized) + { + // Token expired — re-authenticate and retry once + _sessionToken = null; + await EnsureAuthenticated(); + + request = new HttpRequestMessage(HttpMethod.Get, url); + request.Headers.Add("sessionToken", _sessionToken); + response = await _httpClient.SendAsync(request); + } + + response.EnsureSuccessStatusCode(); + return await response.Content.ReadFromJsonAsync(); + } +} diff --git a/src/Aporta.Core/Models/Flex/FlexCommon.cs b/src/Aporta.Shared/Models/Flex/FlexCommon.cs similarity index 98% rename from src/Aporta.Core/Models/Flex/FlexCommon.cs rename to src/Aporta.Shared/Models/Flex/FlexCommon.cs index bb8642a..fa7ad7f 100644 --- a/src/Aporta.Core/Models/Flex/FlexCommon.cs +++ b/src/Aporta.Shared/Models/Flex/FlexCommon.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Aporta.Core.Models.Flex; +namespace Aporta.Shared.Models.Flex; public class FlexObjRef { diff --git a/src/Aporta.Core/Models/Flex/FlexCred.cs b/src/Aporta.Shared/Models/Flex/FlexCred.cs similarity index 98% rename from src/Aporta.Core/Models/Flex/FlexCred.cs rename to src/Aporta.Shared/Models/Flex/FlexCred.cs index e4be47d..ce15d10 100644 --- a/src/Aporta.Core/Models/Flex/FlexCred.cs +++ b/src/Aporta.Shared/Models/Flex/FlexCred.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Aporta.Core.Models.Flex; +namespace Aporta.Shared.Models.Flex; public class FlexCred { diff --git a/src/Aporta.Core/Models/Flex/FlexDataFormat.cs b/src/Aporta.Shared/Models/Flex/FlexDataFormat.cs similarity index 98% rename from src/Aporta.Core/Models/Flex/FlexDataFormat.cs rename to src/Aporta.Shared/Models/Flex/FlexDataFormat.cs index 8265157..35b532a 100644 --- a/src/Aporta.Core/Models/Flex/FlexDataFormat.cs +++ b/src/Aporta.Shared/Models/Flex/FlexDataFormat.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Aporta.Core.Models.Flex; +namespace Aporta.Shared.Models.Flex; public class FlexDataFormat { diff --git a/src/Aporta.Core/Models/Flex/FlexDev.cs b/src/Aporta.Shared/Models/Flex/FlexDev.cs similarity index 99% rename from src/Aporta.Core/Models/Flex/FlexDev.cs rename to src/Aporta.Shared/Models/Flex/FlexDev.cs index dff3c0f..73d84d3 100644 --- a/src/Aporta.Core/Models/Flex/FlexDev.cs +++ b/src/Aporta.Shared/Models/Flex/FlexDev.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Aporta.Core.Models.Flex; +namespace Aporta.Shared.Models.Flex; public class FlexDev { diff --git a/src/Aporta.Core/Models/Flex/FlexEvt.cs b/src/Aporta.Shared/Models/Flex/FlexEvt.cs similarity index 99% rename from src/Aporta.Core/Models/Flex/FlexEvt.cs rename to src/Aporta.Shared/Models/Flex/FlexEvt.cs index ef46685..1ecf81e 100644 --- a/src/Aporta.Core/Models/Flex/FlexEvt.cs +++ b/src/Aporta.Shared/Models/Flex/FlexEvt.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Aporta.Core.Models.Flex; +namespace Aporta.Shared.Models.Flex; public class FlexEvt { diff --git a/src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs b/src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs new file mode 100644 index 0000000..31c2e4f --- /dev/null +++ b/src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs @@ -0,0 +1,72 @@ +namespace Aporta.Shared.Models.Flex; + +public static class FlexEvtCodeHelper +{ + public static string GetEvtCodeText(int? evtCode) + { + return evtCode switch + { + 9 => "Controller Startup", + 10 => "Controller Online", + 11 => "Controller Offline", + 15 => "Credential Reader Online", + 16 => "Credential Reader Offline", + 48 => "Access Granted", + 49 => "Access Denied", + 52 => "Door Forced", + 53 => "Door Not Forced", + 54 => "Door Held", + 55 => "Door Not Held", + 56 => "Door Opened", + 57 => "Door Closed", + 58 => "Door Locked", + 59 => "Door Unlocked", + 60 => "Door Mode: Unlocked", + 61 => "Door Mode: No Access", + 62 => "Door Mode: Card Only", + 63 => "Door Mode: Card and PIN", + 64 => "Door Mode: PIN Only", + 65 => "Door Mode: Card or PIN", + 86 => "Exit Requested", + 87 => "Momentary Unlock", + 113 => "On Primary Power", + 114 => "Off Primary Power", + 115 => "No Power", + 116 => "Battery OK", + 117 => "Battery Low", + 118 => "Battery Fail", + 125 => "Tamper Normal", + 126 => "Tamper", + 127 => "Schedule Active", + 128 => "Schedule Inactive", + 153 => "External", + 244 => "Battery Critical", + 259 => "Credential Reader Power Cycle", + _ => $"Unknown ({evtCode})" + }; + } + + public static string GetEvtSubCodeText(int? evtSubCode) + { + return evtSubCode switch + { + null => "", + 0 => "Inactive", + 6 => "Not Yet Effective", + 7 => "Expired", + 10 => "No Privileges", + 11 => "Outside Schedule", + 14 => "Unknown Card Number", + 15 => "Unknown Card Format", + 17 => "Unknown Unique PIN", + 20 => "Incorrect Facility Code", + 22 => "Door Mode: Static Locked", + 23 => "Door Mode: No Card", + 24 => "Door Mode: No Unique PIN", + 25 => "No Confirming PIN", + 27 => "Incorrect Confirming PIN", + 104 => "External", + _ => $"Unknown ({evtSubCode})" + }; + } +} diff --git a/src/Aporta.Core/Models/Flex/FlexHol.cs b/src/Aporta.Shared/Models/Flex/FlexHol.cs similarity index 98% rename from src/Aporta.Core/Models/Flex/FlexHol.cs rename to src/Aporta.Shared/Models/Flex/FlexHol.cs index f34c7c6..de7f1eb 100644 --- a/src/Aporta.Core/Models/Flex/FlexHol.cs +++ b/src/Aporta.Shared/Models/Flex/FlexHol.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Aporta.Core.Models.Flex; +namespace Aporta.Shared.Models.Flex; public class FlexHol { diff --git a/src/Aporta.Core/Models/Flex/FlexPriv.cs b/src/Aporta.Shared/Models/Flex/FlexPriv.cs similarity index 96% rename from src/Aporta.Core/Models/Flex/FlexPriv.cs rename to src/Aporta.Shared/Models/Flex/FlexPriv.cs index 523491d..a181658 100644 --- a/src/Aporta.Core/Models/Flex/FlexPriv.cs +++ b/src/Aporta.Shared/Models/Flex/FlexPriv.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Aporta.Core.Models.Flex; +namespace Aporta.Shared.Models.Flex; public class FlexPriv { diff --git a/src/Aporta.Core/Models/Flex/FlexSched.cs b/src/Aporta.Shared/Models/Flex/FlexSched.cs similarity index 96% rename from src/Aporta.Core/Models/Flex/FlexSched.cs rename to src/Aporta.Shared/Models/Flex/FlexSched.cs index 8399a4f..fbb28a0 100644 --- a/src/Aporta.Core/Models/Flex/FlexSched.cs +++ b/src/Aporta.Shared/Models/Flex/FlexSched.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Aporta.Core.Models.Flex; +namespace Aporta.Shared.Models.Flex; public class FlexSched { diff --git a/src/Aporta.WebClient/Pages/Monitoring.razor b/src/Aporta.WebClient/Pages/Monitoring.razor index e3e5574..7e476f7 100644 --- a/src/Aporta.WebClient/Pages/Monitoring.razor +++ b/src/Aporta.WebClient/Pages/Monitoring.razor @@ -1,15 +1,17 @@ @page "/monitoring" -@using System.Text.Json +@using System.Globalization @using Microsoft.AspNetCore.SignalR.Client @using Aporta.Shared.Models +@using Aporta.Shared.Models.Flex @using Aporta.Shared.Calls @using Aporta.Shared.Messaging @using Aporta.WebClient.Messaging @inject HttpClient Http +@inject FlexApiService FlexApi @inject NavigationManager NavigationManager Monitoring @@ -28,35 +30,28 @@ else Timestamp Type Reason - Endpoint - Door - Person + Device + Credential - @foreach (var eventItem in _events.Items) + @foreach (var evt in _events.InstanceList) { - var eventData = JsonSerializer.Deserialize(eventItem.Data); - @eventItem.Timestamp.ToLocalTime() + @(ParseFlexTime(evt.HwTime)) - @(eventItem.Type.GetDescription()) + @(FlexEvtCodeHelper.GetEvtCodeText(evt.EvtCode)) - - - @(eventData.EventReason.GetDescription()) - - - @eventData.Endpoint?.Name + @(FlexEvtCodeHelper.GetEvtSubCodeText(evt.EvtSubCode)) - @eventData.Door?.Name + @evt.EvtDevRef?.Name - @eventData.Person?.FirstName @eventData.Person?.LastName + @evt.EvtCredRef?.Name } @@ -66,7 +61,7 @@ else - + @@ -93,7 +88,7 @@ else - + @@ -131,7 +126,7 @@ else - + @@ -183,8 +178,8 @@ else @code { - private PaginatedItemsDto _events; - + private FlexListResponse _events; + private const string PreviousPageItem = "previous"; private const string NextPageItem = "next"; private const int PageSize = 5; @@ -192,23 +187,23 @@ else private int _pageItems = 1; private Color _eventRowColor = Color.Default; private bool _liveEventMonitoring; - + private List _inputs; private readonly Dictionary _inputStates = new(); - + private List _outputs; private readonly Dictionary _outputStates = new(); - + private HubConnection _hubConnection; - + private Snackbar _snackbar; private SnackbarColor _snackbarColor; private string _snackbarMessage = string.Empty; - + protected override async Task OnInitializedAsync() { await LoadEvents(); - + _inputs = await Http.GetFromJsonAsync>(Paths.Inputs); if (_inputs != null) { @@ -217,7 +212,7 @@ else _inputStates[input.Id] = await GetInputState(input.Id); } } - + _outputs = await Http.GetFromJsonAsync>(Paths.Outputs); if (_outputs != null) { @@ -235,14 +230,14 @@ else { _outputs.Add( await Http.GetFromJsonAsync($"{Paths.Outputs}/{outputId}")); _outputStates[outputId] = await GetOutputState(outputId); - + StateHasChanged(); }); _hubConnection.On(Methods.OutputDeleted, outputId => { var output = _outputs.FirstOrDefault(o => o.Id == outputId); if (output == null) return; - + _outputs.Remove(output); _outputStates.Remove(output.Id); @@ -251,14 +246,14 @@ else _hubConnection.On(Methods.OutputStateChanged, (outputId, newState) => { _outputStates[outputId] = newState; - + StateHasChanged(); }); _hubConnection.On(Methods.InputInserted, async inputId => { _inputs.Add( await Http.GetFromJsonAsync($"{Paths.Inputs}/{inputId}")); _inputStates[inputId] = await GetInputState(inputId); - + StateHasChanged(); }); _hubConnection.On(Methods.InputDeleted, inputId => @@ -274,14 +269,14 @@ else _hubConnection.On(Methods.InputStateChanged, (input, newState) => { _inputStates[input] = newState; - + StateHasChanged(); }); _hubConnection.On(Methods.NewEventReceived, async _ => { if (!_liveEventMonitoring) return; - - _events = await Http.GetFromJsonAsync>(Paths.Events + $"?pageNumber=1&pageSize={PageSize}"); + + _events = await FlexApi.GetEvtListAsync(0, PageSize); _eventRowColor = Color.Warning; StateHasChanged(); @@ -291,7 +286,7 @@ else }); await _hubConnection.StartAsync(); } - + private async Task GetInputState(int inputId) { string url = $"{Paths.Inputs}/state/{inputId}"; @@ -303,7 +298,7 @@ else return bool.Parse(await response.Content.ReadAsStringAsync()); } - + private async Task GetOutputState(int outputId) { string url = $"{Paths.Outputs}/set/{outputId}"; @@ -315,7 +310,7 @@ else return bool.Parse(await response.Content.ReadAsStringAsync()); } - + private async Task SetOutputState(int outputId, bool? checkedValue) { string url = $"{Paths.Outputs}/set/{outputId}"; @@ -328,7 +323,7 @@ else await _snackbar.Show(); } } - + private bool IsActive(string page) => _currentPage == page; private bool IsPageNavigationDisabled(string navigation) @@ -348,7 +343,7 @@ else { _currentPage = (currentPageAsInt - 1).ToString(); } - + await LoadEvents(); } @@ -359,7 +354,7 @@ else { _currentPage = (currentPageAsInt + 1).ToString(); } - + await LoadEvents(); } @@ -371,8 +366,9 @@ else private async Task LoadEvents() { - _events = await Http.GetFromJsonAsync>(Paths.Events + $"?pageNumber={_currentPage}&pageSize={PageSize}"); - _pageItems = _events.TotalItems / PageSize + (_events.TotalItems % PageSize > 0 ? 1 : 0); + var offset = (int.Parse(_currentPage) - 1) * PageSize; + _events = await FlexApi.GetEvtListAsync(offset, PageSize); + _pageItems = _events.Count / PageSize + (_events.Count % PageSize > 0 ? 1 : 0); } private async Task ToggleLiveEventMonitoring() @@ -381,7 +377,7 @@ else if (_liveEventMonitoring) { - _events = await Http.GetFromJsonAsync>(Paths.Events + $"?pageNumber=1&pageSize={PageSize}"); + _events = await FlexApi.GetEvtListAsync(0, PageSize); _eventRowColor = Color.Warning; StateHasChanged(); @@ -391,4 +387,14 @@ else } } -} \ No newline at end of file + private static string ParseFlexTime(string hwTime) + { + if (string.IsNullOrEmpty(hwTime)) + return ""; + + if (DateTime.TryParse(hwTime, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var dt)) + return dt.ToLocalTime().ToString(); + + return hwTime; + } +} diff --git a/src/Aporta.WebClient/Program.cs b/src/Aporta.WebClient/Program.cs index cbbcfb8..5d51393 100644 --- a/src/Aporta.WebClient/Program.cs +++ b/src/Aporta.WebClient/Program.cs @@ -36,7 +36,10 @@ public static async Task Main(string[] args) { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) })); builder.Services.AddScoped(); - + + builder.Services.AddScoped(_ => new FlexApiService(new HttpClient + { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) })); + builder.Services.AddScoped(_ => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); diff --git a/src/Aporta/Controllers/Flex/FlexActionController.cs b/src/Aporta/Controllers/Flex/FlexActionController.cs index ffc16af..4ad2492 100644 --- a/src/Aporta/Controllers/Flex/FlexActionController.cs +++ b/src/Aporta/Controllers/Flex/FlexActionController.cs @@ -1,4 +1,4 @@ -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Protobuf; diff --git a/src/Aporta/Controllers/Flex/FlexAuthenticateController.cs b/src/Aporta/Controllers/Flex/FlexAuthenticateController.cs index ae20988..596ddb4 100644 --- a/src/Aporta/Controllers/Flex/FlexAuthenticateController.cs +++ b/src/Aporta/Controllers/Flex/FlexAuthenticateController.cs @@ -1,4 +1,4 @@ -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; diff --git a/src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs b/src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs index 46f37fa..4588206 100644 --- a/src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs +++ b/src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs b/src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs index 3b3387f..2ac7f00 100644 --- a/src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs +++ b/src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexCredController.cs b/src/Aporta/Controllers/Flex/FlexCredController.cs index 93bd033..7607b4f 100644 --- a/src/Aporta/Controllers/Flex/FlexCredController.cs +++ b/src/Aporta/Controllers/Flex/FlexCredController.cs @@ -1,6 +1,6 @@ using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs b/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs index 40f7214..5a3bb6b 100644 --- a/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs +++ b/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs @@ -1,6 +1,6 @@ using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs b/src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs index 72680b8..1883ce4 100644 --- a/src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs +++ b/src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Threading.Tasks; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Google.Protobuf; using Microsoft.AspNetCore.Mvc; diff --git a/src/Aporta/Controllers/Flex/FlexDataFormatController.cs b/src/Aporta/Controllers/Flex/FlexDataFormatController.cs index c01a905..06f2b7a 100644 --- a/src/Aporta/Controllers/Flex/FlexDataFormatController.cs +++ b/src/Aporta/Controllers/Flex/FlexDataFormatController.cs @@ -1,6 +1,6 @@ using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs b/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs index 9406c13..28f19ce 100644 --- a/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs +++ b/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs @@ -1,6 +1,6 @@ using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexDevController.cs b/src/Aporta/Controllers/Flex/FlexDevController.cs index 3b856e3..ac0e69f 100644 --- a/src/Aporta/Controllers/Flex/FlexDevController.cs +++ b/src/Aporta/Controllers/Flex/FlexDevController.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs b/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs index 59d704f..9e2f8d9 100644 --- a/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs +++ b/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs @@ -1,6 +1,6 @@ using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs b/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs index 2b680fe..505b114 100644 --- a/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs +++ b/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs @@ -1,6 +1,6 @@ using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexEvtController.cs b/src/Aporta/Controllers/Flex/FlexEvtController.cs index 90acccf..cf2c0e5 100644 --- a/src/Aporta/Controllers/Flex/FlexEvtController.cs +++ b/src/Aporta/Controllers/Flex/FlexEvtController.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexHolCalController.cs b/src/Aporta/Controllers/Flex/FlexHolCalController.cs index d6e2990..8ea68eb 100644 --- a/src/Aporta/Controllers/Flex/FlexHolCalController.cs +++ b/src/Aporta/Controllers/Flex/FlexHolCalController.cs @@ -1,6 +1,6 @@ using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexHolController.cs b/src/Aporta/Controllers/Flex/FlexHolController.cs index 53a92eb..0a4df59 100644 --- a/src/Aporta/Controllers/Flex/FlexHolController.cs +++ b/src/Aporta/Controllers/Flex/FlexHolController.cs @@ -1,6 +1,6 @@ using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexHolTypeController.cs b/src/Aporta/Controllers/Flex/FlexHolTypeController.cs index 5ee33b7..f212ca5 100644 --- a/src/Aporta/Controllers/Flex/FlexHolTypeController.cs +++ b/src/Aporta/Controllers/Flex/FlexHolTypeController.cs @@ -1,6 +1,6 @@ using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; diff --git a/src/Aporta/Controllers/Flex/FlexSchedController.cs b/src/Aporta/Controllers/Flex/FlexSchedController.cs index a197d98..626a579 100644 --- a/src/Aporta/Controllers/Flex/FlexSchedController.cs +++ b/src/Aporta/Controllers/Flex/FlexSchedController.cs @@ -1,6 +1,6 @@ using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models.Flex; +using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; using Z9.Spcore.Proto; From 3f29737368b645a1826d0faf09980dc0dc829298 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 18:01:01 -0500 Subject: [PATCH 49/86] Unify Aporta UI with Z9/Flex API for credentials, sensors, and actuators MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Migrate display/list side of People, Inputs, and Outputs pages to read from Flex REST endpoints while keeping all write operations on native API. - Add GetCredListAsync, GetSensorListAsync, GetActuatorListAsync to FlexApiService - Rename People.razor → Credentials.razor: unified credential list from flex/cred - Rename Inputs.razor → Sensors.razor: display from flex/sensor - Rename Outputs.razor → Actuators.razor: display from flex/actuator - InputService/OutputService: create z9_dev records on insert/delete - Update MainLayout navigation labels and routes Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Services/InputService.cs | 18 +- src/Aporta.Core/Services/OutputService.cs | 18 +- src/Aporta.Shared/Calls/FlexApiService.cs | 15 ++ .../{Outputs.razor => Actuators.razor} | 75 ++++--- .../{People.razor => Credentials.razor} | 186 +++++++++--------- .../{Inputs.razor => Sensors.razor} | 73 ++++--- src/Aporta.WebClient/Shared/MainLayout.razor | 6 +- 7 files changed, 215 insertions(+), 176 deletions(-) rename src/Aporta.WebClient/Pages/configuration/{Outputs.razor => Actuators.razor} (82%) rename src/Aporta.WebClient/Pages/configuration/{People.razor => Credentials.razor} (76%) rename src/Aporta.WebClient/Pages/configuration/{Inputs.razor => Sensors.razor} (82%) diff --git a/src/Aporta.Core/Services/InputService.cs b/src/Aporta.Core/Services/InputService.cs index 67b1f9f..b84e6be 100644 --- a/src/Aporta.Core/Services/InputService.cs +++ b/src/Aporta.Core/Services/InputService.cs @@ -8,6 +8,8 @@ using Aporta.Shared.Messaging; using Aporta.Shared.Models; using Microsoft.AspNetCore.SignalR; +using Z9.Protobuf; +using Z9.Spcore.Proto; namespace Aporta.Core.Services; @@ -16,6 +18,7 @@ public class InputService private readonly InputRepository _inputRepository; private readonly DoorRepository _doorRepository; private readonly EndpointRepository _endpointRepository; + private readonly Z9DevRepository _z9DevRepository; private readonly IHubContext _hubContext; private readonly ExtensionService _extensionService; @@ -27,6 +30,7 @@ public InputService(IDataAccess dataAccess, IHubContext Get(int inputId) public async Task Insert(Input input) { await _inputRepository.Insert(input); - + + var dev = new Dev + { + Unid = input.Id, + Name = input.Name, + DevType = DevType.Sensor, + }; + SpCoreProtoUtil.InitRequired(dev); + await _z9DevRepository.Upsert(dev); + await _hubContext.Clients.All.SendAsync(Methods.InputInserted, input.Id); } public async Task Delete(int id) { await _inputRepository.Delete(id); - + await _z9DevRepository.Delete(id); + await _hubContext.Clients.All.SendAsync(Methods.InputDeleted, id); } diff --git a/src/Aporta.Core/Services/OutputService.cs b/src/Aporta.Core/Services/OutputService.cs index f30eeac..5099894 100644 --- a/src/Aporta.Core/Services/OutputService.cs +++ b/src/Aporta.Core/Services/OutputService.cs @@ -8,6 +8,8 @@ using Aporta.Shared.Messaging; using Aporta.Shared.Models; using Microsoft.AspNetCore.SignalR; +using Z9.Protobuf; +using Z9.Spcore.Proto; namespace Aporta.Core.Services; @@ -16,6 +18,7 @@ public class OutputService private readonly DoorRepository _doorRepository; private readonly OutputRepository _outputRepository; private readonly EndpointRepository _endpointRepository; + private readonly Z9DevRepository _z9DevRepository; private readonly IHubContext _hubContext; private readonly ExtensionService _extensionService; @@ -27,6 +30,7 @@ public OutputService(IDataAccess dataAccess, IHubContext Get(int outputId) public async Task Insert(Output output) { await _outputRepository.Insert(output); - + + var dev = new Dev + { + Unid = output.Id, + Name = output.Name, + DevType = DevType.Actuator, + }; + SpCoreProtoUtil.InitRequired(dev); + await _z9DevRepository.Upsert(dev); + await _hubContext.Clients.All.SendAsync(Methods.OutputInserted, output.Id); } public async Task Delete(int id) { await _outputRepository.Delete(id); - + await _z9DevRepository.Delete(id); + await _hubContext.Clients.All.SendAsync(Methods.OutputDeleted, id); } diff --git a/src/Aporta.Shared/Calls/FlexApiService.cs b/src/Aporta.Shared/Calls/FlexApiService.cs index ecba6ec..1e57b4e 100644 --- a/src/Aporta.Shared/Calls/FlexApiService.cs +++ b/src/Aporta.Shared/Calls/FlexApiService.cs @@ -22,6 +22,21 @@ public async Task> GetEvtListAsync(int offset, int max return await FlexGetAsync>($"flex/evt/list?offset={offset}&max={max}"); } + public async Task> GetCredListAsync(int offset, int max) + { + return await FlexGetAsync>($"flex/cred/list?offset={offset}&max={max}"); + } + + public async Task> GetSensorListAsync(int offset, int max) + { + return await FlexGetAsync>($"flex/sensor/list?offset={offset}&max={max}"); + } + + public async Task> GetActuatorListAsync(int offset, int max) + { + return await FlexGetAsync>($"flex/actuator/list?offset={offset}&max={max}"); + } + private async Task EnsureAuthenticated() { if (!string.IsNullOrEmpty(_sessionToken)) diff --git a/src/Aporta.WebClient/Pages/configuration/Outputs.razor b/src/Aporta.WebClient/Pages/configuration/Actuators.razor similarity index 82% rename from src/Aporta.WebClient/Pages/configuration/Outputs.razor rename to src/Aporta.WebClient/Pages/configuration/Actuators.razor index da2acff..f11f254 100644 --- a/src/Aporta.WebClient/Pages/configuration/Outputs.razor +++ b/src/Aporta.WebClient/Pages/configuration/Actuators.razor @@ -1,4 +1,4 @@ -@page "/configuration/outputs" +@page "/configuration/actuators" @using System.Text @using System.Text.Json @@ -6,17 +6,19 @@ @using Microsoft.AspNetCore.SignalR.Client @using Aporta.Shared.Models +@using Aporta.Shared.Models.Flex @using Aporta.Shared.Calls @using Aporta.Shared.Messaging @using Aporta.WebClient.Messaging @inject HttpClient Http +@inject FlexApiService FlexApi @inject NavigationManager NavigationManager -Outputs +Actuators -@if (_outputs == null) +@if (_actuators == null) { } @@ -26,12 +28,12 @@ else @if (_availableControlPoints.Any()) { - + } else { - Add Output + Add Actuator No available outputs are configured in the drivers } @@ -49,14 +51,14 @@ else - @foreach (var output in _outputs.OrderBy(output => output.Name)) + @foreach (var actuator in _actuators.InstanceList.OrderBy(a => a.Name)) { - @output.Name + @actuator.Name - @@ -66,14 +68,14 @@ else - + - + - Add Output + Add Actuator @@ -86,14 +88,14 @@ else - Please enter a name for the ouptut + Please enter a name for the actuator - + Device Endpoint @@ -124,49 +126,42 @@ else @code { - [Inject] + [Inject] IMessageService MessageService { get; set; } - - private List _outputs; + + private FlexListResponse _actuators; private Endpoint[] _availableControlPoints; private Output _addOutput; - + private HubConnection _hubConnection; - + private Modal _addOutputModal; private Validations _addOutputValidations; - + private Snackbar _snackbar; private SnackbarColor _snackbarColor; private string _snackbarMessage = string.Empty; - + protected override async Task OnInitializedAsync() { - _outputs = await Http.GetFromJsonAsync>(Paths.Outputs); + _actuators = await FlexApi.GetActuatorListAsync(0, 1000); await InitializedAvailableOutputs(); - + _hubConnection = new HubConnectionBuilder() .WithUrl(NavigationManager.ToAbsoluteUri(Locations.DataChangeNotification)) .WithAutomaticReconnect(new SignalRRetryPolicy()) .Build(); - _hubConnection.On(Methods.OutputInserted, async outputId => + _hubConnection.On(Methods.OutputInserted, async _ => { - _outputs.Add( await Http.GetFromJsonAsync($"{Paths.Outputs}/{outputId}")); - + _actuators = await FlexApi.GetActuatorListAsync(0, 1000); await InitializedAvailableOutputs(); - StateHasChanged(); }); - _hubConnection.On(Methods.OutputDeleted, async outputId => + _hubConnection.On(Methods.OutputDeleted, async _ => { - var output = _outputs.FirstOrDefault(o => o.Id == outputId); - if (output == null) return; - - _outputs.Remove(output); - + _actuators = await FlexApi.GetActuatorListAsync(0, 1000); await InitializedAvailableOutputs(); - StateHasChanged(); }); await _hubConnection.StartAsync(); @@ -196,15 +191,15 @@ else new StringContent(JsonSerializer.Serialize(_addOutput), Encoding.UTF8, "application/json")); if (!response.IsSuccessStatusCode) { - _snackbarMessage = "Unable to add output"; + _snackbarMessage = "Unable to add actuator"; _snackbarColor = SnackbarColor.Danger; await _snackbar.Show(); } } - private async Task RemoveOutput(int outputId, string outputName) + private async Task RemoveOutput(FlexDev actuator) { - if (!await MessageService.Confirm($"Are you sure you want to delete output '{outputName}'?", "Delete Bus", options => + if (!await MessageService.Confirm($"Are you sure you want to delete actuator '{actuator.Name}'?", "Delete Actuator", options => { options.ShowMessageIcon = false; options.ConfirmButtonColor = Color.Danger; @@ -212,15 +207,15 @@ else { return; } - - string url = string.Format($"{Paths.Outputs}/{outputId}"); + + string url = string.Format($"{Paths.Outputs}/{actuator.Unid}"); var response = await Http.DeleteAsync(url); if (!response.IsSuccessStatusCode) { - _snackbarMessage = "Unable to remove output"; + _snackbarMessage = "Unable to remove actuator"; _snackbarColor = SnackbarColor.Danger; await _snackbar.Show(); } } -} \ No newline at end of file +} diff --git a/src/Aporta.WebClient/Pages/configuration/People.razor b/src/Aporta.WebClient/Pages/configuration/Credentials.razor similarity index 76% rename from src/Aporta.WebClient/Pages/configuration/People.razor rename to src/Aporta.WebClient/Pages/configuration/Credentials.razor index b4577fc..a53caaa 100644 --- a/src/Aporta.WebClient/Pages/configuration/People.razor +++ b/src/Aporta.WebClient/Pages/configuration/Credentials.razor @@ -1,4 +1,4 @@ -@page "/configuration/people" +@page "/configuration/credentials" @using System.Text @using System.Text.Json @@ -7,15 +7,17 @@ @using Aporta.Shared.Calls @using Aporta.Shared.Messaging @using Aporta.Shared.Models +@using Aporta.Shared.Models.Flex @using Aporta.WebClient.Messaging @inject HttpClient Http +@inject FlexApiService FlexApi @inject NavigationManager NavigationManager -People +Credentials -@if (_people == null) +@if (_credentials == null) { } @@ -36,15 +38,16 @@ else Status First Name Last Name + Badge Number - @foreach (var person in _people.OrderBy(person => person.FirstName)) + @foreach (var cred in _credentials.InstanceList.OrderBy(c => c.Name ?? "")) { - - @if (person.Enabled) + + @if (cred.Enabled == true) { @@ -56,34 +59,40 @@ else } - @if (PersonIsEnrolled(person.Id)) + @if (IsEnrolled(cred)) { } - - @person.FirstName + + @ParseFirstName(cred.Name) - - @person.LastName + + @ParseLastName(cred.Name) + + @(cred.CardPin?.CredNum) + - - - Action - - - @if (!PersonIsEnrolled(person.Id)) - { - Enroll - - } - - Delete - - + @if (!string.IsNullOrEmpty(cred.Name)) + { + + + Action + + + @if (!IsEnrolled(cred)) + { + Enroll + + } + + Delete + + + } } @@ -93,7 +102,7 @@ else - + @@ -146,7 +155,7 @@ else - + @@ -156,7 +165,7 @@ else - + Select an badge event to enroll @@ -176,17 +185,17 @@ else - + - Person details + Credential details - + - + @@ -200,7 +209,7 @@ else First name - @_detailsPerson.FirstName + @ParseFirstName(_detailsCred?.Name) @@ -208,7 +217,7 @@ else Last name - @_detailsPerson.LastName + @ParseLastName(_detailsCred?.Name) @@ -216,26 +225,26 @@ else Badge is enrolled - @PersonIsEnrolled(_detailsPerson.Id) + @IsEnrolled(_detailsCred) - @if (PersonIsEnrolled(_detailsPerson.Id)) + @if (IsEnrolled(_detailsCred)) { Badge number - @PersonsBadgeIdentifier(_detailsPerson.Id) + @(_detailsCred?.CardPin?.CredNum) } - Person is enabled + Credential is enabled - @_detailsPerson.Enabled + @(_detailsCred?.Enabled) @@ -259,68 +268,53 @@ else @code { - [Inject] + [Inject] IMessageService MessageService { get; set; } - - private List _people; - private List _assigned; + + private FlexListResponse _credentials; private Person _addPerson; - private Person _enrollPerson; - private Person _detailsPerson; + private FlexCred _enrollCred; + private FlexCred _detailsCred; private int _enrollCredentialId; private readonly List> _availableCredentialsForEnrollment = new(); - + private HubConnection _hubConnection; private Modal _addPersonModal; private Validations _addPersonValidations; - + private Modal _enrollModal; - + private Modal _personDetailsModal; - + private Snackbar _snackbar; private SnackbarColor _snackbarColor; private string _snackbarMessage = string.Empty; - + protected override async Task OnInitializedAsync() { - _people = await Http.GetFromJsonAsync>(Paths.People); - _assigned = await Http.GetFromJsonAsync>($"{Paths.Credentials}/assigned"); - + _credentials = await FlexApi.GetCredListAsync(0, 1000); + _addPerson = new Person{Enabled = true}; - + _hubConnection = new HubConnectionBuilder() .WithUrl(NavigationManager.ToAbsoluteUri(Locations.DataChangeNotification)) .WithAutomaticReconnect(new SignalRRetryPolicy()) .Build(); - _hubConnection.On(Methods.PersonInserted, async personId => + _hubConnection.On(Methods.PersonInserted, async _ => { - _people.Add( await Http.GetFromJsonAsync($"{Paths.People}/{personId}")); - + _credentials = await FlexApi.GetCredListAsync(0, 1000); StateHasChanged(); }); - _hubConnection.On(Methods.PersonUpdated, async personId => + _hubConnection.On(Methods.PersonUpdated, async _ => { - var person = await Http.GetFromJsonAsync($"{Paths.People}/{personId}"); - - int indexToReplace = _people.FindIndex(matchedPerson => matchedPerson.Id == personId); - - if (indexToReplace >= 0) _people[indexToReplace] = person; - else _people.Add(person); - - _assigned = await Http.GetFromJsonAsync>($"{Paths.Credentials}/assigned"); - + _credentials = await FlexApi.GetCredListAsync(0, 1000); StateHasChanged(); }); - _hubConnection.On(Methods.PersonDeleted, personId => + _hubConnection.On(Methods.PersonDeleted, async _ => { - var person = _people.FirstOrDefault(o => o.Id == personId); - if (person == null) return; - - _people.Remove(person); - + _credentials = await FlexApi.GetCredListAsync(0, 1000); StateHasChanged(); }); @@ -350,9 +344,11 @@ else } } - private async Task RemovePerson(Person person) + private async Task RemovePerson(FlexCred cred) { - if (!await MessageService.Confirm($"Are you sure you want to delete person '{person.FirstName} {person.LastName}'?", "Delete Person", options => + var firstName = ParseFirstName(cred.Name); + var lastName = ParseLastName(cred.Name); + if (!await MessageService.Confirm($"Are you sure you want to delete person '{firstName} {lastName}'?", "Delete Person", options => { options.ShowMessageIcon = false; options.ConfirmButtonColor = Color.Danger; @@ -361,7 +357,7 @@ else return; } - string url = $"{Paths.People}/{person.Id}"; + string url = $"{Paths.People}/{cred.Unid}"; var response = await Http.DeleteAsync(url); if (response.IsSuccessStatusCode) @@ -376,17 +372,16 @@ else } await _snackbar.Show(); } - - private async Task ShowDetails(Person person) + + private async Task ShowDetails(FlexCred cred) { - _detailsPerson = person; - + _detailsCred = cred; await _personDetailsModal.Show(); } - private async Task ShowEnroll(Person person) + private async Task ShowEnroll(FlexCred cred) { - _enrollPerson = person; + _enrollCred = cred; _availableCredentialsForEnrollment.Clear(); string url = $"{Paths.Credentials}/unassigned"; @@ -430,8 +425,8 @@ else private async Task EnrollPerson() { await _enrollModal.Hide(); - - string url = $"{Paths.Credentials}/{_enrollCredentialId}/enroll/{_enrollPerson.Id}"; + + string url = $"{Paths.Credentials}/{_enrollCredentialId}/enroll/{_enrollCred.Unid}"; var response = await Http.PostAsync(url, new StringContent(string.Empty)); if (response.IsSuccessStatusCode) @@ -447,13 +442,24 @@ else await _snackbar.Show(); } - private bool PersonIsEnrolled(int personId) + private static bool IsEnrolled(FlexCred cred) { - return _assigned.Any(credential => credential.Id == personId); + return !string.IsNullOrEmpty(cred?.CardPin?.CredNum); } - - private string PersonsBadgeIdentifier(int personId) + + private static string ParseFirstName(string name) { - return _assigned.FirstOrDefault(credential => credential.Id == personId)?.Number ?? string.Empty; + if (string.IsNullOrEmpty(name)) return ""; + var commaIndex = name.IndexOf(','); + if (commaIndex < 0) return name; + return name.Substring(commaIndex + 1).Trim(); } -} \ No newline at end of file + + private static string ParseLastName(string name) + { + if (string.IsNullOrEmpty(name)) return ""; + var commaIndex = name.IndexOf(','); + if (commaIndex < 0) return ""; + return name.Substring(0, commaIndex).Trim(); + } +} diff --git a/src/Aporta.WebClient/Pages/configuration/Inputs.razor b/src/Aporta.WebClient/Pages/configuration/Sensors.razor similarity index 82% rename from src/Aporta.WebClient/Pages/configuration/Inputs.razor rename to src/Aporta.WebClient/Pages/configuration/Sensors.razor index 2173864..c08dfc2 100644 --- a/src/Aporta.WebClient/Pages/configuration/Inputs.razor +++ b/src/Aporta.WebClient/Pages/configuration/Sensors.razor @@ -1,4 +1,4 @@ -@page "/configuration/inputs" +@page "/configuration/sensors" @using System.Text @using System.Text.Json @@ -6,17 +6,19 @@ @using Microsoft.AspNetCore.SignalR.Client @using Aporta.Shared.Models +@using Aporta.Shared.Models.Flex @using Aporta.Shared.Calls @using Aporta.Shared.Messaging @using Aporta.WebClient.Messaging @inject HttpClient Http +@inject FlexApiService FlexApi @inject NavigationManager NavigationManager -Inputs +Sensors -@if (_inputs == null) +@if (_sensors == null) { } @@ -26,12 +28,12 @@ else @if (_availableMonitorPoints.Any()) { - + } else { - Add Input + Add Sensor No available inputs are configured in the drivers } @@ -49,14 +51,14 @@ else - @foreach (var input in _inputs.OrderBy(input => input.Name)) + @foreach (var sensor in _sensors.InstanceList.OrderBy(s => s.Name)) { - @input.Name + @sensor.Name - @@ -66,14 +68,14 @@ else
- + - + - Add Input + Add Sensor @@ -86,14 +88,14 @@ else - Please enter a name for the input + Please enter a name for the sensor - + Device Endpoint @@ -124,48 +126,41 @@ else @code { - [Inject] + [Inject] IMessageService MessageService { get; set; } - - private List _inputs; + + private FlexListResponse _sensors; private Endpoint[] _availableMonitorPoints; private Input _addInput; - + private HubConnection _hubConnection; - + private Modal _addInputModal; private Validations _addInputValidations; private Snackbar _snackbar; private SnackbarColor _snackbarColor; private string _snackbarMessage = string.Empty; - + protected override async Task OnInitializedAsync() { - _inputs = await Http.GetFromJsonAsync>(Paths.Inputs); + _sensors = await FlexApi.GetSensorListAsync(0, 1000); await InitializedAvailableInputs(); - + _hubConnection = new HubConnectionBuilder() .WithUrl(NavigationManager.ToAbsoluteUri(Locations.DataChangeNotification)) .WithAutomaticReconnect(new SignalRRetryPolicy()) .Build(); - _hubConnection.On(Methods.InputInserted, async inputId => + _hubConnection.On(Methods.InputInserted, async _ => { - _inputs.Add( await Http.GetFromJsonAsync($"{Paths.Inputs}/{inputId}")); - + _sensors = await FlexApi.GetSensorListAsync(0, 1000); await InitializedAvailableInputs(); - StateHasChanged(); }); - _hubConnection.On(Methods.InputDeleted, async inputId => + _hubConnection.On(Methods.InputDeleted, async _ => { - var input = _inputs.FirstOrDefault(o => o.Id == inputId); - if (input == null) return; - - _inputs.Remove(input); - + _sensors = await FlexApi.GetSensorListAsync(0, 1000); await InitializedAvailableInputs(); - StateHasChanged(); }); await _hubConnection.StartAsync(); @@ -195,15 +190,15 @@ else new StringContent(JsonSerializer.Serialize(_addInput), Encoding.UTF8, "application/json")); if (!response.IsSuccessStatusCode) { - _snackbarMessage = "Unable to add input"; + _snackbarMessage = "Unable to add sensor"; _snackbarColor = SnackbarColor.Danger; await _snackbar.Show(); } } - private async Task RemoveInput(int inputId, string inputName) + private async Task RemoveInput(FlexDev sensor) { - if (!await MessageService.Confirm($"Are you sure you want to delete input '{inputName}'?", "Delete Bus", options => + if (!await MessageService.Confirm($"Are you sure you want to delete sensor '{sensor.Name}'?", "Delete Sensor", options => { options.ShowMessageIcon = false; options.ConfirmButtonColor = Color.Danger; @@ -211,14 +206,14 @@ else { return; } - - string url = string.Format($"{Paths.Inputs}/{inputId}"); + + string url = string.Format($"{Paths.Inputs}/{sensor.Unid}"); var response = await Http.DeleteAsync(url); if (!response.IsSuccessStatusCode) { - _snackbarMessage = "Unable to remove input"; + _snackbarMessage = "Unable to remove sensor"; _snackbarColor = SnackbarColor.Danger; await _snackbar.Show(); } } -} \ No newline at end of file +} diff --git a/src/Aporta.WebClient/Shared/MainLayout.razor b/src/Aporta.WebClient/Shared/MainLayout.razor index 78e0a55..829bdf0 100644 --- a/src/Aporta.WebClient/Shared/MainLayout.razor +++ b/src/Aporta.WebClient/Shared/MainLayout.razor @@ -42,7 +42,7 @@ Access - People + Credentials @@ -52,8 +52,8 @@ Drivers Doors - Inputs - Outputs + Sensors + Actuators From ad0faac79f7ea4cb33c555e1246c967cbd846726 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 19:10:41 -0500 Subject: [PATCH 50/86] Consolidate door/input/output tables onto z9_dev and switch ExternalId to DriverEndpointId MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Eliminates the native door, input, and output SQLite tables by storing all device configuration in the z9_dev table as Z9 Dev proto messages. Door configuration now uses a Dev tree hierarchy (Door → CredReader/Sensor/Actuator children with DevUse roles). Switches all Dev.ExternalId values from Endpoint.Id (int PK) to DriverEndpointId (string), eliminating JOIN queries and aligning with how Z9OpenCommunityProtocolService identifies endpoints. Co-Authored-By: Claude Opus 4.6 --- .../Migrations/_0000_InitialCreate.cs | 92 +++++-- .../Migrations/_0001_AddZ9OpenTables.cs | 79 ------ .../Migrations/_0002_AddZ9CredTable.cs | 25 -- .../Migrations/_0003_AddZ9EvtTable.cs | 24 -- .../DataAccess/Repositories/DoorRepository.cs | 27 -- .../Repositories/EndpointRepository.cs | 17 ++ .../Repositories/InputRepository.cs | 48 ---- .../Repositories/OutputRepository.cs | 48 ---- .../Repositories/ProtoJsonRepository.cs | 4 +- .../Repositories/Z9DevRepository.cs | 59 ++++ .../Repositories/Z9EvtRepository.cs | 4 - .../DataAccess/SqLiteDataAccess.cs | 5 +- src/Aporta.Core/Services/AccessService.cs | 50 ++-- .../Services/DoorConfigurationService.cs | 259 +++++++++++++++--- src/Aporta.Core/Services/ExtensionService.cs | 28 +- src/Aporta.Core/Services/InputService.cs | 67 +++-- src/Aporta.Core/Services/OutputService.cs | 70 +++-- src/Aporta/Workers/StartupWorker.cs | 199 ++++++++------ .../DataAccess/MigrationTests.cs | 2 +- .../Repositories/DoorRepositoryTests.cs | 134 --------- .../Repositories/InputRepositoryTests.cs | 102 ------- .../Repositories/OutputRepositoryTests.cs | 104 ------- .../Services/InputServiceTests.cs | 18 +- .../Services/OutputServiceTests.cs | 13 +- 24 files changed, 631 insertions(+), 847 deletions(-) delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0002_AddZ9CredTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Migrations/_0003_AddZ9EvtTable.cs delete mode 100644 src/Aporta.Core/DataAccess/Repositories/DoorRepository.cs delete mode 100644 src/Aporta.Core/DataAccess/Repositories/InputRepository.cs delete mode 100644 src/Aporta.Core/DataAccess/Repositories/OutputRepository.cs delete mode 100644 test/Aporta.Core.Tests/DataAccess/Repositories/DoorRepositoryTests.cs delete mode 100644 test/Aporta.Core.Tests/DataAccess/Repositories/InputRepositoryTests.cs delete mode 100644 test/Aporta.Core.Tests/DataAccess/Repositories/OutputRepositoryTests.cs diff --git a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs index 4b41f5a..6c5af98 100644 --- a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs +++ b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs @@ -36,24 +36,6 @@ CREATE TABLE endpoint ( data TEXT NOT NULL ); - -- Output table - CREATE TABLE output ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Input table - CREATE TABLE input ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Door table - CREATE TABLE door ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - -- Global setting table (string primary key) CREATE TABLE global_setting ( name TEXT NOT NULL PRIMARY KEY, @@ -81,8 +63,80 @@ data TEXT NOT NULL CREATE INDEX idx_ca_credential ON credential_assignment (json_extract(data, '$.credentialId')); CREATE INDEX idx_ca_person ON credential_assignment (json_extract(data, '$.personId')); + -- Credential Template table + CREATE TABLE cred_template ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Data Layout table + CREATE TABLE data_layout ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Data Format table + CREATE TABLE data_format ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Privilege table + CREATE TABLE priv ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Schedule table + CREATE TABLE sched ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Holiday table + CREATE TABLE hol ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Holiday Calendar table + CREATE TABLE hol_cal ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Holiday Type table + CREATE TABLE hol_type ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Z9 Device table (stores full Dev proto messages) + CREATE TABLE z9_dev ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Encryption Key table + CREATE TABLE encryption_key ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Z9 Credential table (stores full proto including privBindings) + CREATE TABLE z9_cred ( + id INTEGER NOT NULL PRIMARY KEY, + data TEXT NOT NULL + ); + + -- Z9 Event table + CREATE TABLE z9_evt ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + data TEXT NOT NULL + ); + ", transaction: transaction); } } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs b/src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs deleted file mode 100644 index 5946796..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0001_AddZ9OpenTables.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations; - -public class _0001_AddZ9OpenTables : IMigration -{ - public int Version => 101; - - public string Name => "Add Z9 Open protobuf storage tables"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @" - -- Credential Template table - CREATE TABLE cred_template ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Data Layout table - CREATE TABLE data_layout ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Data Format table - CREATE TABLE data_format ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Privilege table - CREATE TABLE priv ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Schedule table - CREATE TABLE sched ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Holiday table - CREATE TABLE hol ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Holiday Calendar table - CREATE TABLE hol_cal ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Holiday Type table - CREATE TABLE hol_type ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Z9 Device table (stores full Dev proto messages) - CREATE TABLE z9_dev ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Encryption Key table - CREATE TABLE encryption_key ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - ", - transaction: transaction); - } -} diff --git a/src/Aporta.Core/DataAccess/Migrations/_0002_AddZ9CredTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0002_AddZ9CredTable.cs deleted file mode 100644 index bd5e79b..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0002_AddZ9CredTable.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations; - -public class _0002_AddZ9CredTable : IMigration -{ - public int Version => 102; - - public string Name => "Add Z9 Cred table for storing full credential proto with privilege bindings"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @" - -- Z9 Credential table (stores full proto including privBindings) - CREATE TABLE z9_cred ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - ", - transaction: transaction); - } -} diff --git a/src/Aporta.Core/DataAccess/Migrations/_0003_AddZ9EvtTable.cs b/src/Aporta.Core/DataAccess/Migrations/_0003_AddZ9EvtTable.cs deleted file mode 100644 index e3f6bf7..0000000 --- a/src/Aporta.Core/DataAccess/Migrations/_0003_AddZ9EvtTable.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Data; -using System.Threading.Tasks; -using Dapper; - -namespace Aporta.Core.DataAccess.Migrations; - -public class _0003_AddZ9EvtTable : IMigration -{ - public int Version => 103; - - public string Name => "Add Z9 Evt table for storing event proto messages"; - - public async Task PerformUpdate(IDbConnection connection, IDbTransaction transaction) - { - await connection.ExecuteAsync( - @" - CREATE TABLE z9_evt ( - id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - data TEXT NOT NULL - ); - ", - transaction: transaction); - } -} diff --git a/src/Aporta.Core/DataAccess/Repositories/DoorRepository.cs b/src/Aporta.Core/DataAccess/Repositories/DoorRepository.cs deleted file mode 100644 index d3284d8..0000000 --- a/src/Aporta.Core/DataAccess/Repositories/DoorRepository.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Aporta.Shared.Models; - -namespace Aporta.Core.DataAccess.Repositories; - -public class DoorRepository : JsonDocumentRepository -{ - public DoorRepository(IDataAccess dataAccess) - { - DataAccess = dataAccess; - } - - protected override IDataAccess DataAccess { get; } - - protected override string TableName => "door"; - - protected override string SqlRowCount => "SELECT COUNT(*) FROM door"; - - protected override void SetId(Door entity, int id) - { - entity.Id = id; - } - - protected override int GetId(Door entity) - { - return entity.Id; - } -} diff --git a/src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs b/src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs index 934337f..804cf53 100644 --- a/src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs @@ -62,6 +62,23 @@ protected override void SetId(Endpoint entity, int id) entity.Id = id; } + public async Task GetByDriverEndpointId(string driverEndpointId) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var result = await connection.QueryFirstOrDefaultAsync<(int Id, string Data)>( + @"SELECT id, data FROM endpoint + WHERE json_extract(data, '$.driverEndpointId') = @driverEndpointId", + new { driverEndpointId }); + + if (result.Data == null) return null; + + var endpoint = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); + endpoint.Id = result.Id; + return endpoint; + } + protected override int GetId(Endpoint entity) { return entity.Id; diff --git a/src/Aporta.Core/DataAccess/Repositories/InputRepository.cs b/src/Aporta.Core/DataAccess/Repositories/InputRepository.cs deleted file mode 100644 index 5091fdf..0000000 --- a/src/Aporta.Core/DataAccess/Repositories/InputRepository.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Text.Json; -using System.Threading.Tasks; -using Aporta.Shared.Models; -using Dapper; - -namespace Aporta.Core.DataAccess.Repositories; - -public class InputRepository : JsonDocumentRepository -{ - public InputRepository(IDataAccess dataAccess) - { - DataAccess = dataAccess; - } - - protected override IDataAccess DataAccess { get; } - - protected override string TableName => "input"; - - protected override string SqlRowCount => "SELECT COUNT(*) FROM input"; - - public async Task GetForDriverId(string driverId) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - var result = await connection.QueryFirstOrDefaultAsync<(int Id, string Data)>( - @"SELECT i.id, i.data FROM input i - INNER JOIN endpoint e ON json_extract(i.data, '$.endpointId') = e.id - WHERE json_extract(e.data, '$.driverEndpointId') = @driverId", - new { driverId }); - - if (result.Data == null) return null; - - var input = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); - input.Id = result.Id; - return input; - } - - protected override void SetId(Input entity, int id) - { - entity.Id = id; - } - - protected override int GetId(Input entity) - { - return entity.Id; - } -} diff --git a/src/Aporta.Core/DataAccess/Repositories/OutputRepository.cs b/src/Aporta.Core/DataAccess/Repositories/OutputRepository.cs deleted file mode 100644 index 147cae7..0000000 --- a/src/Aporta.Core/DataAccess/Repositories/OutputRepository.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Text.Json; -using System.Threading.Tasks; -using Aporta.Shared.Models; -using Dapper; - -namespace Aporta.Core.DataAccess.Repositories; - -public class OutputRepository : JsonDocumentRepository -{ - public OutputRepository(IDataAccess dataAccess) - { - DataAccess = dataAccess; - } - - protected override IDataAccess DataAccess { get; } - - protected override string TableName => "output"; - - protected override string SqlRowCount => "SELECT COUNT(*) FROM output"; - - public async Task GetForDriverId(string driverId) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - var result = await connection.QueryFirstOrDefaultAsync<(int Id, string Data)>( - @"SELECT o.id, o.data FROM output o - INNER JOIN endpoint e ON json_extract(o.data, '$.endpointId') = e.id - WHERE json_extract(e.data, '$.driverEndpointId') = @driverId", - new { driverId }); - - if (result.Data == null) return null; - - var output = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); - output.Id = result.Id; - return output; - } - - protected override void SetId(Output entity, int id) - { - entity.Id = id; - } - - protected override int GetId(Output entity) - { - return entity.Id; - } -} diff --git a/src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs b/src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs index 7a10e84..62de4ff 100644 --- a/src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs @@ -12,8 +12,8 @@ namespace Aporta.Core.DataAccess.Repositories; /// public abstract class ProtoJsonRepository where T : IMessage, new() { - private static readonly JsonFormatter Formatter = new(JsonFormatter.Settings.Default); - private static readonly JsonParser Parser = new(JsonParser.Settings.Default); + protected static readonly JsonFormatter Formatter = new(JsonFormatter.Settings.Default); + protected static readonly JsonParser Parser = new(JsonParser.Settings.Default); protected abstract IDataAccess DataAccess { get; } protected abstract string TableName { get; } diff --git a/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs b/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs index 6825a9b..b96d35c 100644 --- a/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs @@ -1,3 +1,7 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Dapper; using Z9.Spcore.Proto; namespace Aporta.Core.DataAccess.Repositories; @@ -14,4 +18,59 @@ public Z9DevRepository(IDataAccess dataAccess) protected override IDataAccess DataAccess => _dataAccess; protected override string TableName => "z9_dev"; protected override int GetUnid(Dev message) => message.Unid; + + public async Task> GetAllByDevType(DevType devType) + { + var all = await GetAll(); + return all.Where(d => d.DevType == devType); + } + + public async Task GetByExternalId(string externalId) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var json = await connection.QueryFirstOrDefaultAsync( + @"SELECT data FROM z9_dev + WHERE json_extract(data, '$.externalId') = @externalId", + new { externalId }); + + return json == null ? null : Parser.Parse(json); + } + + public async Task> GetChildren(int parentUnid) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var results = await connection.QueryAsync( + @"SELECT data FROM z9_dev + WHERE json_extract(data, '$.logicalParentUnid') = @parentUnid", + new { parentUnid }); + + return results.Select(json => Parser.Parse(json)); + } + + public async Task GetForDriverId(string driverId) + { + return await GetByExternalId(driverId); + } + + public async Task Insert(Dev dev) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var nextId = await connection.ExecuteScalarAsync( + "SELECT COALESCE(MAX(id), 0) + 1 FROM z9_dev"); + + dev.Unid = nextId; + var json = Formatter.Format(dev); + + await connection.ExecuteAsync( + "INSERT INTO z9_dev (id, data) VALUES (@id, @data)", + new { id = nextId, data = json }); + + return nextId; + } } diff --git a/src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs b/src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs index 6538f1e..fc79b9c 100644 --- a/src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Aporta.Shared.Models; using Dapper; -using Google.Protobuf; using Z9.Spcore.Proto; namespace Aporta.Core.DataAccess.Repositories; @@ -14,9 +13,6 @@ namespace Aporta.Core.DataAccess.Repositories; /// public class Z9EvtRepository : ProtoJsonRepository { - private static readonly JsonFormatter Formatter = new(JsonFormatter.Settings.Default); - private static readonly JsonParser Parser = new(JsonParser.Settings.Default); - private readonly IDataAccess _dataAccess; public Z9EvtRepository(IDataAccess dataAccess) diff --git a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs index cec8c67..e2db481 100644 --- a/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs +++ b/src/Aporta.Core/DataAccess/SqLiteDataAccess.cs @@ -18,10 +18,7 @@ public class SqLiteDataAccess : IDataAccess private readonly IMigration[] _migrations = { - new _0000_InitialCreate(), - new _0001_AddZ9OpenTables(), - new _0002_AddZ9CredTable(), - new _0003_AddZ9EvtTable() + new _0000_InitialCreate() }; /// diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 45b7f05..84f7330 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -16,6 +16,8 @@ using Z9.Protobuf; using Z9.Spcore.Proto; +using Door = Aporta.Shared.Models.Door; + namespace Aporta.Core.Services; /// @@ -35,8 +37,8 @@ public class AccessService { private readonly ExtensionService _extensionService; private readonly ILogger _logger; - private readonly DoorRepository _doorRepository; private readonly EndpointRepository _endpointRepository; + private readonly Z9DevRepository _z9DevRepository; private readonly CredentialRepository _credentialRepository; private readonly Z9EvtRepository _z9EvtRepository; private readonly Z9CredRepository _z9CredRepository; @@ -46,6 +48,7 @@ public class AccessService private readonly HolRepository _holRepository; private readonly ConcurrentDictionary _processAccessCredential = new(); private readonly IHubContext _hubContext; + private readonly DoorConfigurationService _doorConfigurationService; private Func _getDoorUnidForEndpoint; private Func _getStrikeTimesForEndpoint; private Func _getDoorModeForEndpoint; @@ -62,11 +65,12 @@ public class AccessService /// Represents a service for accessing and managing system access. /// public AccessService(IDataAccess dataAccess, ExtensionService extensionService, - IHubContext hubContext, ILogger logger) + IHubContext hubContext, ILogger logger, + DoorConfigurationService doorConfigurationService) { - _doorRepository = new DoorRepository(dataAccess); _credentialRepository = new CredentialRepository(dataAccess); _endpointRepository = new EndpointRepository(dataAccess); + _z9DevRepository = new Z9DevRepository(dataAccess); _z9EvtRepository = new Z9EvtRepository(dataAccess); _z9CredRepository = new Z9CredRepository(dataAccess); _credTemplateRepository = new CredTemplateRepository(dataAccess); @@ -76,6 +80,7 @@ public AccessService(IDataAccess dataAccess, ExtensionService extensionService, _extensionService = extensionService; _hubContext = hubContext; _logger = logger; + _doorConfigurationService = doorConfigurationService; } /// @@ -228,7 +233,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA } } - private async Task<(bool granted, bool useExtendedTime)> IsAccessGranted(string matchingCardData, string pinData, DoorModeType? doorMode, Aporta.Shared.Models.Door matchingDoor, Endpoint accessPoint) + private async Task<(bool granted, bool useExtendedTime)> IsAccessGranted(string matchingCardData, string pinData, DoorModeType? doorMode, Door matchingDoor, Endpoint accessPoint) { // Guard: need at least a card or a PIN if (matchingCardData == null && pinData == null) @@ -653,7 +658,7 @@ async Task ControlStrike() /// Checks if the credential has privilege to access the door. /// Returns null if access is granted, or the EventReason for denial. /// - private async Task CheckAccessPrivilege(int credentialUnid, Aporta.Shared.Models.Door door, string endpointId) + private async Task CheckAccessPrivilege(int credentialUnid, Door door, string endpointId) { // Look up the Z9 Door unid for this endpoint int? z9DoorUnid = _getDoorUnidForEndpoint?.Invoke(endpointId); @@ -865,20 +870,31 @@ private async Task IsInSchedule(SchedRestriction schedRestriction) return inSched; } - private async Task MatchingDoor(string accessPointId, Endpoint[] endpoints) + private async Task MatchingDoor(string accessPointId, Endpoint[] endpoints) { - var doors = await _doorRepository.GetAll(); + // Find CredReader Dev by ExternalId = accessPointId (DriverEndpointId) + var credReaderDev = await _z9DevRepository.GetByExternalId(accessPointId); + if (credReaderDev == null || credReaderDev.DevType != DevType.CredReader) + return null; - var matchingDoor = doors.FirstOrDefault(door => - MatchingEndpointId(endpoints, accessPointId, door.InAccessEndpointId) || - MatchingEndpointId(endpoints, accessPointId, door.OutAccessEndpointId)); - return matchingDoor; - } - - private static bool MatchingEndpointId(IEnumerable endpoints, string accessPointId, int? endpointId) - { - if (endpointId == null) return false; - return endpointId == endpoints.FirstOrDefault(endpoint => endpoint.DriverEndpointId == accessPointId)?.Id; + if (credReaderDev.LogicalParentUnidCase != Dev.LogicalParentUnidOneofCase.LogicalParentUnid) + return null; + + var parentDev = await _z9DevRepository.Get(credReaderDev.LogicalParentUnid); + if (parentDev == null || parentDev.DevType != DevType.Door) + return null; + + // If the parent is an exit Door (has its own parent that's also a Door), go up one level + if (parentDev.LogicalParentUnidCase == Dev.LogicalParentUnidOneofCase.LogicalParentUnid) + { + var grandparentDev = await _z9DevRepository.Get(parentDev.LogicalParentUnid); + if (grandparentDev != null && grandparentDev.DevType == DevType.Door) + { + parentDev = grandparentDev; + } + } + + return await _doorConfigurationService.BuildDoorDto(parentDev); } private static Endpoint MatchingDoorStrike(int? doorStrikeEndpointId, IEnumerable endpoints) diff --git a/src/Aporta.Core/Services/DoorConfigurationService.cs b/src/Aporta.Core/Services/DoorConfigurationService.cs index ca3ea7c..c4d624b 100644 --- a/src/Aporta.Core/Services/DoorConfigurationService.cs +++ b/src/Aporta.Core/Services/DoorConfigurationService.cs @@ -8,6 +8,10 @@ using Aporta.Shared.Models; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; +using Z9.Protobuf; +using Z9.Spcore.Proto; + +using Door = Aporta.Shared.Models.Door; namespace Aporta.Core.Services; @@ -16,70 +20,257 @@ public class DoorConfigurationService( IHubContext hubContext, ILogger logger) { - private readonly DoorRepository _doorRepository = new(dataAccess); private readonly EndpointRepository _endpointRepository = new(dataAccess); - private readonly OutputRepository _outputRepository = new(dataAccess); - private readonly InputRepository _inputRepository = new(dataAccess); + private readonly Z9DevRepository _z9DevRepository = new(dataAccess); public async Task> AvailableAccessPoints() { var endpoints = await _endpointRepository.GetAll(); - var doors = (await _doorRepository.GetAll()).ToArray(); + var credReaders = await _z9DevRepository.GetAllByDevType(DevType.CredReader); + var credReaderExternalIds = credReaders + .Where(d => !string.IsNullOrEmpty(d.ExternalId)) + .Select(d => d.ExternalId) + .ToHashSet(); return endpoints.Where(endpoint => endpoint.Type == EndpointType.Reader && - !doors.Select(door => door.InAccessEndpointId).Contains(endpoint.Id) && - !doors.Select(door => door.OutAccessEndpointId).Contains(endpoint.Id)); + !credReaderExternalIds.Contains(endpoint.DriverEndpointId)); } public async Task> AvailableEndPoints() { var endpoints = await _endpointRepository.GetAll(); - var doors = (await _doorRepository.GetAll()).ToArray(); - var inputs = (await _inputRepository.GetAll()).ToArray(); - var outputs = (await _outputRepository.GetAll()).ToArray(); + var allDevs = (await _z9DevRepository.GetAll()).ToArray(); + var assignedExternalIds = allDevs + .Where(d => !string.IsNullOrEmpty(d.ExternalId)) + .Select(d => d.ExternalId) + .ToHashSet(); return endpoints.Where(endpoint => - //Find readers not assigned to a door - (endpoint.Type == EndpointType.Reader && - !doors.Select(door => door.InAccessEndpointId).Contains(endpoint.Id) && - !doors.Select(door => door.OutAccessEndpointId).Contains(endpoint.Id)) - || - //Find input endpoints not assigned to a door or input - (endpoint.Type == EndpointType.Input - && !doors.Select(door => door.DoorContactEndpointId).Contains(endpoint.Id) - && !inputs.Select(input => input.EndpointId).Contains(endpoint.Id)) - || - //Find output endpoints not assigned to a door or output - (endpoint.Type == EndpointType.Output - && !doors.Select(door => door.DoorStrikeEndpointId).Contains(endpoint.Id) - && !outputs.Select(output => output.EndpointId).Contains(endpoint.Id)) - ); + !assignedExternalIds.Contains(endpoint.DriverEndpointId)); } public async Task> GetAll() { - return await _doorRepository.GetAll(); + var allDevs = (await _z9DevRepository.GetAllByDevType(DevType.Door)).ToArray(); + // Top-level doors: those with no logical parent, or whose parent is not a Door + var topLevelDoors = new List(); + foreach (var dev in allDevs) + { + if (dev.LogicalParentUnidCase != Dev.LogicalParentUnidOneofCase.LogicalParentUnid) + { + topLevelDoors.Add(dev); + continue; + } + var parent = await _z9DevRepository.Get(dev.LogicalParentUnid); + if (parent == null || parent.DevType != DevType.Door) + { + topLevelDoors.Add(dev); + } + } + var doors = new List(); + foreach (var dev in topLevelDoors) + { + doors.Add(await BuildDoorDto(dev)); + } + return doors; } - + public async Task Get(int doorId) { - return await _doorRepository.Get(doorId); + var dev = await _z9DevRepository.Get(doorId); + if (dev == null || dev.DevType != DevType.Door) return null; + return await BuildDoorDto(dev); } public async Task Insert(Door door) { logger.LogDebug("Request to insert door {Name}", door.Name); - - await _doorRepository.Insert(door); - + + // Create the Door Dev + var doorDev = new Dev + { + Name = door.Name, + DevType = DevType.Door, + }; + SpCoreProtoUtil.InitRequired(doorDev); + var doorUnid = await _z9DevRepository.Insert(doorDev); + + // Create CredReader child for in-access + if (door.InAccessEndpointId.HasValue) + { + var endpoint = await _endpointRepository.Get(door.InAccessEndpointId.Value); + if (endpoint != null) + { + var childUnid = await CreateChildDev(doorUnid, DevType.CredReader, DevUse.ActuatorDoorStrike, + endpoint.DriverEndpointId, endpoint.Name, setDevUse: false); + doorDev.LogicalChildrenUnid.Add(childUnid); + } + } + + // Create exit Door child + CredReader grandchild for out-access + if (door.OutAccessEndpointId.HasValue) + { + var endpoint = await _endpointRepository.Get(door.OutAccessEndpointId.Value); + if (endpoint != null) + { + var exitDoorDev = new Dev + { + Name = $"{door.Name} - Exit", + DevType = DevType.Door, + LogicalParentUnid = doorUnid, + }; + SpCoreProtoUtil.InitRequired(exitDoorDev); + var exitDoorUnid = await _z9DevRepository.Insert(exitDoorDev); + doorDev.LogicalChildrenUnid.Add(exitDoorUnid); + + var grandchildUnid = await CreateChildDev(exitDoorUnid, DevType.CredReader, DevUse.ActuatorDoorStrike, + endpoint.DriverEndpointId, endpoint.Name, setDevUse: false); + exitDoorDev.LogicalChildrenUnid.Add(grandchildUnid); + await _z9DevRepository.Upsert(exitDoorDev); + } + } + + // Create Sensor child for door contact + if (door.DoorContactEndpointId.HasValue) + { + var endpoint = await _endpointRepository.Get(door.DoorContactEndpointId.Value); + if (endpoint != null) + { + var childUnid = await CreateChildDev(doorUnid, DevType.Sensor, DevUse.SensorDoorContact, + endpoint.DriverEndpointId, endpoint.Name); + doorDev.LogicalChildrenUnid.Add(childUnid); + } + } + + // Create Sensor child for REX + if (door.RequestToExitEndpointId.HasValue) + { + var endpoint = await _endpointRepository.Get(door.RequestToExitEndpointId.Value); + if (endpoint != null) + { + var childUnid = await CreateChildDev(doorUnid, DevType.Sensor, DevUse.SensorRex, + endpoint.DriverEndpointId, endpoint.Name); + doorDev.LogicalChildrenUnid.Add(childUnid); + } + } + + // Create Actuator child for door strike + if (door.DoorStrikeEndpointId.HasValue) + { + var endpoint = await _endpointRepository.Get(door.DoorStrikeEndpointId.Value); + if (endpoint != null) + { + var childUnid = await CreateChildDev(doorUnid, DevType.Actuator, DevUse.ActuatorDoorStrike, + endpoint.DriverEndpointId, endpoint.Name); + doorDev.LogicalChildrenUnid.Add(childUnid); + } + } + + // Update Door Dev with children + await _z9DevRepository.Upsert(doorDev); + door.Id = doorUnid; + await hubContext.Clients.All.SendAsync(Methods.DoorInserted, door.Id); } public async Task Delete(int id) { logger.LogDebug("Request to delete door with id of {Id}", id); - - await _doorRepository.Delete(id); - + + var doorDev = await _z9DevRepository.Get(id); + if (doorDev != null) + { + // Delete children recursively + var children = await _z9DevRepository.GetChildren(id); + foreach (var child in children) + { + // If child is an exit door, delete its grandchildren too + if (child.DevType == DevType.Door) + { + var grandchildren = await _z9DevRepository.GetChildren(child.Unid); + foreach (var grandchild in grandchildren) + { + await _z9DevRepository.Delete(grandchild.Unid); + } + } + await _z9DevRepository.Delete(child.Unid); + } + await _z9DevRepository.Delete(id); + } + await hubContext.Clients.All.SendAsync(Methods.DoorDeleted, id); } -} \ No newline at end of file + + private async Task CreateChildDev(int parentUnid, DevType devType, DevUse devUse, + string externalId, string name, bool setDevUse = true) + { + var dev = new Dev + { + Name = name, + DevType = devType, + ExternalId = externalId, + LogicalParentUnid = parentUnid, + }; + if (setDevUse) + { + dev.DevUse = devUse; + } + SpCoreProtoUtil.InitRequired(dev); + return await _z9DevRepository.Insert(dev); + } + + internal async Task BuildDoorDto(Dev doorDev) + { + var door = new Door + { + Id = doorDev.Unid, + Name = doorDev.Name, + }; + + var children = (await _z9DevRepository.GetChildren(doorDev.Unid)).ToArray(); + + foreach (var child in children) + { + switch (child.DevType) + { + case DevType.CredReader: + // In-access reader + var inEndpoint = await _endpointRepository.GetByDriverEndpointId(child.ExternalId); + if (inEndpoint != null) + door.InAccessEndpointId = inEndpoint.Id; + break; + + case DevType.Door: + // Exit door — get its CredReader grandchild for out-access + var grandchildren = (await _z9DevRepository.GetChildren(child.Unid)).ToArray(); + var outReader = grandchildren.FirstOrDefault(gc => gc.DevType == DevType.CredReader); + if (outReader != null) + { + var outEndpoint = await _endpointRepository.GetByDriverEndpointId(outReader.ExternalId); + if (outEndpoint != null) + door.OutAccessEndpointId = outEndpoint.Id; + } + break; + + case DevType.Sensor when child.DevUseCase == Dev.DevUseOneofCase.DevUse && child.DevUse == DevUse.SensorDoorContact: + var contactEndpoint = await _endpointRepository.GetByDriverEndpointId(child.ExternalId); + if (contactEndpoint != null) + door.DoorContactEndpointId = contactEndpoint.Id; + break; + + case DevType.Sensor when child.DevUseCase == Dev.DevUseOneofCase.DevUse && child.DevUse == DevUse.SensorRex: + var rexEndpoint = await _endpointRepository.GetByDriverEndpointId(child.ExternalId); + if (rexEndpoint != null) + door.RequestToExitEndpointId = rexEndpoint.Id; + break; + + case DevType.Actuator when child.DevUseCase == Dev.DevUseOneofCase.DevUse && child.DevUse == DevUse.ActuatorDoorStrike: + var strikeEndpoint = await _endpointRepository.GetByDriverEndpointId(child.ExternalId); + if (strikeEndpoint != null) + door.DoorStrikeEndpointId = strikeEndpoint.Id; + break; + } + } + + return door; + } +} diff --git a/src/Aporta.Core/Services/ExtensionService.cs b/src/Aporta.Core/Services/ExtensionService.cs index f4bc0ce..32ce715 100644 --- a/src/Aporta.Core/Services/ExtensionService.cs +++ b/src/Aporta.Core/Services/ExtensionService.cs @@ -37,7 +37,7 @@ public class ExtensionService( private readonly ExtensionRepository _extensionRepository = new(dataAccess); private readonly EndpointRepository _endpointRepository = new(dataAccess); - private readonly DoorRepository _doorRepository = new(dataAccess); + private readonly Z9DevRepository _z9DevRepository = new(dataAccess); private readonly List _extensions = new(); private readonly object _extensionLock = new (); @@ -283,15 +283,12 @@ private void DriverOnUpdatedEndpoints(object sender, EventArgs eventArgs) await _endpointRepository.Update(updateEndpoint); } - var allEndPoints = (await _endpointRepository.GetAll()).ToArray(); - var doors = (await _doorRepository.GetAll()).ToArray(); foreach (var endpoint in EndpointsToBeDeleted(driver, existingEndpoints)) { - if (IsEndPointAvailableForDelete(endpoint, doors, allEndPoints)) + if (await IsEndPointAvailableForDelete(endpoint)) { await _endpointRepository.Delete(endpoint.Id); } - } await SaveCurrentConfiguration(MatchingExtensionHost(driver.Id)); @@ -304,24 +301,11 @@ private void DriverOnUpdatedEndpoints(object sender, EventArgs eventArgs) } - private bool IsEndPointAvailableForDelete(Endpoint endpointToDelete, Door[] doors, IEnumerable endpoints) + private async Task IsEndPointAvailableForDelete(Endpoint endpointToDelete) { - var availableEndPoints = endpoints.Where(endpoint => - //Find readers not assigned to a door - (endpoint.Type == EndpointType.Reader && - !doors.Select(door => door.InAccessEndpointId).Contains(endpoint.Id) && - !doors.Select(door => door.OutAccessEndpointId).Contains(endpoint.Id)) - || - //Find inputs not assigned to a door - (endpoint.Type == EndpointType.Input && - !doors.Select(door => door.DoorContactEndpointId).Contains(endpoint.Id)) - || - //Find outputs not assigned to a door - (endpoint.Type == EndpointType.Output && - !doors.Select(door => door.DoorStrikeEndpointId).Contains(endpoint.Id)) - ); - - return availableEndPoints.Count(endpoint => endpoint.DriverEndpointId == endpointToDelete.DriverEndpointId) > 0; + // Check if any z9_dev references this endpoint's DriverEndpointId + var dev = await _z9DevRepository.GetByExternalId(endpointToDelete.DriverEndpointId); + return dev == null; } private void DriverOnAccessCredentialReceived(object sender, AccessCredentialReceivedEventArgs eventArgs) diff --git a/src/Aporta.Core/Services/InputService.cs b/src/Aporta.Core/Services/InputService.cs index b84e6be..f2239ac 100644 --- a/src/Aporta.Core/Services/InputService.cs +++ b/src/Aporta.Core/Services/InputService.cs @@ -15,8 +15,6 @@ namespace Aporta.Core.Services; public class InputService { - private readonly InputRepository _inputRepository; - private readonly DoorRepository _doorRepository; private readonly EndpointRepository _endpointRepository; private readonly Z9DevRepository _z9DevRepository; private readonly IHubContext _hubContext; @@ -27,8 +25,6 @@ public InputService(IDataAccess dataAccess, IHubContext> GetAll() { - return await _inputRepository.GetAll(); + var devs = await _z9DevRepository.GetAllByDevType(DevType.Sensor); + var tasks = devs.Select(async dev => await DevToInput(dev)); + return await Task.WhenAll(tasks); } - + public async Task Get(int inputId) { - return await _inputRepository.Get(inputId); + var dev = await _z9DevRepository.Get(inputId); + return dev == null ? null : await DevToInput(dev); } public async Task Insert(Input input) { - await _inputRepository.Insert(input); - + var endpoint = await _endpointRepository.Get(input.EndpointId); var dev = new Dev { - Unid = input.Id, Name = input.Name, DevType = DevType.Sensor, + ExternalId = endpoint.DriverEndpointId, }; SpCoreProtoUtil.InitRequired(dev); - await _z9DevRepository.Upsert(dev); + var id = await _z9DevRepository.Insert(dev); + input.Id = id; await _hubContext.Clients.All.SendAsync(Methods.InputInserted, input.Id); } public async Task Delete(int id) { - await _inputRepository.Delete(id); await _z9DevRepository.Delete(id); await _hubContext.Clients.All.SendAsync(Methods.InputDeleted, id); @@ -87,19 +88,37 @@ public async Task Delete(int id) public async Task> AvailableMonitorPoints() { var endpoints = await _endpointRepository.GetAll(); - var inputs = await _inputRepository.GetAll(); - var doors = (await _doorRepository.GetAll()).ToArray(); + var sensors = await _z9DevRepository.GetAllByDevType(DevType.Sensor); + var sensorExternalIds = sensors + .Where(d => !string.IsNullOrEmpty(d.ExternalId)) + .Select(d => d.ExternalId) + .ToHashSet(); return endpoints.Where(endpoint => endpoint.Type == EndpointType.Input && - !inputs.Select(input => input.EndpointId).Contains(endpoint.Id) && - !doors.Select(door => door.DoorContactEndpointId).Contains(endpoint.Id) && - !doors.Select(door => door.RequestToExitEndpointId).Contains(endpoint.Id)); + !sensorExternalIds.Contains(endpoint.DriverEndpointId)); } public async Task GetState(int inputId) { - var input = await _inputRepository.Get(inputId); - var endpoint = await _endpointRepository.Get(input.EndpointId); - return await _extensionService.GetMonitorPoint(endpoint.ExtensionId, endpoint.DriverEndpointId).GetState(); + var dev = await _z9DevRepository.Get(inputId); + var endpoint = await _endpointRepository.GetByDriverEndpointId(dev.ExternalId); + return await _extensionService.GetMonitorPoint(endpoint.ExtensionId, dev.ExternalId).GetState(); + } + + private async Task DevToInput(Dev dev) + { + var endpointId = 0; + if (!string.IsNullOrEmpty(dev.ExternalId)) + { + var endpoint = await _endpointRepository.GetByDriverEndpointId(dev.ExternalId); + if (endpoint != null) + endpointId = endpoint.Id; + } + return new Input + { + Id = dev.Unid, + Name = dev.Name, + EndpointId = endpointId, + }; } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/Services/OutputService.cs b/src/Aporta.Core/Services/OutputService.cs index 5099894..f686335 100644 --- a/src/Aporta.Core/Services/OutputService.cs +++ b/src/Aporta.Core/Services/OutputService.cs @@ -15,8 +15,6 @@ namespace Aporta.Core.Services; public class OutputService { - private readonly DoorRepository _doorRepository; - private readonly OutputRepository _outputRepository; private readonly EndpointRepository _endpointRepository; private readonly Z9DevRepository _z9DevRepository; private readonly IHubContext _hubContext; @@ -27,8 +25,6 @@ public OutputService(IDataAccess dataAccess, IHubContext> GetAll() { - return await _outputRepository.GetAll(); + var devs = await _z9DevRepository.GetAllByDevType(DevType.Actuator); + var tasks = devs.Select(async dev => await DevToOutput(dev)); + return await Task.WhenAll(tasks); } - + public async Task Get(int outputId) { - return await _outputRepository.Get(outputId); + var dev = await _z9DevRepository.Get(outputId); + return dev == null ? null : await DevToOutput(dev); } public async Task Insert(Output output) { - await _outputRepository.Insert(output); - + var endpoint = await _endpointRepository.Get(output.EndpointId); var dev = new Dev { - Unid = output.Id, Name = output.Name, DevType = DevType.Actuator, + ExternalId = endpoint.DriverEndpointId, }; SpCoreProtoUtil.InitRequired(dev); - await _z9DevRepository.Upsert(dev); + var id = await _z9DevRepository.Insert(dev); + output.Id = id; await _hubContext.Clients.All.SendAsync(Methods.OutputInserted, output.Id); } public async Task Delete(int id) { - await _outputRepository.Delete(id); await _z9DevRepository.Delete(id); await _hubContext.Clients.All.SendAsync(Methods.OutputDeleted, id); @@ -86,27 +87,46 @@ public async Task Delete(int id) public async Task> AvailableControlPoints() { var endpoints = await _endpointRepository.GetAll(); - var doors = await _doorRepository.GetAll(); - var outputs = await _outputRepository.GetAll(); + var actuators = await _z9DevRepository.GetAllByDevType(DevType.Actuator); + var actuatorExternalIds = actuators + .Where(d => !string.IsNullOrEmpty(d.ExternalId)) + .Select(d => d.ExternalId) + .ToHashSet(); return endpoints.Where(endpoint => endpoint.Type == EndpointType.Output && - !outputs.Select(output => output.EndpointId).Contains(endpoint.Id) && - !doors.Select(door => door.DoorStrikeEndpointId).Contains(endpoint.Id)); + !actuatorExternalIds.Contains(endpoint.DriverEndpointId)); } public async Task SetState(int outputId, bool state) { - var output = await _outputRepository.Get(outputId); - var endpoint = await _endpointRepository.Get(output.EndpointId); + var dev = await _z9DevRepository.Get(outputId); + var endpoint = await _endpointRepository.GetByDriverEndpointId(dev.ExternalId); await _extensionService.GetControlPoint(endpoint.ExtensionId, endpoint.DriverEndpointId).SetState(state); - - await _hubContext.Clients.All.SendAsync(Methods.OutputStateChanged, output.Id, state); + + await _hubContext.Clients.All.SendAsync(Methods.OutputStateChanged, dev.Unid, state); } public async Task GetState(int outputId) { - var output = await _outputRepository.Get(outputId); - var endpoint = await _endpointRepository.Get(output.EndpointId); + var dev = await _z9DevRepository.Get(outputId); + var endpoint = await _endpointRepository.GetByDriverEndpointId(dev.ExternalId); return await _extensionService.GetControlPoint(endpoint.ExtensionId, endpoint.DriverEndpointId).GetState(); } -} \ No newline at end of file + + private async Task DevToOutput(Dev dev) + { + var endpointId = 0; + if (!string.IsNullOrEmpty(dev.ExternalId)) + { + var endpoint = await _endpointRepository.GetByDriverEndpointId(dev.ExternalId); + if (endpoint != null) + endpointId = endpoint.Id; + } + return new Output + { + Id = dev.Unid, + Name = dev.Name, + EndpointId = endpointId, + }; + } +} diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index f50dd4f..1a56547 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -33,8 +33,8 @@ public class StartupWorker : BackgroundService private readonly ExtensionService _extensionService; private readonly AccessService _accessService; private readonly Z9OpenCommunityProtocolService _z9OpenCommunityProtocolService; - private readonly DoorRepository _doorRepository; private readonly EndpointRepository _endpointRepository; + private readonly Z9DevRepository _z9DevRepository; private readonly HashSet _configuredOsdpBuses = new(); private readonly Dictionary _doorStrikeActive = new(); private readonly Dictionary _doorForced = new(); @@ -57,8 +57,8 @@ public StartupWorker(IDataAccess dataAccess, _configuration = configuration; _logger = logger; _applicationLifetime = applicationLifetime; - _doorRepository = new DoorRepository(dataAccess); _endpointRepository = new EndpointRepository(dataAccess); + _z9DevRepository = new Z9DevRepository(dataAccess); } protected override async Task ExecuteAsync(CancellationToken stoppingToken) @@ -497,58 +497,62 @@ private static bool IsReaderEndpoint(string endpointId) private async Task EnsureDoorExistsForReader(string driverEndpointId, string readerName) { - // Look up the endpoint by DriverEndpointId to get its database ID - // The endpoint may not be persisted immediately, so retry a few times - Aporta.Shared.Models.Endpoint readerEndpoint = null; + // Check if CredReader Dev with this ExternalId already exists — door already exists + Dev existingCredReader = null; for (int retry = 0; retry < 10; retry++) { - var endpoints = await _endpointRepository.GetAll(); - readerEndpoint = endpoints.FirstOrDefault(ep => ep.DriverEndpointId == driverEndpointId); - if (readerEndpoint != null) + existingCredReader = await _z9DevRepository.GetByExternalId(driverEndpointId); + if (existingCredReader != null) break; + + // Endpoint may not be persisted immediately, check if it exists yet + var endpoint = await _endpointRepository.GetByDriverEndpointId(driverEndpointId); + if (endpoint != null) + break; // Endpoint exists but no dev yet — proceed to create + await Task.Delay(500); // Wait for endpoint to be persisted } - if (readerEndpoint == null) + if (existingCredReader != null && existingCredReader.DevType == DevType.CredReader) { - _logger.LogWarning("Cannot create door: endpoint not found for DriverEndpointId {Id} after retries", driverEndpointId); + _logger.LogDebug("CredReader Dev already exists for endpoint {EndpointId}, door exists", + driverEndpointId); return; } - var doors = await _doorRepository.GetAll(); - - // Check if any door already uses this reader as InAccess or OutAccess - var existingDoor = doors.FirstOrDefault(d => - d.InAccessEndpointId == readerEndpoint.Id || - d.OutAccessEndpointId == readerEndpoint.Id); - - if (existingDoor != null) + // Create Door Dev tree + var doorDev = new Dev { - _logger.LogDebug("Door '{DoorName}' already exists for reader endpoint {EndpointId}", - existingDoor.Name, readerEndpoint.Id); - return; - } + Name = $"Door - {readerName}", + DevType = DevType.Door, + }; + SpCoreProtoUtil.InitRequired(doorDev); + var doorUnid = await _z9DevRepository.Insert(doorDev); - // Create a new door with this reader as the in-access point - var door = new Aporta.Shared.Models.Door + // Create CredReader child + var credReaderDev = new Dev { - Name = $"Door - {readerName}", - InAccessEndpointId = readerEndpoint.Id, + Name = readerName, + DevType = DevType.CredReader, + ExternalId = driverEndpointId, + LogicalParentUnid = doorUnid, }; + SpCoreProtoUtil.InitRequired(credReaderDev); + var credReaderUnid = await _z9DevRepository.Insert(credReaderDev); + doorDev.LogicalChildrenUnid.Add(credReaderUnid); var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); - // If the reader has a strike output configured, wire it up + // If the reader has a strike output configured, create Actuator child if (config?.StrikeOutputNumber != null) { var strikeDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:O{config.StrikeOutputNumber}"; _logger.LogInformation("Looking for strike output endpoint: {StrikeEndpointId}", strikeDriverEndpointId); - Aporta.Shared.Models.Endpoint strikeEndpoint = null; + Endpoint strikeEndpoint = null; for (int retry = 0; retry < 20; retry++) { - var allEndpoints = await _endpointRepository.GetAll(); - strikeEndpoint = allEndpoints.FirstOrDefault(ep => ep.DriverEndpointId == strikeDriverEndpointId); + strikeEndpoint = await _endpointRepository.GetByDriverEndpointId(strikeDriverEndpointId); if (strikeEndpoint != null) break; await Task.Delay(500); @@ -556,9 +560,18 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea if (strikeEndpoint != null) { - door.DoorStrikeEndpointId = strikeEndpoint.Id; - _logger.LogInformation("Assigned door strike endpoint {StrikeEndpointId} to door '{DoorName}'", - strikeEndpoint.Id, door.Name); + var strikeDev = new Dev + { + Name = strikeEndpoint.Name, + DevType = DevType.Actuator, + DevUse = DevUse.ActuatorDoorStrike, + ExternalId = strikeDriverEndpointId, + LogicalParentUnid = doorUnid, + }; + SpCoreProtoUtil.InitRequired(strikeDev); + var strikeUnid = await _z9DevRepository.Insert(strikeDev); + doorDev.LogicalChildrenUnid.Add(strikeUnid); + _logger.LogInformation("Created Actuator Dev for door strike {EndpointId}", strikeDriverEndpointId); } else { @@ -566,22 +579,19 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea } } - // Insert door now so access processing can proceed while we wire optional contact endpoint - await _doorRepository.Insert(door); - _logger.LogInformation("Created door '{DoorName}' for reader endpoint {EndpointId} (strike={StrikeId})", - door.Name, readerEndpoint.Id, door.DoorStrikeEndpointId); + _logger.LogInformation("Created door '{DoorName}' (unid={DoorUnid}) for reader endpoint {EndpointId}", + doorDev.Name, doorUnid, driverEndpointId); - // If the reader has a door contact input configured, wire it up (may take time if endpoint hasn't appeared yet) + // If the reader has a door contact input configured, create Sensor child if (config?.DoorContactInputNumber != null) { var contactDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:I{config.DoorContactInputNumber}"; _logger.LogInformation("Looking for door contact input endpoint: {ContactEndpointId}", contactDriverEndpointId); - Aporta.Shared.Models.Endpoint contactEndpoint = null; + Endpoint contactEndpoint = null; for (int retry = 0; retry < 20; retry++) { - var allEndpoints = await _endpointRepository.GetAll(); - contactEndpoint = allEndpoints.FirstOrDefault(ep => ep.DriverEndpointId == contactDriverEndpointId); + contactEndpoint = await _endpointRepository.GetByDriverEndpointId(contactDriverEndpointId); if (contactEndpoint != null) break; await Task.Delay(500); @@ -589,10 +599,18 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea if (contactEndpoint != null) { - door.DoorContactEndpointId = contactEndpoint.Id; - await _doorRepository.Update(door); - _logger.LogInformation("Assigned door contact endpoint {ContactEndpointId} to door '{DoorName}'", - contactEndpoint.Id, door.Name); + var contactDev = new Dev + { + Name = contactEndpoint.Name, + DevType = DevType.Sensor, + DevUse = DevUse.SensorDoorContact, + ExternalId = contactDriverEndpointId, + LogicalParentUnid = doorUnid, + }; + SpCoreProtoUtil.InitRequired(contactDev); + var contactUnid = await _z9DevRepository.Insert(contactDev); + doorDev.LogicalChildrenUnid.Add(contactUnid); + _logger.LogInformation("Created Sensor Dev for door contact {EndpointId}", contactDriverEndpointId); } else { @@ -600,17 +618,16 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea } } - // If the reader has a REX input configured, wire it up + // If the reader has a REX input configured, create Sensor child if (config?.RexInputNumber != null) { var rexDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:I{config.RexInputNumber}"; _logger.LogInformation("Looking for REX input endpoint: {RexEndpointId}", rexDriverEndpointId); - Aporta.Shared.Models.Endpoint rexEndpoint = null; + Endpoint rexEndpoint = null; for (int retry = 0; retry < 20; retry++) { - var allEndpoints = await _endpointRepository.GetAll(); - rexEndpoint = allEndpoints.FirstOrDefault(ep => ep.DriverEndpointId == rexDriverEndpointId); + rexEndpoint = await _endpointRepository.GetByDriverEndpointId(rexDriverEndpointId); if (rexEndpoint != null) break; await Task.Delay(500); @@ -618,10 +635,18 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea if (rexEndpoint != null) { - door.RequestToExitEndpointId = rexEndpoint.Id; - await _doorRepository.Update(door); - _logger.LogInformation("Assigned REX endpoint {RexEndpointId} to door '{DoorName}'", - rexEndpoint.Id, door.Name); + var rexDev = new Dev + { + Name = rexEndpoint.Name, + DevType = DevType.Sensor, + DevUse = DevUse.SensorRex, + ExternalId = rexDriverEndpointId, + LogicalParentUnid = doorUnid, + }; + SpCoreProtoUtil.InitRequired(rexDev); + var rexUnid = await _z9DevRepository.Insert(rexDev); + doorDev.LogicalChildrenUnid.Add(rexUnid); + _logger.LogInformation("Created Sensor Dev for REX {EndpointId}", rexDriverEndpointId); } else { @@ -629,6 +654,9 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea } } + // Update Door Dev with children + await _z9DevRepository.Upsert(doorDev); + // Apply default door mode if configured if (config?.DefaultDoorMode != null && config.DoorUnid.HasValue) { @@ -699,8 +727,7 @@ private async Task HandleDoorMomentaryUnlock(int doorUnid) var strikeDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:O{config.StrikeOutputNumber}"; - var endpoints = await _endpointRepository.GetAll(); - var strikeEndpoint = endpoints.FirstOrDefault(ep => ep.DriverEndpointId == strikeDriverEndpointId); + var strikeEndpoint = await _endpointRepository.GetByDriverEndpointId(strikeDriverEndpointId); if (strikeEndpoint == null) { @@ -792,8 +819,7 @@ private async Task ApplyDoorMode(int doorUnid, DoorMode doorMode, Z9OpenCommunit if (config.StrikeOutputNumber != null) { var strikeDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:O{config.StrikeOutputNumber}"; - var endpoints = await _endpointRepository.GetAll(); - var strikeEndpoint = endpoints.FirstOrDefault(ep => ep.DriverEndpointId == strikeDriverEndpointId); + var strikeEndpoint = await _endpointRepository.GetByDriverEndpointId(strikeDriverEndpointId); if (strikeEndpoint != null) { @@ -850,26 +876,26 @@ private void OnStateChanged(object sender, StateChangedEventArgs e) private async Task HandleStateChanged(string driverEndpointId, bool state) { - // Look up the Aporta endpoint by driver endpoint ID - var endpoints = await _endpointRepository.GetAll(); - var endpoint = endpoints.FirstOrDefault(ep => ep.DriverEndpointId == driverEndpointId); - if (endpoint == null) + // Look up the Dev by ExternalId (DriverEndpointId) + var dev = await _z9DevRepository.GetByExternalId(driverEndpointId); + if (dev == null) return; - var doors = await _doorRepository.GetAll(); + // Get the door unid (parent) for state tracking + var doorUnid = dev.LogicalParentUnidCase == Dev.LogicalParentUnidOneofCase.LogicalParentUnid + ? dev.LogicalParentUnid : 0; - // Check if this is a REX input - var rexDoor = doors.FirstOrDefault(d => d.RequestToExitEndpointId == endpoint.Id); - if (rexDoor != null && state) + // Check if this is a REX sensor + if (dev.DevType == DevType.Sensor && dev.DevUseCase == Dev.DevUseOneofCase.DevUse && dev.DevUse == DevUse.SensorRex && state) { var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); if (config != null) { - _logger.LogInformation("REX activated for door '{DoorName}'", rexDoor.Name); + _logger.LogInformation("REX activated for door unid={DoorUnid}", doorUnid); _z9OpenCommunityProtocolService.SendDoorStateEvent(config, EvtCode.ExitRequested); // Determine REX behavior based on door mode - var currentMode = config.DoorUnid.HasValue && _doorCurrentMode.TryGetValue(config.DoorUnid.Value, out var mode) + var currentMode = doorUnid > 0 && _doorCurrentMode.TryGetValue(doorUnid, out var mode) ? mode : (DoorModeType?)null; if (currentMode == DoorModeType.StaticStateUnlocked) @@ -879,7 +905,7 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) else if (currentMode == DoorModeType.StaticStateLocked) { // Door is locked — do not unlock on REX - _logger.LogInformation("REX ignored for door '{DoorName}' — door is in locked mode", rexDoor.Name); + _logger.LogInformation("REX ignored for door unid={DoorUnid} — door is in locked mode", doorUnid); } else if (config.ActivateStrikeOnRex && config.DoorUnid.HasValue) { @@ -889,11 +915,11 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) return; } - // Check strike endpoint — track state for forced-open detection - var strikeDoor = doors.FirstOrDefault(d => d.DoorStrikeEndpointId == endpoint.Id); - if (strikeDoor != null) + // Check if this is a door strike actuator — track state for forced-open detection + if (dev.DevType == DevType.Actuator && dev.DevUseCase == Dev.DevUseOneofCase.DevUse && dev.DevUse == DevUse.ActuatorDoorStrike) { - _doorStrikeActive[strikeDoor.Id] = state; + if (doorUnid > 0) + _doorStrikeActive[doorUnid] = state; var evtCode = state ? EvtCode.DoorUnlocked : EvtCode.DoorLocked; var config2 = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); if (config2 != null) @@ -901,9 +927,8 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) return; } - // Check contact endpoint — detect forced open - var contactDoor = doors.FirstOrDefault(d => d.DoorContactEndpointId == endpoint.Id); - if (contactDoor != null) + // Check if this is a door contact sensor + if (dev.DevType == DevType.Sensor && dev.DevUseCase == Dev.DevUseOneofCase.DevUse && dev.DevUse == DevUse.SensorDoorContact) { var config2 = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); if (config2 == null) @@ -913,34 +938,34 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) { _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorOpened); - _doorStrikeActive.TryGetValue(contactDoor.Id, out var strikeActive); + _doorStrikeActive.TryGetValue(doorUnid, out var strikeActive); if (!strikeActive) { - _logger.LogWarning("Door forced open: '{DoorName}'", contactDoor.Name); + _logger.LogWarning("Door forced open: door unid={DoorUnid}", doorUnid); _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorForced); - _doorForced[contactDoor.Id] = true; + _doorForced[doorUnid] = true; } - StartDoorHeldTimer(contactDoor.Id, contactDoor.Name, config2); + StartDoorHeldTimer(doorUnid, dev.Name, config2); } else // Door closed { - CancelDoorHeldTimer(contactDoor.Id); + CancelDoorHeldTimer(doorUnid); _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorClosed); - if (_doorForced.TryGetValue(contactDoor.Id, out var wasForced) && wasForced) + if (_doorForced.TryGetValue(doorUnid, out var wasForced) && wasForced) { - _logger.LogInformation("Door forced cleared: '{DoorName}'", contactDoor.Name); + _logger.LogInformation("Door forced cleared: door unid={DoorUnid}", doorUnid); _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorNotForced); - _doorForced[contactDoor.Id] = false; + _doorForced[doorUnid] = false; } - if (_doorHeld.TryGetValue(contactDoor.Id, out var wasHeld) && wasHeld) + if (_doorHeld.TryGetValue(doorUnid, out var wasHeld) && wasHeld) { - _logger.LogInformation("Door held cleared: '{DoorName}'", contactDoor.Name); + _logger.LogInformation("Door held cleared: door unid={DoorUnid}", doorUnid); _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorNotHeld); - _doorHeld[contactDoor.Id] = false; + _doorHeld[doorUnid] = false; } } return; @@ -1058,4 +1083,4 @@ private void CancelAllDoorHeldTimers() } _doorHeldTimers.Clear(); } -} \ No newline at end of file +} diff --git a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs index 7c1c888..5f04896 100644 --- a/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/MigrationTests.cs @@ -8,7 +8,7 @@ namespace Aporta.Core.Tests.DataAccess; [TestFixture] public class MigrationTests { - private const int CurrentVersion = 103; + private const int CurrentVersion = 100; private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); private IDbConnection _persistConnection; diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/DoorRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/DoorRepositoryTests.cs deleted file mode 100644 index 6fc5e10..0000000 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/DoorRepositoryTests.cs +++ /dev/null @@ -1,134 +0,0 @@ -using System; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using Aporta.Core.DataAccess; -using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models; -using Aporta.Shared.Models; -using NUnit.Framework; - -namespace Aporta.Core.Tests.DataAccess.Repositories; - -public class DoorRepositoryTests -{ - private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); - private IDbConnection _persistConnection; - private Guid _extensionId; - private int _inAccessEndpointId; - private int _outAccessEndpointId; - private int _doorContactEndpointId; - private int _requestToExitEndpointId; - private int _doorStrikeEndpointId; - - [SetUp] - public async Task Setup() - { - _persistConnection = _dataAccess.CreateDbConnection(); - _persistConnection.Open(); - - await _dataAccess.UpdateSchema(); - - _extensionId = Guid.NewGuid(); - var extensions = new[] - { - new ExtensionHost {Id = _extensionId, Name = "ExtensionTest", Enabled = false} - }; - - var extensionRepository = new ExtensionRepository(_dataAccess); - foreach (var extension in extensions) - { - await extensionRepository.Insert(extension); - } - - var inAccessEndpoint = new Endpoint - {Name = "InAccessTest", Type = EndpointType.Reader, ExtensionId = _extensionId}; - var outAccessEndpoint = new Endpoint - {Name = "OutAccessTest", Type = EndpointType.Reader, ExtensionId = _extensionId}; - var doorContactEndpoint = new Endpoint - {Name = "DoorContactTest", Type = EndpointType.Input, ExtensionId = _extensionId}; - var requestToExitEndpoint = new Endpoint - {Name = "RequestToExitTest", Type = EndpointType.Input, ExtensionId = _extensionId}; - var doorStrikeEndpoint = new Endpoint - {Name = "DoorStrikeTest", Type = EndpointType.Output, ExtensionId = _extensionId}; - - var endpointRepository = new EndpointRepository(_dataAccess); - - await endpointRepository.Insert(inAccessEndpoint); - _inAccessEndpointId = inAccessEndpoint.Id; - await endpointRepository.Insert(outAccessEndpoint); - _outAccessEndpointId = outAccessEndpoint.Id; - await endpointRepository.Insert(doorContactEndpoint); - _doorContactEndpointId = doorContactEndpoint.Id; - await endpointRepository.Insert(requestToExitEndpoint); - _requestToExitEndpointId = requestToExitEndpoint.Id; - await endpointRepository.Insert(doorStrikeEndpoint); - _doorStrikeEndpointId = doorStrikeEndpoint.Id; - } - - [TearDown] - public void TearDown() - { - _persistConnection?.Close(); - _persistConnection?.Dispose(); - } - - [Test] - public async Task Insert() - { - // Arrange - var doors = new[] - { - new Door {Name = "DoorTest1", InAccessEndpointId = _inAccessEndpointId}, - new Door - { - Name = "DoorTest2", InAccessEndpointId = _inAccessEndpointId, - OutAccessEndpointId = _outAccessEndpointId, DoorContactEndpointId = _doorContactEndpointId, - RequestToExitEndpointId = _requestToExitEndpointId, DoorStrikeEndpointId = _doorStrikeEndpointId - } - }; - - var doorRepository = new DoorRepository(_dataAccess); - foreach (var door in doors) - { - await doorRepository.Insert(door); - } - - // Act - var actualDoor = await doorRepository.Get(2); - - // Assert - Assert.That(doors[1].Id, Is.EqualTo(2)); - Assert.That(actualDoor.Id, Is.EqualTo(2)); - Assert.That(actualDoor.Name, Is.EqualTo("DoorTest2")); - Assert.That(actualDoor.InAccessEndpointId, Is.EqualTo(_inAccessEndpointId)); - Assert.That(actualDoor.OutAccessEndpointId, Is.EqualTo(_outAccessEndpointId)); - Assert.That(actualDoor.DoorContactEndpointId, Is.EqualTo(_doorContactEndpointId)); - Assert.That(actualDoor.RequestToExitEndpointId, Is.EqualTo(_requestToExitEndpointId)); - Assert.That(actualDoor.DoorStrikeEndpointId, Is.EqualTo(_doorStrikeEndpointId)); - } - - [Test] - public async Task Delete() - { - // Arrange - var doors = new[] - { - new Door {Name = "DoorTest1"}, - new Door {Name = "DoorTest2"} - }; - - var doorRepository = new DoorRepository(_dataAccess); - foreach (var door in doors) - { - await doorRepository.Insert(door); - } - - // Act - await doorRepository.Delete(2); - - // Assert - var actualDoors = await doorRepository.GetAll(); - Assert.That(1, Is.EqualTo(actualDoors.Count())); - } -} \ No newline at end of file diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/InputRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/InputRepositoryTests.cs deleted file mode 100644 index 3cc8e78..0000000 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/InputRepositoryTests.cs +++ /dev/null @@ -1,102 +0,0 @@ -using System; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using Aporta.Core.DataAccess; -using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models; -using Aporta.Shared.Models; -using NUnit.Framework; - -namespace Aporta.Core.Tests.DataAccess.Repositories; - -public class InputRepositoryTests -{ - private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); - private IDbConnection _persistConnection; - private Guid _extensionId; - private int _endpointId; - - [SetUp] - public async Task Setup() - { - _persistConnection = _dataAccess.CreateDbConnection(); - _persistConnection.Open(); - - await _dataAccess.UpdateSchema(); - - _extensionId = Guid.NewGuid(); - var extensions = new[] - { - new ExtensionHost {Id = _extensionId, Name = "ExtensionTest", Enabled = false} - }; - - var extensionRepository = new ExtensionRepository(_dataAccess); - foreach (var extension in extensions) - { - await extensionRepository.Insert(extension); - } - - var endpoint = new Endpoint {Name = "Test1", Type = EndpointType.Input, ExtensionId = _extensionId}; - var endpointRepository = new EndpointRepository(_dataAccess); - await endpointRepository.Insert(endpoint); - _endpointId = endpoint.Id; - } - - [TearDown] - public void TearDown() - { - _persistConnection?.Close(); - _persistConnection?.Dispose(); - } - - [Test] - public async Task Insert() - { - // Arrange - var inputs = new[] - { - new Input {Name = "Test1", EndpointId = _endpointId}, - new Input {Name = "Test2", EndpointId = _endpointId}, - new Input {Name = "Test3", EndpointId = _endpointId} - }; - - var inputRepository = new InputRepository(_dataAccess); - foreach (var input in inputs) - { - await inputRepository.Insert(input); - } - - // Act - var actualInput = await inputRepository.Get(3); - - // Assert - Assert.That(inputs[2].Id, Is.EqualTo(3)); - Assert.That(actualInput.Id, Is.EqualTo(3)); - Assert.That(actualInput.Name, Is.EqualTo("Test3")); - Assert.That(actualInput.EndpointId, Is.EqualTo(_endpointId)); - } - - [Test] - public async Task Delete() - { - // Arrange - var inputRepository = new InputRepository(_dataAccess); - foreach (var input in new[] - { - new Input {Name = "Test1", EndpointId = _endpointId}, - new Input {Name = "Test2", EndpointId = _endpointId}, - new Input {Name = "Test3", EndpointId = _endpointId} - }) - { - await inputRepository.Insert(input); - } - - // Act - await inputRepository.Delete(3); - - // Assert - var actualInput = await inputRepository.GetAll(); - Assert.That(2, Is.EqualTo(actualInput.Count())); - } -} \ No newline at end of file diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/OutputRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/OutputRepositoryTests.cs deleted file mode 100644 index 978b838..0000000 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/OutputRepositoryTests.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using Aporta.Core.DataAccess; -using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models; -using Aporta.Shared.Models; -using NUnit.Framework; - -namespace Aporta.Core.Tests.DataAccess.Repositories; - -public class OutputRepositoryTests -{ - private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); - private IDbConnection _persistConnection; - private Guid _extensionId; - private int _endpointId; - - [SetUp] - public async Task Setup() - { - _persistConnection = _dataAccess.CreateDbConnection(); - _persistConnection.Open(); - - await _dataAccess.UpdateSchema(); - - _extensionId = Guid.NewGuid(); - var extensions = new[] - { - new ExtensionHost {Id = _extensionId, Name = "ExtensionTest", Enabled = false} - }; - - var extensionRepository = new ExtensionRepository(_dataAccess); - foreach (var extension in extensions) - { - await extensionRepository.Insert(extension); - } - - var endpoint = new Endpoint {Name = "Test1", Type = EndpointType.Output, ExtensionId = _extensionId}; - var endpointRepository = new EndpointRepository(_dataAccess); - await endpointRepository.Insert(endpoint); - _endpointId = endpoint.Id; - } - - [TearDown] - public void TearDown() - { - _persistConnection?.Close(); - _persistConnection?.Dispose(); - } - - [Test] - public async Task Insert() - { - // Arrange - var outputs = new[] - { - new Output {Name = "Test1", EndpointId = _endpointId}, - new Output {Name = "Test2", EndpointId = _endpointId}, - new Output {Name = "Test3", EndpointId = _endpointId} - }; - - var outputRepository = new OutputRepository(_dataAccess); - foreach (var output in outputs) - { - await outputRepository.Insert(output); - } - - // Act - var actualOutput = await outputRepository.Get(3); - - // Assert - Assert.That(outputs[2].Id, Is.EqualTo(3)); - Assert.That(actualOutput.Id, Is.EqualTo(3)); - Assert.That(actualOutput.Name, Is.EqualTo("Test3")); - Assert.That(actualOutput.EndpointId, Is.EqualTo(_endpointId)); - } - - [Test] - public async Task Delete() - { - // Arrange - var outputs = new[] - { - new Output {Name = "Test1", EndpointId = _endpointId}, - new Output {Name = "Test2", EndpointId = _endpointId}, - new Output {Name = "Test3", EndpointId = _endpointId} - }; - - var outputRepository = new OutputRepository(_dataAccess); - foreach (var output in outputs) - { - await outputRepository.Insert(output); - } - - // Act - await outputRepository.Delete(3); - - // Assert - var actualOutputs = await outputRepository.GetAll(); - Assert.That(2, Is.EqualTo(actualOutputs.Count())); - } -} \ No newline at end of file diff --git a/test/Aporta.Core.Tests/Services/InputServiceTests.cs b/test/Aporta.Core.Tests/Services/InputServiceTests.cs index a45b4df..6ec7034 100644 --- a/test/Aporta.Core.Tests/Services/InputServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/InputServiceTests.cs @@ -54,8 +54,8 @@ public async Task Setup() { await Task.Delay(TimeSpan.FromSeconds(1), cancellationTokenSource.Token); } - - if(cancellationTokenSource.Token.IsCancellationRequested) + + if(cancellationTokenSource.Token.IsCancellationRequested) { Assert.Fail("Timeout waiting for endpoints to be inserted"); } @@ -65,7 +65,7 @@ public async Task Setup() public void TearDown() { _extensionService.Shutdown(); - + _persistConnection?.Close(); _persistConnection?.Dispose(); } @@ -83,10 +83,9 @@ public async Task GetState() new Input {Name = "TestInput2", EndpointId = 5} }; - var inputRepository = new InputRepository(_dataAccess); foreach (var input in inputs) { - await inputRepository.Insert(input); + await inputService.Insert(input); } // Act @@ -111,10 +110,9 @@ public async Task ReceiveStateChange() new Input {Name = "TestInput2", EndpointId = 5} }; - var inputRepository = new InputRepository(_dataAccess); foreach (var input in inputs) { - await inputRepository.Insert(input); + await inputService.Insert(input); } // Act @@ -125,7 +123,7 @@ public async Task ReceiveStateChange() Assert.That(async () => await inputService.GetState(inputs[1].Id), Is.True.After(1000, 100)); hubContext.ClientsAllMock.Verify(clientProxy => - clientProxy.SendCoreAsync(Methods.InputStateChanged, new object[] {2, true}, + clientProxy.SendCoreAsync(Methods.InputStateChanged, new object[] {inputs[1].Id, true}, It.IsAny())); } @@ -133,10 +131,10 @@ private static async Task SendInputState(string id, bool state) { await using var pipeClient = new NamedPipeClientStream(".", "Aporta.TestDriverMonitorPoint", PipeDirection.Out, PipeOptions.Asynchronous); - + await pipeClient.ConnectAsync(); await using var writer = new StreamWriter(pipeClient); writer.AutoFlush = true; await writer.WriteLineAsync($"{id}|{state}"); } -} \ No newline at end of file +} diff --git a/test/Aporta.Core.Tests/Services/OutputServiceTests.cs b/test/Aporta.Core.Tests/Services/OutputServiceTests.cs index 4d6ffba..972bc00 100644 --- a/test/Aporta.Core.Tests/Services/OutputServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/OutputServiceTests.cs @@ -48,8 +48,8 @@ public async Task Setup() { await Task.Delay(TimeSpan.FromSeconds(1), cancellationTokenSource.Token); } - - if(cancellationTokenSource.Token.IsCancellationRequested) + + if(cancellationTokenSource.Token.IsCancellationRequested) { Assert.Fail("Timeout waiting for endpoints to be inserted"); } @@ -59,7 +59,7 @@ public async Task Setup() public void TearDown() { _extensionService.Shutdown(); - + _persistConnection?.Close(); _persistConnection?.Dispose(); } @@ -71,16 +71,15 @@ public async Task SetState() var outputService = new OutputService(_dataAccess, new UnitTestingSupportForIHubContext().IHubContextMock.Object, _extensionService); - + var outputs = new[] { new Output {Name = "TestOutput1", EndpointId = 2}, new Output {Name = "TestOutput2", EndpointId = 3} }; - var outputRepository = new OutputRepository(_dataAccess); foreach (var output in outputs) { - await outputRepository.Insert(output); + await outputService.Insert(output); } // Act @@ -91,4 +90,4 @@ public async Task SetState() Assert.That(await outputService.GetState(outputs[0].Id), Is.True); Assert.That(await outputService.GetState(outputs[1].Id), Is.False); } -} \ No newline at end of file +} From d52ee25e552858be9474ecad424e11b6bcefdb2d Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 20:26:29 -0500 Subject: [PATCH 51/86] Generate RAW_CRED_READ events on unknown reads instead of auto-enrolling Replace auto-credential creation with a RAW_CRED_READ event containing the raw card bits. On an unknown read, two events are now generated: AccessDenied (for the door denial) and RAW_CRED_READ (for future enrollment from raw reads). Remove SetEnrollmentHandler and standalone SetCardDataDecoder wiring. Bump Z9.Protobuf.Community to 1.0.10. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- src/Aporta.Core/Services/AccessService.cs | 63 +++++++++---------- src/Aporta.Migration/Aporta.Migration.csproj | 2 +- src/Aporta/Aporta.csproj | 2 +- src/Aporta/Workers/StartupWorker.cs | 23 ------- .../Aporta.Core.Tests.csproj | 2 +- .../Aporta.Migration.Tests.csproj | 2 +- 7 files changed, 36 insertions(+), 60 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 334c891..f1c9f88 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 84f7330..386d90b 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -53,7 +53,6 @@ public class AccessService private Func _getStrikeTimesForEndpoint; private Func _getDoorModeForEndpoint; private Func _decodeCardData; - private Func> _enrollCredential; /// /// Event raised when an access decision is made (granted or denied). @@ -119,16 +118,6 @@ public void SetCardDataDecoder(Func decodeCardData) _decodeCardData = decodeCardData; } - /// - /// Sets a handler called during auto-enrollment to create Z9 data structures - /// (DataFormat, CredTemplate, Z9 Cred) for a newly enrolled credential. - /// Signature: (rawBits, credentialId, doorId) → credNum string. - /// - public void SetEnrollmentHandler(Func> enrollCredential) - { - _enrollCredential = enrollCredential; - } - public void Startup() { _extensionService.AccessCredentialReceived += ExtensionServiceOnAccessCredentialReceived; @@ -307,27 +296,9 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA if (assignedCredential == null) { - if (_enrollCredential != null) - { - // Create credential and Z9 data chain (DataFormat, CredTemplate, Z9 Cred) - // but leave unassigned — admin must enroll via API - var credentialId = await _credentialRepository.Insert(new Credential - { Number = matchingCardData, LastEvent = eventId }); - var credNum = await _enrollCredential(matchingCardData, credentialId, matchingDoor.Id); - // Update credential number to decoded credNum - var credential = await _credentialRepository.Get(credentialId); - if (credential != null) - { - credential.Number = credNum; - credential.LastEvent = eventId; - await _credentialRepository.Update(credential); - } - } - else - { - await _credentialRepository.Insert(new Credential - { Number = matchingCardData, LastEvent = eventId }); - } + // Insert RAW_CRED_READ event with raw bits — credential will be created + // later from this event during enrollment + await InsertRawCredReadEvt(matchingCardData, accessPoint); } else { @@ -626,6 +597,34 @@ private async Task InsertAccessEvt(EventType eventType, EventReason reason, return await _z9EvtRepository.Insert(evt); } + private async Task InsertRawCredReadEvt(string rawBits, Endpoint accessPoint) + { + var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); + var evt = new Evt + { + EvtCode = EvtCode.RawCredRead, + HwTime = new DateTimeData { Millis = nowMillis }, + DbTime = new DateTimeData { Millis = nowMillis }, + Consumed = false, + Priority = 0, + Data = rawBits, + }; + + // Set EvtDevRef to the CredReader dev if available + var credReaderDev = await _z9DevRepository.GetByExternalId(accessPoint.DriverEndpointId); + if (credReaderDev != null) + { + evt.EvtDevRef = new EvtDevRef + { + Unid = credReaderDev.Unid, + Name = credReaderDev.Name, + DevType = DevType.CredReader + }; + } + + await _z9EvtRepository.Insert(evt); + } + private int GetStrikeTimeMs(string endpointId, bool useExtendedTime) { var (strikeTimeMs, extendedStrikeTimeMs) = _getStrikeTimesForEndpoint?.Invoke(endpointId) ?? (null, null); diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index ca85d8c..562457c 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index b29a5f2..0221fa6 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 1a56547..95cb8b1 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -142,29 +142,6 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) "Z9/Open Community protocol service not started" + " (use --z9OpenCommunityHost to specify upstream host)"); - // Wire card data decoder — creates raw DataFormat on first encounter - _accessService.SetCardDataDecoder(rawBits => - { - var result = _z9OpenCommunityProtocolService.DecodeCardRead(rawBits); - if (result == null) - { - _z9OpenCommunityProtocolService.EnsureRawDataFormat(rawBits.Length); - result = _z9OpenCommunityProtocolService.DecodeCardRead(rawBits); - } - return result?.credNum.ToString(); - }); - - // Wire enrollment handler — creates Z9 data chain on first enrollment - _accessService.SetEnrollmentHandler((rawBits, credentialId, doorId) => - { - _z9OpenCommunityProtocolService.EnsureRawDataFormat(rawBits.Length); - _z9OpenCommunityProtocolService.EnsureDefaultCredTemplate(); - var decoded = _z9OpenCommunityProtocolService.DecodeCardRead(rawBits); - var credNum = decoded!.Value.credNum; - _z9OpenCommunityProtocolService.CreateStandaloneCred(credentialId, credNum, doorId); - return Task.FromResult(credNum.ToString()); - }); - // Primary config mode: configure OSDP from a JSON file if (isPrimaryConfigMode) { diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index efcc907..9141e65 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index 7267f73..4bb8f0b 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,7 +10,7 @@ - + From 067d8b30be5baea8899b0b0a7620a988cefd16b4 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 20:27:09 -0500 Subject: [PATCH 52/86] Remove person and credential_assignment tables and PersonRepository MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These tables are unused — person data is managed through the Z9/Flex API and stored in the z9_cred proto chain, not in separate tables. Co-Authored-By: Claude Opus 4.6 --- .../Migrations/_0000_InitialCreate.cs | 14 -- .../Repositories/PersonRepository.cs | 27 --- .../Repositories/PersonRepositoryTests.cs | 173 ------------------ 3 files changed, 214 deletions(-) delete mode 100644 src/Aporta.Core/DataAccess/Repositories/PersonRepository.cs delete mode 100644 test/Aporta.Core.Tests/DataAccess/Repositories/PersonRepositoryTests.cs diff --git a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs index 6c5af98..8c3184e 100644 --- a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs +++ b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs @@ -49,20 +49,6 @@ data TEXT NOT NULL ); CREATE UNIQUE INDEX credential_number_uindex ON credential (json_extract(data, '$.number')); - -- Person table - CREATE TABLE person ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - - -- Credential assignment table (junction table as document) - CREATE TABLE credential_assignment ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - CREATE INDEX idx_ca_credential ON credential_assignment (json_extract(data, '$.credentialId')); - CREATE INDEX idx_ca_person ON credential_assignment (json_extract(data, '$.personId')); - -- Credential Template table CREATE TABLE cred_template ( id INTEGER NOT NULL PRIMARY KEY, diff --git a/src/Aporta.Core/DataAccess/Repositories/PersonRepository.cs b/src/Aporta.Core/DataAccess/Repositories/PersonRepository.cs deleted file mode 100644 index b936b2f..0000000 --- a/src/Aporta.Core/DataAccess/Repositories/PersonRepository.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Aporta.Shared.Models; - -namespace Aporta.Core.DataAccess.Repositories; - -public class PersonRepository : JsonDocumentRepository -{ - public PersonRepository(IDataAccess dataAccess) - { - DataAccess = dataAccess; - } - - protected override IDataAccess DataAccess { get; } - - protected override string TableName => "person"; - - protected override string SqlRowCount => "SELECT COUNT(*) FROM person"; - - protected override void SetId(Person entity, int id) - { - entity.Id = id; - } - - protected override int GetId(Person entity) - { - return entity.Id; - } -} diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/PersonRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/PersonRepositoryTests.cs deleted file mode 100644 index 501f8d7..0000000 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/PersonRepositoryTests.cs +++ /dev/null @@ -1,173 +0,0 @@ -using System; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using Aporta.Core.DataAccess; -using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models; -using Aporta.Shared.Models; -using NUnit.Framework; - -namespace Aporta.Core.Tests.DataAccess.Repositories; - -public class PersonRepositoryTests -{ - private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); - private IDbConnection _persistConnection; - private Guid _extensionId; - - [SetUp] - public async Task Setup() - { - _persistConnection = _dataAccess.CreateDbConnection(); - _persistConnection.Open(); - - await _dataAccess.UpdateSchema(); - - _extensionId = Guid.NewGuid(); - var extensions = new[] - { - new ExtensionHost {Id = _extensionId, Name = "ExtensionTest", Enabled = false} - }; - - var extensionRepository = new ExtensionRepository(_dataAccess); - foreach (var extension in extensions) - { - await extensionRepository.Insert(extension); - } - } - - [TearDown] - public void TearDown() - { - _persistConnection?.Close(); - _persistConnection?.Dispose(); - } - - [Test] - public async Task Insert() - { - // Arrange - var people = new[] - { - new Person {FirstName = "First1", LastName = "Last1", Enabled = false}, - new Person {FirstName = "First2", LastName = "Last2", Enabled = true}, - }; - - var personRepository = new PersonRepository(_dataAccess); - foreach (var person in people) - { - await personRepository.Insert(person); - } - - // Act - var actualPerson = await personRepository.Get(2); - - // Assert - Assert.That(people[1].Id, Is.EqualTo(2)); - Assert.That(actualPerson.Id, Is.EqualTo(2)); - Assert.That(actualPerson.FirstName, Is.EqualTo("First2")); - Assert.That(actualPerson.LastName, Is.EqualTo("Last2")); - Assert.That(actualPerson.Enabled, Is.True); - } - - [Test] - public async Task Delete() - { - // Arrange - var people = new[] - { - new Person {FirstName = "First1", LastName = "Last1", Enabled = false}, - new Person {FirstName = "First2", LastName = "Last2", Enabled = true}, - }; - - var personRepository = new PersonRepository(_dataAccess); - foreach (var person in people) - { - await personRepository.Insert(person); - } - - // Act - await personRepository.Delete(2); - - // Assert - var actualPeople = await personRepository.GetAll(); - Assert.That(1, Is.EqualTo(actualPeople.Count())); - } - - [Test] - public async Task Insert_WithExplicitId() - { - // Arrange - var personRepository = new PersonRepository(_dataAccess); - var person = new Person { FirstName = "Explicit", LastName = "IdPerson", Enabled = true }; - - // Act - int id = await personRepository.Insert(person, explicitId: 100); - - // Assert - Assert.That(id, Is.EqualTo(100)); - Assert.That(person.Id, Is.EqualTo(100)); - - var retrieved = await personRepository.Get(100); - Assert.That(retrieved.FirstName, Is.EqualTo("Explicit")); - Assert.That(retrieved.LastName, Is.EqualTo("IdPerson")); - } - - [Test] - public async Task Insert_WithExplicitIds_OutOfOrder() - { - // Arrange - simulates upstream data arriving out of order - var personRepository = new PersonRepository(_dataAccess); - - // Act - insert IDs out of sequence - await personRepository.Insert(new Person { FirstName = "Third", LastName = "Person", Enabled = true }, explicitId: 300); - await personRepository.Insert(new Person { FirstName = "First", LastName = "Person", Enabled = true }, explicitId: 100); - await personRepository.Insert(new Person { FirstName = "Second", LastName = "Person", Enabled = true }, explicitId: 200); - - // Assert - var all = (await personRepository.GetAll()).ToList(); - Assert.That(all.Count, Is.EqualTo(3)); - Assert.That((await personRepository.Get(100)).FirstName, Is.EqualTo("First")); - Assert.That((await personRepository.Get(200)).FirstName, Is.EqualTo("Second")); - Assert.That((await personRepository.Get(300)).FirstName, Is.EqualTo("Third")); - } - - [Test] - public async Task Upsert_InsertsNewRecord() - { - // Arrange - var personRepository = new PersonRepository(_dataAccess); - var person = new Person { FirstName = "New", LastName = "Person", Enabled = true }; - - // Act - await personRepository.Upsert(person, 50); - - // Assert - var retrieved = await personRepository.Get(50); - Assert.That(retrieved, Is.Not.Null); - Assert.That(retrieved.FirstName, Is.EqualTo("New")); - Assert.That(person.Id, Is.EqualTo(50)); - } - - [Test] - public async Task Upsert_UpdatesExistingRecord() - { - // Arrange - var personRepository = new PersonRepository(_dataAccess); - var original = new Person { FirstName = "Original", LastName = "Name", Enabled = false }; - await personRepository.Insert(original, explicitId: 75); - - // Act - var updated = new Person { FirstName = "Updated", LastName = "Name", Enabled = true }; - await personRepository.Upsert(updated, 75); - - // Assert - var retrieved = await personRepository.Get(75); - Assert.That(retrieved.FirstName, Is.EqualTo("Updated")); - Assert.That(retrieved.Enabled, Is.True); - - var all = await personRepository.GetAll(); - Assert.That(all.Count(), Is.EqualTo(1)); - } -} \ No newline at end of file From 9c96b663888cc6bd582a3eddbbef424127e5688f Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 21:26:52 -0500 Subject: [PATCH 53/86] Remove LastEvent from credential table and all references MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LastEvent is no longer needed — event history can be queried from z9_evt if ever required. This simplifies the credential model and removes coupling between credential records and event IDs. Co-Authored-By: Claude Opus 4.6 --- .../Repositories/CredentialRepository.cs | 22 --------------- src/Aporta.Core/Services/AccessService.cs | 18 ++++-------- src/Aporta.Core/Services/CredentialService.cs | 1 - src/Aporta.Shared/Models/Credential.cs | 2 -- .../Pages/configuration/Credentials.razor | 28 ++++--------------- .../Repositories/CredentialRepositoryTests.cs | 21 ++------------ 6 files changed, 14 insertions(+), 78 deletions(-) diff --git a/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs b/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs index 1a589cc..3eef93c 100644 --- a/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs @@ -169,28 +169,6 @@ FROM credential c }); } - public async Task UpdateLastEvent(int credentialId, int lastEventId) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - // Get the current credential data - var currentData = await connection.QuerySingleOrDefaultAsync( - "SELECT data FROM credential WHERE id = @credentialId", - new { credentialId }); - - if (currentData != null) - { - var credential = JsonSerializer.Deserialize(currentData, GetJsonOptions()); - credential.LastEvent = lastEventId; - var newJson = JsonSerializer.Serialize(credential, GetJsonOptions()); - - await connection.ExecuteAsync( - "UPDATE credential SET data = @data WHERE id = @credentialId", - new { data = newJson, credentialId }); - } - } - public static Person ParsePersonFromName(string credName, int id, bool enabled) { var person = new Person { Id = id, Enabled = enabled }; diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 386d90b..d8fcc9a 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -300,10 +300,6 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA // later from this event during enrollment await InsertRawCredReadEvt(matchingCardData, accessPoint); } - else - { - await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); - } await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); @@ -339,7 +335,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA EventReason = EventReason.NoCredentialTemplate, CardNumber = matchingCardData }); - await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs @@ -368,7 +364,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA EventReason = EventReason.CredentialDisabled, CardNumber = matchingCardData }); - await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs @@ -401,7 +397,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA EventReason = EventReason.CredentialNotYetEffective, CardNumber = matchingCardData }); - await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs @@ -435,7 +431,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA EventReason = EventReason.CredentialExpired, CardNumber = matchingCardData }); - await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs @@ -468,7 +464,6 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA EventReason = reason, CardNumber = matchingCardData }); - await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); @@ -501,7 +496,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA EventReason = EventReason.NoConfirmingPin, CardNumber = matchingCardData }); - await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs { @@ -526,7 +521,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA EventReason = EventReason.IncorrectConfirmingPin, CardNumber = matchingCardData }); - await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs { @@ -556,7 +551,6 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA EventReason = EventReason.None, CardNumber = matchingCardData }); - await _credentialRepository.UpdateLastEvent(assignedCredential.Id, eventId); await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); diff --git a/src/Aporta.Core/Services/CredentialService.cs b/src/Aporta.Core/Services/CredentialService.cs index b8134a6..cdf83fb 100644 --- a/src/Aporta.Core/Services/CredentialService.cs +++ b/src/Aporta.Core/Services/CredentialService.cs @@ -71,7 +71,6 @@ public async Task Enroll(int credentialId, int personId) // Transfer Number from swipe credential to person credential personCredential.Number = swipeCredential.Number; - personCredential.LastEvent = swipeCredential.LastEvent; await _credentialRepository.Update(personCredential); // Merge card data from swipe Z9 Cred into person Z9 Cred diff --git a/src/Aporta.Shared/Models/Credential.cs b/src/Aporta.Shared/Models/Credential.cs index 3b555b7..154d672 100644 --- a/src/Aporta.Shared/Models/Credential.cs +++ b/src/Aporta.Shared/Models/Credential.cs @@ -5,8 +5,6 @@ public class Credential public int Id { get; set; } public string Number { get; set; } - - public int LastEvent { get; set; } public bool? Enabled { get; set; } } \ No newline at end of file diff --git a/src/Aporta.WebClient/Pages/configuration/Credentials.razor b/src/Aporta.WebClient/Pages/configuration/Credentials.razor index a53caaa..b0d7eac 100644 --- a/src/Aporta.WebClient/Pages/configuration/Credentials.razor +++ b/src/Aporta.WebClient/Pages/configuration/Credentials.razor @@ -167,12 +167,12 @@ else - Select an badge event to enroll + Select a credential to enroll @@ -277,7 +277,7 @@ else private FlexCred _detailsCred; private int _enrollCredentialId; - private readonly List> _availableCredentialsForEnrollment = new(); + private readonly List _availableCredentialsForEnrollment = new(); private HubConnection _hubConnection; @@ -396,30 +396,14 @@ else foreach (var credential in unassignedCredentials) { - url = $"{Paths.Events}/{credential.LastEvent}"; - try - { - var lastEvent = await Http.GetFromJsonAsync(url); - var eventData = JsonSerializer.Deserialize(lastEvent.Data); - _availableCredentialsForEnrollment.Add(new Tuple(credential, lastEvent, eventData)); - } - catch - { - // ignored - } + _availableCredentialsForEnrollment.Add(credential); } - _availableCredentialsForEnrollment.Sort(CompareLastEventDescending); + _availableCredentialsForEnrollment.Sort((x, y) => y.Id.CompareTo(x.Id)); - _enrollCredentialId = _availableCredentialsForEnrollment.First().Item1.Id; + _enrollCredentialId = _availableCredentialsForEnrollment.First().Id; await _enrollModal.Show(); - return; - - static int CompareLastEventDescending(Tuple x, Tuple y) - { - return y.Item1.LastEvent.CompareTo(x.Item1.LastEvent); - } } private async Task EnrollPerson() diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs index 36cfd70..4420ff4 100644 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs @@ -98,8 +98,8 @@ public async Task Insert() // Arrange var credentials = new[] { - new Credential {Number = "2345342", LastEvent = 4}, - new Credential {Number = "5345234", LastEvent = 5}, + new Credential {Number = "2345342"}, + new Credential {Number = "5345234"}, }; var credentialRepository = new CredentialRepository(_dataAccess); @@ -114,7 +114,6 @@ public async Task Insert() // Assert Assert.That(credentials[1].Id, Is.EqualTo(2)); Assert.That(actualCredential.Id, Is.EqualTo(2)); - Assert.That(actualCredential.LastEvent, Is.EqualTo(5)); Assert.That(actualCredential.Number, Is.EqualTo("5345234")); } @@ -334,22 +333,6 @@ public async Task Named_ReturnsAllPersonDTOs() Assert.That(people.Any(p => p.FirstName == "Jane" && p.LastName == "Doe" && !p.Enabled), Is.True); } - [Test] - public async Task UpdateLastEvent() - { - // Arrange - var credential = new Credential { Number = "2345342", LastEvent = 4 }; - var credentialRepository = new CredentialRepository(_dataAccess); - int credentialId = await credentialRepository.Insert(credential); - - // Act - await credentialRepository.UpdateLastEvent(credentialId, 5); - - // Assert - var actualCredential = await credentialRepository.Get(credentialId); - Assert.That(actualCredential.LastEvent, Is.EqualTo(5)); - } - [Test] public void ParsePersonFromName_WithComma() { From 99290892e0ebba37ff2df062d215f0fd3962a70e Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 22:00:58 -0500 Subject: [PATCH 54/86] =?UTF-8?q?Eliminate=20credential=20table=20?= =?UTF-8?q?=E2=80=94=20unify=20on=20z9=5Fcred=20with=20denormalized=20cred?= =?UTF-8?q?=5Fnum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop the credential table entirely. Card numbers are now stored as a denormalized cred_num TEXT column on z9_cred (indexed for fast lookups), kept in sync by Z9CredRepository.Upsert. CredentialRepository becomes a read-only query helper projecting z9_cred rows into Credential/Person DTOs. Co-Authored-By: Claude Opus 4.6 --- .../Migrations/_0000_InitialCreate.cs | 11 +- .../Repositories/CredentialRepository.cs | 155 ++++++------- .../Repositories/Z9CredRepository.cs | 45 +++- src/Aporta.Core/Services/CredentialService.cs | 52 ++--- src/Aporta.Core/Services/PeopleService.cs | 6 +- .../Z9OpenCommunityProtocolService.cs | 19 +- .../Controllers/CredentialsController.cs | 12 - .../Repositories/CredentialRepositoryTests.cs | 206 +++++++----------- .../Z9OpenCommunityProtocolServiceTests.cs | 42 ++-- 9 files changed, 231 insertions(+), 317 deletions(-) diff --git a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs index 8c3184e..ede12a3 100644 --- a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs +++ b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs @@ -42,13 +42,6 @@ CREATE TABLE global_setting ( data TEXT NOT NULL ); - -- Credential table - CREATE TABLE credential ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - CREATE UNIQUE INDEX credential_number_uindex ON credential (json_extract(data, '$.number')); - -- Credential Template table CREATE TABLE cred_template ( id INTEGER NOT NULL PRIMARY KEY, @@ -112,8 +105,10 @@ data TEXT NOT NULL -- Z9 Credential table (stores full proto including privBindings) CREATE TABLE z9_cred ( id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL + data TEXT NOT NULL, + cred_num TEXT ); + CREATE UNIQUE INDEX z9_cred_cred_num_uindex ON z9_cred(cred_num) WHERE cred_num IS NOT NULL; -- Z9 Event table CREATE TABLE z9_evt ( diff --git a/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs b/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs index 3eef93c..d90c4a7 100644 --- a/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/CredentialRepository.cs @@ -1,98 +1,87 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text.Json; using System.Threading.Tasks; using Aporta.Shared.Models; using Dapper; namespace Aporta.Core.DataAccess.Repositories; -public class CredentialRepository : JsonDocumentRepository +/// +/// Read-only query helper that projects z9_cred rows into Credential/Person DTOs. +/// No longer owns a table — all data lives in z9_cred. +/// +public class CredentialRepository { - public CredentialRepository(IDataAccess dataAccess) - { - DataAccess = dataAccess; - } - - protected override IDataAccess DataAccess { get; } - - protected override string TableName => "credential"; - - protected override string SqlRowCount => "SELECT COUNT(*) FROM credential"; - - protected override void SetId(Credential entity, int id) - { - entity.Id = id; - } + private readonly IDataAccess _dataAccess; - protected override int GetId(Credential entity) + public CredentialRepository(IDataAccess dataAccess) { - return entity.Id; + _dataAccess = dataAccess; } - public new async Task Get(int id) + public async Task Get(int id) { - using var connection = DataAccess.CreateDbConnection(); + using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - var result = await connection.QuerySingleOrDefaultAsync<(int Id, string Data, string CredEnabled)>( - @"SELECT c.id, c.data, - json_extract(z.data, '$.enabled') as CredEnabled - FROM credential c - LEFT JOIN z9_cred z ON z.id = c.id - WHERE c.id = @id", + var result = await connection.QuerySingleOrDefaultAsync<(int Id, string CredNum, string CredEnabled)>( + @"SELECT id, cred_num, + json_extract(data, '$.enabled') as CredEnabled + FROM z9_cred WHERE id = @id", new { id }); - if (result.Data == null) return null; + if (result.Id == 0 && result.CredNum == null && result.CredEnabled == null) return null; - var credential = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); - credential.Id = result.Id; - credential.Enabled = ParseBool(result.CredEnabled); - return credential; + return new Credential + { + Id = result.Id, + Number = result.CredNum, + Enabled = ParseBool(result.CredEnabled) + }; } - public new async Task> GetAll() + public async Task> GetAll() { - using var connection = DataAccess.CreateDbConnection(); + using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - var results = await connection.QueryAsync<(int Id, string Data, string CredEnabled)>( - @"SELECT c.id, c.data, - json_extract(z.data, '$.enabled') as CredEnabled - FROM credential c - LEFT JOIN z9_cred z ON z.id = c.id"); + var results = await connection.QueryAsync<(int Id, string CredNum, string CredEnabled)>( + @"SELECT id, cred_num, + json_extract(data, '$.enabled') as CredEnabled + FROM z9_cred"); - return results.Select(r => + return results.Select(r => new Credential { - var credential = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); - credential.Id = r.Id; - credential.Enabled = ParseBool(r.CredEnabled); - return credential; + Id = r.Id, + Number = r.CredNum, + Enabled = ParseBool(r.CredEnabled) }); } public async Task AssignedCredential(string cardNumber) { - using var connection = DataAccess.CreateDbConnection(); + using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - var result = await connection.QuerySingleOrDefaultAsync<(int Id, string Data, string CredName, string CredEnabled)>( - @"SELECT c.id, c.data, - json_extract(z.data, '$.name') as CredName, - json_extract(z.data, '$.enabled') as CredEnabled - FROM credential c - LEFT JOIN z9_cred z ON z.id = c.id - WHERE json_extract(c.data, '$.number') = @number", + var result = await connection.QuerySingleOrDefaultAsync<(int Id, string CredNum, string CredName, string CredEnabled)>( + @"SELECT id, cred_num, + json_extract(data, '$.name') as CredName, + json_extract(data, '$.enabled') as CredEnabled + FROM z9_cred + WHERE cred_num = @number", new { number = cardNumber }); - if (result.Data == null) + if (result.Id == 0 && result.CredNum == null) { return null; } - var credential = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); - credential.Id = result.Id; + var credential = new AssignedCredential + { + Id = result.Id, + Number = result.CredNum + }; if (!string.IsNullOrWhiteSpace(result.CredName)) { @@ -110,57 +99,53 @@ WHERE json_extract(c.data, '$.number') = @number", public async Task> Assigned() { - using var connection = DataAccess.CreateDbConnection(); + using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - var results = await connection.QueryAsync<(int Id, string Data, string CredEnabled)>( - @"SELECT c.id, c.data, - json_extract(z.data, '$.enabled') as CredEnabled - FROM credential c - INNER JOIN z9_cred z ON z.id = c.id - WHERE json_extract(z.data, '$.name') IS NOT NULL - AND json_extract(c.data, '$.number') IS NOT NULL - AND json_extract(c.data, '$.number') != ''"); + var results = await connection.QueryAsync<(int Id, string CredNum, string CredEnabled)>( + @"SELECT id, cred_num, + json_extract(data, '$.enabled') as CredEnabled + FROM z9_cred + WHERE json_extract(data, '$.name') IS NOT NULL + AND cred_num IS NOT NULL + AND cred_num != ''"); - return results.Select(r => + return results.Select(r => new Credential { - var credential = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); - credential.Id = r.Id; - credential.Enabled = ParseBool(r.CredEnabled); - return credential; + Id = r.Id, + Number = r.CredNum, + Enabled = ParseBool(r.CredEnabled) }); } public async Task> Unassigned() { - using var connection = DataAccess.CreateDbConnection(); + using var connection = _dataAccess.CreateDbConnection(); connection.Open(); - var results = await connection.QueryAsync<(int Id, string Data)>( - @"SELECT c.id, c.data FROM credential c - LEFT JOIN z9_cred z ON z.id = c.id - WHERE json_extract(z.data, '$.name') IS NULL"); + var results = await connection.QueryAsync<(int Id, string CredNum)>( + @"SELECT id, cred_num FROM z9_cred + WHERE json_extract(data, '$.name') IS NULL + AND cred_num IS NOT NULL"); - return results.Select(r => + return results.Select(r => new Credential { - var credential = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); - credential.Id = r.Id; - return credential; + Id = r.Id, + Number = r.CredNum }); } public async Task> Named() { - using var connection = DataAccess.CreateDbConnection(); + using var connection = _dataAccess.CreateDbConnection(); connection.Open(); var results = await connection.QueryAsync<(int Id, string CredName, string CredEnabled)>( - @"SELECT c.id, - json_extract(z.data, '$.name') as CredName, - json_extract(z.data, '$.enabled') as CredEnabled - FROM credential c - INNER JOIN z9_cred z ON z.id = c.id - WHERE json_extract(z.data, '$.name') IS NOT NULL"); + @"SELECT id, + json_extract(data, '$.name') as CredName, + json_extract(data, '$.enabled') as CredEnabled + FROM z9_cred + WHERE json_extract(data, '$.name') IS NOT NULL"); return results.Select(r => { diff --git a/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs b/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs index 2d8cbd7..9583f1b 100644 --- a/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs @@ -1,10 +1,13 @@ +using System.Threading.Tasks; +using Dapper; +using Z9.Protobuf; using Z9.Spcore.Proto; namespace Aporta.Core.DataAccess.Repositories; /// /// Repository for storing the full Z9 Cred proto messages (including privBindings). -/// This is separate from CredentialRepository which stores Aporta's legacy credential format. +/// Overrides Upsert to maintain the denormalized cred_num column. /// public class Z9CredRepository : ProtoJsonRepository { @@ -18,4 +21,44 @@ public Z9CredRepository(IDataAccess dataAccess) protected override IDataAccess DataAccess => _dataAccess; protected override string TableName => "z9_cred"; protected override int GetUnid(Cred message) => message.Unid; + + public new async Task Upsert(Cred message) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var id = GetUnid(message); + var json = Formatter.Format(message); + var credNum = ExtractCredNum(message); + + await connection.ExecuteAsync( + "INSERT INTO z9_cred (id, data, cred_num) VALUES (@id, @data, @credNum) " + + "ON CONFLICT(id) DO UPDATE SET data = @data, cred_num = @credNum", + new { id, data = json, credNum }); + } + + /// + /// Extracts the credential number as a decimal string from a Cred's CardPin.CredNum. + /// Returns null if no CredNum is present. + /// + public static string ExtractCredNum(Cred cred) + { + if (cred.CardPin?.CredNum == null || cred.CardPin.CredNum.BytesCase == BigIntegerData.BytesOneofCase.None) + return null; + + return SpCoreProtoUtil.ToBigInteger(cred.CardPin.CredNum).ToString(); + } + + /// + /// Returns the next available ID (MAX(id) + 1, or 1 if empty). + /// Used by PeopleService for person creation. + /// + public async Task NextId() + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + return await connection.ExecuteScalarAsync( + "SELECT COALESCE(MAX(id), 0) + 1 FROM z9_cred"); + } } diff --git a/src/Aporta.Core/Services/CredentialService.cs b/src/Aporta.Core/Services/CredentialService.cs index cdf83fb..42d58c1 100644 --- a/src/Aporta.Core/Services/CredentialService.cs +++ b/src/Aporta.Core/Services/CredentialService.cs @@ -32,20 +32,6 @@ public async Task Get(int credentialId) return await _credentialRepository.Get(credentialId); } - public async Task Insert(Credential credential) - { - await _credentialRepository.Insert(credential); - - await _hubContext.Clients.All.SendAsync(Methods.CredentialInserted, credential.Id); - } - - public async Task Delete(int id) - { - await _credentialRepository.Delete(id); - - await _hubContext.Clients.All.SendAsync(Methods.CredentialDeleted, id); - } - public async Task> GetUnassigned() { return await _credentialRepository.Unassigned(); @@ -53,37 +39,27 @@ public async Task> GetUnassigned() public async Task Enroll(int credentialId, int personId) { - // Get the swipe credential (has Number) - var swipeCredential = await _credentialRepository.Get(credentialId); - if (swipeCredential == null) return; - - // Get the person credential (may not have a Number yet) - var personCredential = await _credentialRepository.Get(personId); - if (personCredential == null) return; - - // Get Z9 Creds for both before deleting + // Get Z9 Creds for both var swipeZ9Cred = await _z9CredRepository.Get(credentialId); var personZ9Cred = await _z9CredRepository.Get(personId); - // Delete the swipe credential first (unique index on Number prevents duplicate) - await _z9CredRepository.Delete(credentialId); - await _credentialRepository.Delete(credentialId); - - // Transfer Number from swipe credential to person credential - personCredential.Number = swipeCredential.Number; - await _credentialRepository.Update(personCredential); + if (swipeZ9Cred == null || personZ9Cred == null) return; - // Merge card data from swipe Z9 Cred into person Z9 Cred - if (personZ9Cred != null && swipeZ9Cred != null) + // Transfer CardPin from swipe to person + if (swipeZ9Cred.CardPin != null) { - if (swipeZ9Cred.CardPin != null) - { - personZ9Cred.CardPin = swipeZ9Cred.CardPin; - } - personZ9Cred.PrivBindings.Add(swipeZ9Cred.PrivBindings); - await _z9CredRepository.Upsert(personZ9Cred); + personZ9Cred.CardPin = swipeZ9Cred.CardPin; } + // Merge PrivBindings + personZ9Cred.PrivBindings.Add(swipeZ9Cred.PrivBindings); + + // Delete swipe z9_cred first (frees the unique cred_num) + await _z9CredRepository.Delete(credentialId); + + // Upsert person z9_cred (sets cred_num from transferred CardPin) + await _z9CredRepository.Upsert(personZ9Cred); + await _hubContext.Clients.All.SendAsync(Methods.PersonUpdated, personId); } diff --git a/src/Aporta.Core/Services/PeopleService.cs b/src/Aporta.Core/Services/PeopleService.cs index bdd6732..759854d 100644 --- a/src/Aporta.Core/Services/PeopleService.cs +++ b/src/Aporta.Core/Services/PeopleService.cs @@ -26,6 +26,7 @@ public PeopleService(IDataAccess dataAccess, IHubContext> GetAll() { return await _credentialRepository.Named(); @@ -42,8 +43,8 @@ public async Task Get(int personId) public async Task Insert(Person person) { - // Create an empty credential (no card number yet) - var credentialId = await _credentialRepository.Insert(new Credential()); + // Get next available ID + var credentialId = await _z9CredRepository.NextId(); // Ensure default cred template exists await EnsureDefaultCredTemplate(); @@ -70,7 +71,6 @@ public async Task Insert(Person person) public async Task Delete(int personId) { await _z9CredRepository.Delete(personId); - await _credentialRepository.Delete(personId); await _hubContext.Clients.All.SendAsync(Methods.PersonDeleted, personId); } diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 68788cd..6981b6e 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -9,7 +9,6 @@ using System.Threading; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; -using Aporta.Shared.Models; using Microsoft.Extensions.Logging; using Z9.Protobuf; using Z9.Spcore.Proto; @@ -21,7 +20,6 @@ public class Z9OpenCommunityProtocolService : IDisposable private const int DefaultOsdpTcpPort = 9843; private readonly ILogger _logger; - private readonly CredentialRepository _credentialRepository; // Z9 Open protobuf repositories private readonly DataFormatRepository _dataFormatRepository; @@ -108,7 +106,6 @@ public Z9OpenCommunityProtocolService( IDataAccess dataAccess) { _logger = logger; - _credentialRepository = new CredentialRepository(dataAccess); _dataFormatRepository = new DataFormatRepository(dataAccess); _dataLayoutRepository = new DataLayoutRepository(dataAccess); _credTemplateRepository = new CredTemplateRepository(dataAccess); @@ -268,7 +265,6 @@ private void HandleDbChange(DbChange dbChange) { _logger.LogInformation("Deleting credential {Unid}", credDelete); _z9CredRepository.Delete(credDelete).GetAwaiter().GetResult(); - _credentialRepository.Delete(credDelete).GetAwaiter().GetResult(); } // Priv deletes @@ -865,27 +861,16 @@ private void ProcessCredential(Cred cred) _logger.LogWarning( "Credential Unid={Unid} has no card number, deleting from Aporta if it exists", cred.Unid); _z9CredRepository.Delete(cred.Unid).GetAwaiter().GetResult(); - _credentialRepository.Delete(cred.Unid).GetAwaiter().GetResult(); return; } - var credNum = SpCoreProtoUtil.ToBigInteger(cred.CardPin.CredNum); - - // Store credential number as decimal string — card reads will be decoded to match - var credNumString = credNum.ToString(); + var credNumString = Z9CredRepository.ExtractCredNum(cred); _logger.LogInformation("Processing credential Unid={Unid} Number={Number} Name={Name} PrivBindings={BindingCount}", cred.Unid, credNumString, cred.Name, cred.PrivBindings.Count); - // Store the full Z9 Cred proto (for privilege checking and name/enabled) + // Store the full Z9 Cred proto (cred_num set by overridden Upsert) _z9CredRepository.Upsert(cred).GetAwaiter().GetResult(); - - var credential = new Credential - { - Number = credNumString, - Enabled = cred.Enabled - }; - _credentialRepository.Upsert(credential, cred.Unid).GetAwaiter().GetResult(); } /// diff --git a/src/Aporta/Controllers/CredentialsController.cs b/src/Aporta/Controllers/CredentialsController.cs index b504a96..954957d 100644 --- a/src/Aporta/Controllers/CredentialsController.cs +++ b/src/Aporta/Controllers/CredentialsController.cs @@ -30,18 +30,6 @@ public async Task Get(int credentialId) return await _credentialService.Get(credentialId); } - [HttpPut] - public async Task Put([FromBody]Credential credential) - { - await _credentialService.Insert(credential); - } - - [HttpDelete("{credentialId:int}")] - public async Task Delete(int credentialId) - { - await _credentialService.Delete(credentialId); - } - [HttpGet("assigned")] public async Task> GetAssigned() { diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs index 4420ff4..a96cadb 100644 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs @@ -1,6 +1,7 @@ using System; using System.Data; using System.Linq; +using System.Numerics; using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; @@ -47,128 +48,102 @@ public void TearDown() _persistConnection?.Dispose(); } - [Test] - public async Task Get_CredentialWithZ9Cred() + private static Cred CreateZ9Cred(int unid, string name, bool enabled, BigInteger? credNum = null) { - // Arrange - var credentialRepository = new CredentialRepository(_dataAccess); - var z9CredRepository = new Z9CredRepository(_dataAccess); - - var credential = new Credential { Number = "5345234" }; - await credentialRepository.Insert(credential); - var cred = new Cred { - Unid = credential.Id, - Name = "Smith, John", - Enabled = true, + Unid = unid, + Enabled = enabled, CredTemplateUnid = 1 }; + if (name != null) + { + cred.Name = name; + } + if (credNum.HasValue) + { + cred.CardPin = new CardPin + { + CredNum = SpCoreProtoUtil.ToBigIntegerData(credNum.Value) + }; + } SpCoreProtoUtil.InitRequired(cred); - await z9CredRepository.Upsert(cred); - - // Act - var actual = await credentialRepository.Get(credential.Id); - - // Assert - Assert.That(actual.Number, Is.EqualTo("5345234")); - Assert.That(actual.Enabled, Is.True); + return cred; } [Test] - public async Task Get_CredentialWithoutZ9Cred() + public async Task Get_CredentialWithZ9Cred() { // Arrange var credentialRepository = new CredentialRepository(_dataAccess); + var z9CredRepository = new Z9CredRepository(_dataAccess); - var credential = new Credential { Number = "5345234" }; - await credentialRepository.Insert(credential); + var cred = CreateZ9Cred(1, "Smith, John", true, new BigInteger(5345234)); + await z9CredRepository.Upsert(cred); // Act - var actual = await credentialRepository.Get(credential.Id); + var actual = await credentialRepository.Get(1); // Assert Assert.That(actual.Number, Is.EqualTo("5345234")); - Assert.That(actual.Enabled, Is.Null); + Assert.That(actual.Enabled, Is.True); } [Test] - public async Task Insert() + public async Task Get_CredentialWithoutCredNum() { // Arrange - var credentials = new[] - { - new Credential {Number = "2345342"}, - new Credential {Number = "5345234"}, - }; - var credentialRepository = new CredentialRepository(_dataAccess); - foreach (var credential in credentials) - { - await credentialRepository.Insert(credential); - } + var z9CredRepository = new Z9CredRepository(_dataAccess); + + var cred = CreateZ9Cred(1, "Smith, John", true); + await z9CredRepository.Upsert(cred); // Act - var actualCredential = await credentialRepository.Get(2); + var actual = await credentialRepository.Get(1); // Assert - Assert.That(credentials[1].Id, Is.EqualTo(2)); - Assert.That(actualCredential.Id, Is.EqualTo(2)); - Assert.That(actualCredential.Number, Is.EqualTo("5345234")); + Assert.That(actual.Number, Is.Null); + Assert.That(actual.Enabled, Is.True); } [Test] - public async Task Insert_DuplicateCardNumber() + public async Task Get_NonExistent_ReturnsNull() { // Arrange - var credential = new Credential {Number = "2345342"}; - var credentialRepository = new CredentialRepository(_dataAccess); - await credentialRepository.Insert(credential); - - // Assert - async Task InsertCredential() - { - await credentialRepository.Insert(credential); - } + // Act + var actual = await credentialRepository.Get(999); // Assert - Assert.ThrowsAsync(InsertCredential); + Assert.That(actual, Is.Null); } [Test] - public async Task Delete() + public async Task DuplicateCredNum_ThrowsSqliteException() { // Arrange - var credentials = new[] - { - new Credential {Number = "2345342"}, - new Credential {Number = "5345234"}, - }; + var z9CredRepository = new Z9CredRepository(_dataAccess); - var credentialRepository = new CredentialRepository(_dataAccess); - foreach (var credential in credentials) - { - await credentialRepository.Insert(credential); - } + var cred1 = CreateZ9Cred(1, null, true, new BigInteger(2345342)); + await z9CredRepository.Upsert(cred1); - // Act - await credentialRepository.Delete(2); + var cred2 = CreateZ9Cred(2, null, true, new BigInteger(2345342)); // Assert - var actualCredentials = await credentialRepository.GetAll(); - Assert.That(actualCredentials.Count(), Is.EqualTo(1)); + Assert.ThrowsAsync(() => z9CredRepository.Upsert(cred2)); } [Test] public async Task AssignedCredential_NoZ9CredName() { - // Arrange - credential exists but no z9_cred with a name + // Arrange - z9_cred exists with cred_num but no name + var z9CredRepository = new Z9CredRepository(_dataAccess); var credentialRepository = new CredentialRepository(_dataAccess); - var credential = new Credential { Number = "5345234" }; - await credentialRepository.Insert(credential); + var cred = CreateZ9Cred(1, null, true, new BigInteger(5345234)); + await z9CredRepository.Upsert(cred); // Act var actual = await credentialRepository.AssignedCredential("5345234"); @@ -181,20 +156,10 @@ public async Task AssignedCredential_NoZ9CredName() public async Task AssignedCredential_WithZ9CredName_Enabled() { // Arrange - var credentialRepository = new CredentialRepository(_dataAccess); var z9CredRepository = new Z9CredRepository(_dataAccess); + var credentialRepository = new CredentialRepository(_dataAccess); - var credential = new Credential { Number = "5345234" }; - await credentialRepository.Insert(credential); - - var cred = new Cred - { - Unid = credential.Id, - Name = "Smith, John", - Enabled = true, - CredTemplateUnid = 1 - }; - SpCoreProtoUtil.InitRequired(cred); + var cred = CreateZ9Cred(1, "Smith, John", true, new BigInteger(5345234)); await z9CredRepository.Upsert(cred); // Act @@ -213,20 +178,10 @@ public async Task AssignedCredential_WithZ9CredName_Enabled() public async Task AssignedCredential_WithZ9CredName_Disabled() { // Arrange - var credentialRepository = new CredentialRepository(_dataAccess); var z9CredRepository = new Z9CredRepository(_dataAccess); + var credentialRepository = new CredentialRepository(_dataAccess); - var credential = new Credential { Number = "5345234" }; - await credentialRepository.Insert(credential); - - var cred = new Cred - { - Unid = credential.Id, - Name = "Jones, Jane", - Enabled = false, - CredTemplateUnid = 1 - }; - SpCoreProtoUtil.InitRequired(cred); + var cred = CreateZ9Cred(1, "Jones, Jane", false, new BigInteger(5345234)); await z9CredRepository.Upsert(cred); // Act @@ -245,33 +200,27 @@ public async Task AssignedCredential_WithZ9CredName_Disabled() public async Task Assigned_ReturnsOnlyNamedCredentialsWithNumber() { // Arrange - var credentialRepository = new CredentialRepository(_dataAccess); var z9CredRepository = new Z9CredRepository(_dataAccess); + var credentialRepository = new CredentialRepository(_dataAccess); - // Credential with name AND number (enrolled) - var enrolled = new Credential { Number = "1111" }; - await credentialRepository.Insert(enrolled); - var enrolledCred = new Cred { Unid = enrolled.Id, Name = "Smith, John", Enabled = true, CredTemplateUnid = 1 }; - SpCoreProtoUtil.InitRequired(enrolledCred); - await z9CredRepository.Upsert(enrolledCred); + // Enrolled: has name AND cred_num + var enrolled = CreateZ9Cred(1, "Smith, John", true, new BigInteger(1111)); + await z9CredRepository.Upsert(enrolled); - // Credential with name but no number (person not yet enrolled) - var personOnly = new Credential(); - await credentialRepository.Insert(personOnly); - var personCred = new Cred { Unid = personOnly.Id, Name = "Doe, Jane", Enabled = true, CredTemplateUnid = 1 }; - SpCoreProtoUtil.InitRequired(personCred); - await z9CredRepository.Upsert(personCred); + // Person only: has name but no cred_num + var personOnly = CreateZ9Cred(2, "Doe, Jane", true); + await z9CredRepository.Upsert(personOnly); - // Credential with number but no name (raw swipe) - var swipe = new Credential { Number = "2222" }; - await credentialRepository.Insert(swipe); + // Raw swipe: has cred_num but no name + var swipe = CreateZ9Cred(3, null, true, new BigInteger(2222)); + await z9CredRepository.Upsert(swipe); // Act var assigned = (await credentialRepository.Assigned()).ToList(); // Assert - only the enrolled credential Assert.That(assigned, Has.Exactly(1).Items); - Assert.That(assigned[0].Id, Is.EqualTo(enrolled.Id)); + Assert.That(assigned[0].Id, Is.EqualTo(1)); Assert.That(assigned[0].Number, Is.EqualTo("1111")); } @@ -279,50 +228,41 @@ public async Task Assigned_ReturnsOnlyNamedCredentialsWithNumber() public async Task Unassigned_ReturnsCredentialsWithoutZ9CredName() { // Arrange - var credentialRepository = new CredentialRepository(_dataAccess); var z9CredRepository = new Z9CredRepository(_dataAccess); + var credentialRepository = new CredentialRepository(_dataAccess); // Named credential (not unassigned) - var named = new Credential { Number = "1111" }; - await credentialRepository.Insert(named); - var namedCred = new Cred { Unid = named.Id, Name = "Smith, John", Enabled = true, CredTemplateUnid = 1 }; - SpCoreProtoUtil.InitRequired(namedCred); - await z9CredRepository.Upsert(namedCred); + var named = CreateZ9Cred(1, "Smith, John", true, new BigInteger(1111)); + await z9CredRepository.Upsert(named); - // Raw swipe (no z9_cred name → unassigned) - var swipe = new Credential { Number = "2222" }; - await credentialRepository.Insert(swipe); + // Raw swipe (no name → unassigned) + var swipe = CreateZ9Cred(2, null, true, new BigInteger(2222)); + await z9CredRepository.Upsert(swipe); // Act var unassigned = (await credentialRepository.Unassigned()).ToList(); // Assert Assert.That(unassigned, Has.Exactly(1).Items); - Assert.That(unassigned[0].Id, Is.EqualTo(swipe.Id)); + Assert.That(unassigned[0].Id, Is.EqualTo(2)); } [Test] public async Task Named_ReturnsAllPersonDTOs() { // Arrange - var credentialRepository = new CredentialRepository(_dataAccess); var z9CredRepository = new Z9CredRepository(_dataAccess); + var credentialRepository = new CredentialRepository(_dataAccess); - var cred1 = new Credential(); - await credentialRepository.Insert(cred1); - var z9Cred1 = new Cred { Unid = cred1.Id, Name = "Smith, John", Enabled = true, CredTemplateUnid = 1 }; - SpCoreProtoUtil.InitRequired(z9Cred1); - await z9CredRepository.Upsert(z9Cred1); + var cred1 = CreateZ9Cred(1, "Smith, John", true); + await z9CredRepository.Upsert(cred1); - var cred2 = new Credential(); - await credentialRepository.Insert(cred2); - var z9Cred2 = new Cred { Unid = cred2.Id, Name = "Doe, Jane", Enabled = false, CredTemplateUnid = 1 }; - SpCoreProtoUtil.InitRequired(z9Cred2); - await z9CredRepository.Upsert(z9Cred2); + var cred2 = CreateZ9Cred(2, "Doe, Jane", false); + await z9CredRepository.Upsert(cred2); // Raw swipe (no name) - var swipe = new Credential { Number = "9999" }; - await credentialRepository.Insert(swipe); + var swipe = CreateZ9Cred(3, null, true, new BigInteger(9999)); + await z9CredRepository.Upsert(swipe); // Act var people = (await credentialRepository.Named()).ToList(); diff --git a/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs index 1bae6ac..cc15e18 100644 --- a/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs @@ -182,19 +182,20 @@ public void DbChange_HostSendsCredential_CredentialAndPersonCreatedInDb() Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); - // Verify credential was created in DB - var credentialRepository = new CredentialRepository(_dataAccess); - var credential = credentialRepository.Get(100).GetAwaiter().GetResult(); - Assert.That(credential, Is.Not.Null); - Assert.That(credential.Number, Is.EqualTo("123456")); - Assert.That(credential.Enabled, Is.True); - - // Verify Z9 Cred was stored + // Verify Z9 Cred was stored with cred_num var z9CredRepository = new Z9CredRepository(_dataAccess); var z9Cred = z9CredRepository.Get(100).GetAwaiter().GetResult(); Assert.That(z9Cred, Is.Not.Null); Assert.That(z9Cred.Name, Is.EqualTo("John Doe")); Assert.That(z9Cred.Enabled, Is.True); + Assert.That(Z9CredRepository.ExtractCredNum(z9Cred), Is.EqualTo("123456")); + + // Verify credential can be looked up via CredentialRepository + var credentialRepository = new CredentialRepository(_dataAccess); + var credential = credentialRepository.Get(100).GetAwaiter().GetResult(); + Assert.That(credential, Is.Not.Null); + Assert.That(credential.Number, Is.EqualTo("123456")); + Assert.That(credential.Enabled, Is.True); } [Test] @@ -235,15 +236,15 @@ public void DbChange_HostSendsCredentialWithNoCredNum_CredentialNotCreatedInDb() Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); - // Verify credential was NOT created in DB - var credentialRepository = new CredentialRepository(_dataAccess); - var credential = credentialRepository.Get(200).GetAwaiter().GetResult(); - Assert.That(credential, Is.Null); - - // Verify Z9 Cred was NOT created + // Verify Z9 Cred was NOT created (no card number = deleted) var z9CredRepository = new Z9CredRepository(_dataAccess); var z9Cred = z9CredRepository.Get(200).GetAwaiter().GetResult(); Assert.That(z9Cred, Is.Null); + + // Verify credential is not visible via CredentialRepository either + var credentialRepository = new CredentialRepository(_dataAccess); + var credential = credentialRepository.Get(200).GetAwaiter().GetResult(); + Assert.That(credential, Is.Null); } [Test] @@ -287,16 +288,17 @@ public void DbChange_HostSendsCredentialWithBlankName_UsesCardNumberAsName() Assert.That(_z9OpenCommunityProtocolService.LastException, Is.Null); - // Verify credential was created with card number + // Verify Z9 Cred was stored with cred_num (no name since cred had blank name) + var z9CredRepository = new Z9CredRepository(_dataAccess); + var z9Cred = z9CredRepository.Get(300).GetAwaiter().GetResult(); + Assert.That(z9Cred, Is.Not.Null); + Assert.That(Z9CredRepository.ExtractCredNum(z9Cred), Is.EqualTo("789012")); + + // Verify credential is visible via CredentialRepository var credentialRepository = new CredentialRepository(_dataAccess); var credential = credentialRepository.Get(300).GetAwaiter().GetResult(); Assert.That(credential, Is.Not.Null); Assert.That(credential.Number, Is.EqualTo("789012")); - - // Verify Z9 Cred was stored (no name since cred had blank name) - var z9CredRepository = new Z9CredRepository(_dataAccess); - var z9Cred = z9CredRepository.Get(300).GetAwaiter().GetResult(); - Assert.That(z9Cred, Is.Not.Null); } [Test] From 302cc3fc4730e858e4ffda2d44702dff0bc859ad Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 22:41:34 -0500 Subject: [PATCH 55/86] Update Z9.Protobuf.Community to 1.0.11 Picks up IO_CONTROLLER_EXTERNAL, DevPlatform.EXTERNAL, and externalDevModId/externalDevModText on Dev for upcoming endpoint/z9_dev unification. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- src/Aporta.Migration/Aporta.Migration.csproj | 2 +- src/Aporta/Aporta.csproj | 2 +- test/Aporta.Core.Tests/Aporta.Core.Tests.csproj | 2 +- test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index f1c9f88..303e9c7 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index 562457c..cf5f9f8 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 0221fa6..62a99e6 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 9141e65..9579cd0 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index 4bb8f0b..eb2b3fc 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,7 +10,7 @@ - + From 4337ec235682c1b8aaa1fe2cd7a956364810b568 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sun, 8 Feb 2026 23:54:10 -0500 Subject: [PATCH 56/86] =?UTF-8?q?Eliminate=20endpoint=20table=20=E2=80=94?= =?UTF-8?q?=20unify=20on=20z9=5Fdev=20with=20IO=5FCONTROLLER=5FEXTERNAL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Each hardware driver now becomes an IO_CONTROLLER_EXTERNAL z9_dev (controller). Driver endpoints are auto-synced as pool z9_devs with DevPlatform.External marker and physicalParentUnid pointing to their controller. "Available" endpoints are pool z9_devs; assigning removes the External marker. Extension ID is recovered by walking physicalParentUnid to the controller's ExternalDevModId. - Drop endpoint table from schema, add external_dev_mod_id column to z9_dev - Delete EndpointRepository and EndpointRepositoryTests - Add Z9DevRepository methods: GetController, GetPhysicalChildren, GetAvailableByDevType, GetExtensionId - Rewrite ExtensionService to create controller z9_devs and sync endpoints - Rewrite OutputService, InputService, DoorConfigurationService, AccessService, and StartupWorker to use z9_dev lookups instead of endpoint table - Update Z9.Protobuf.Community to 1.0.12 for External/IoControllerExternal types - Update unit tests to wait for pool z9_devs and use dynamic endpoint IDs Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- .../Migrations/_0000_InitialCreate.cs | 9 +- .../Repositories/EndpointRepository.cs | 86 -------- .../Repositories/Z9DevRepository.cs | 91 ++++++++- src/Aporta.Core/Services/AccessService.cs | 67 ++++--- .../Services/DoorConfigurationService.cs | 185 ++++++++--------- src/Aporta.Core/Services/ExtensionService.cs | 185 ++++++++++------- src/Aporta.Core/Services/InputService.cs | 77 ++++---- src/Aporta.Core/Services/OutputService.cs | 84 ++++---- src/Aporta.Migration/Aporta.Migration.csproj | 2 +- src/Aporta/Aporta.csproj | 2 +- src/Aporta/Workers/StartupWorker.cs | 187 +++++++----------- .../Aporta.Core.Tests.csproj | 2 +- .../Repositories/EndpointRepositoryTests.cs | 100 ---------- .../Services/InputServiceTests.cs | 32 +-- .../Services/OutputServiceTests.cs | 15 +- .../Aporta.Migration.Tests.csproj | 2 +- 17 files changed, 539 insertions(+), 589 deletions(-) delete mode 100644 src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs delete mode 100644 test/Aporta.Core.Tests/DataAccess/Repositories/EndpointRepositoryTests.cs diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 303e9c7..0939531 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs index ede12a3..01e3391 100644 --- a/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs +++ b/src/Aporta.Core/DataAccess/Migrations/_0000_InitialCreate.cs @@ -30,12 +30,6 @@ data TEXT NOT NULL ); CREATE UNIQUE INDEX extension_id_uindex ON extension (id); - -- Endpoint table - CREATE TABLE endpoint ( - id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL - ); - -- Global setting table (string primary key) CREATE TABLE global_setting ( name TEXT NOT NULL PRIMARY KEY, @@ -93,7 +87,8 @@ data TEXT NOT NULL -- Z9 Device table (stores full Dev proto messages) CREATE TABLE z9_dev ( id INTEGER NOT NULL PRIMARY KEY, - data TEXT NOT NULL + data TEXT NOT NULL, + external_dev_mod_id TEXT ); -- Encryption Key table diff --git a/src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs b/src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs deleted file mode 100644 index 804cf53..0000000 --- a/src/Aporta.Core/DataAccess/Repositories/EndpointRepository.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json; -using System.Threading.Tasks; -using Aporta.Shared.Models; -using Dapper; - -namespace Aporta.Core.DataAccess.Repositories; - -public class EndpointRepository : JsonDocumentRepository -{ - public EndpointRepository(IDataAccess dataAccess) - { - DataAccess = dataAccess; - } - - protected override IDataAccess DataAccess { get; } - - protected override string TableName => "endpoint"; - - protected override string SqlRowCount => "SELECT COUNT(*) FROM endpoint"; - - public async Task> GetForExtension(Guid extensionId) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - var results = await connection.QueryAsync<(int Id, string Data)>( - @"SELECT id, data FROM endpoint - WHERE json_extract(data, '$.extensionId') = @extensionId", - new { extensionId = extensionId.ToString() }); - - return results.Select(r => - { - var endpoint = JsonSerializer.Deserialize(r.Data, GetJsonOptions()); - endpoint.Id = r.Id; - return endpoint; - }); - } - - public new async Task Update(Endpoint endpoint) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - var json = JsonSerializer.Serialize(endpoint, GetJsonOptions()); - await connection.ExecuteAsync( - @"UPDATE endpoint SET data = @data - WHERE json_extract(data, '$.driverEndpointId') = @driverEndpointId - AND json_extract(data, '$.extensionId') = @extensionId", - new - { - data = json, - driverEndpointId = endpoint.DriverEndpointId, - extensionId = endpoint.ExtensionId.ToString() - }); - } - - protected override void SetId(Endpoint entity, int id) - { - entity.Id = id; - } - - public async Task GetByDriverEndpointId(string driverEndpointId) - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - var result = await connection.QueryFirstOrDefaultAsync<(int Id, string Data)>( - @"SELECT id, data FROM endpoint - WHERE json_extract(data, '$.driverEndpointId') = @driverEndpointId", - new { driverEndpointId }); - - if (result.Data == null) return null; - - var endpoint = JsonSerializer.Deserialize(result.Data, GetJsonOptions()); - endpoint.Id = result.Id; - return endpoint; - } - - protected override int GetId(Endpoint entity) - { - return entity.Id; - } -} diff --git a/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs b/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs index b96d35c..9595802 100644 --- a/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -56,6 +57,76 @@ public async Task GetForDriverId(string driverId) return await GetByExternalId(driverId); } + /// + /// Gets the IO_CONTROLLER_EXTERNAL z9_dev for the given extension (driver) GUID. + /// Uses the denormalized external_dev_mod_id column. + /// + public async Task GetController(Guid extensionId) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var json = await connection.QueryFirstOrDefaultAsync( + @"SELECT data FROM z9_dev + WHERE external_dev_mod_id = @extensionId", + new { extensionId = extensionId.ToString() }); + + return json == null ? null : Parser.Parse(json); + } + + /// + /// Gets all z9_devs whose physicalParentUnid matches the given parent. + /// + public async Task> GetPhysicalChildren(int parentUnid) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var results = await connection.QueryAsync( + @"SELECT data FROM z9_dev + WHERE json_extract(data, '$.physicalParentUnid') = @parentUnid", + new { parentUnid }); + + return results.Select(json => Parser.Parse(json)); + } + + /// + /// Gets available (pool) z9_devs matching the given devType. + /// Available = DevPlatform is External (auto-synced from driver, not yet assigned by user). + /// + public async Task> GetAvailableByDevType(DevType devType) + { + var all = await GetAll(); + return all.Where(d => + d.DevType == devType && + d.DevPlatformCase == Dev.DevPlatformOneofCase.DevPlatform && + d.DevPlatform == DevPlatform.External); + } + + /// + /// Gets the extension (driver) GUID for any z9_dev by walking physicalParentUnid + /// to its IO_CONTROLLER_EXTERNAL parent. + /// + public async Task GetExtensionId(Dev dev) + { + // If this dev IS the controller, return its ExternalDevModId directly + if (dev.DevMod == DevMod.IoControllerExternal && + !string.IsNullOrEmpty(dev.ExternalDevModId)) + { + return Guid.TryParse(dev.ExternalDevModId, out var id) ? id : null; + } + + // Walk physicalParentUnid to find the controller + if (dev.PhysicalParentUnidCase != Dev.PhysicalParentUnidOneofCase.PhysicalParentUnid) + return null; + + var controller = await Get(dev.PhysicalParentUnid); + if (controller == null) + return null; + + return Guid.TryParse(controller.ExternalDevModId, out var controllerId) ? controllerId : null; + } + public async Task Insert(Dev dev) { using var connection = DataAccess.CreateDbConnection(); @@ -66,11 +137,27 @@ public async Task Insert(Dev dev) dev.Unid = nextId; var json = Formatter.Format(dev); + var externalDevModId = string.IsNullOrEmpty(dev.ExternalDevModId) ? null : dev.ExternalDevModId; await connection.ExecuteAsync( - "INSERT INTO z9_dev (id, data) VALUES (@id, @data)", - new { id = nextId, data = json }); + "INSERT INTO z9_dev (id, data, external_dev_mod_id) VALUES (@id, @data, @externalDevModId)", + new { id = nextId, data = json, externalDevModId }); return nextId; } + + public new async Task Upsert(Dev message) + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var id = GetUnid(message); + var json = Formatter.Format(message); + var externalDevModId = string.IsNullOrEmpty(message.ExternalDevModId) ? null : message.ExternalDevModId; + + await connection.ExecuteAsync( + @"INSERT INTO z9_dev (id, data, external_dev_mod_id) VALUES (@id, @data, @externalDevModId) + ON CONFLICT(id) DO UPDATE SET data = @data, external_dev_mod_id = @externalDevModId", + new { id, data = json, externalDevModId }); + } } diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index d8fcc9a..3bced53 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -37,7 +37,6 @@ public class AccessService { private readonly ExtensionService _extensionService; private readonly ILogger _logger; - private readonly EndpointRepository _endpointRepository; private readonly Z9DevRepository _z9DevRepository; private readonly CredentialRepository _credentialRepository; private readonly Z9EvtRepository _z9EvtRepository; @@ -68,7 +67,6 @@ public AccessService(IDataAccess dataAccess, ExtensionService extensionService, DoorConfigurationService doorConfigurationService) { _credentialRepository = new CredentialRepository(dataAccess); - _endpointRepository = new EndpointRepository(dataAccess); _z9DevRepository = new Z9DevRepository(dataAccess); _z9EvtRepository = new Z9EvtRepository(dataAccess); _z9CredRepository = new Z9CredRepository(dataAccess); @@ -126,7 +124,7 @@ public void Startup() public void Shutdown() { _processAccessCredential.Clear(); - + _extensionService.AccessCredentialReceived -= ExtensionServiceOnAccessCredentialReceived; } @@ -147,9 +145,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA { try { - var endpoints = (await _endpointRepository.GetAll()).ToArray(); - - var matchingDoor = await MatchingDoor(eventArgs.Access.Id, endpoints); + var matchingDoor = await MatchingDoor(eventArgs.Access.Id); if (matchingDoor == null) { @@ -158,9 +154,26 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA return; } - var accessPoint = endpoints.First(endpoint => endpoint.DriverEndpointId == eventArgs.Access.Id); + // Build an Endpoint-like reference from the access point's z9_dev + var accessPointDev = await _z9DevRepository.GetByExternalId(eventArgs.Access.Id); + var accessPointExtensionId = accessPointDev != null + ? await _z9DevRepository.GetExtensionId(accessPointDev) + : null; + var accessPoint = new Endpoint + { + Id = accessPointDev?.Unid ?? 0, + Name = eventArgs.Access.Name, + DriverEndpointId = eventArgs.Access.Id, + ExtensionId = accessPointExtensionId ?? Guid.Empty, + Type = EndpointType.Reader + }; - var matchingDoorStrike = MatchingDoorStrike(matchingDoor.DoorStrikeEndpointId, endpoints); + // Find the door strike z9_dev + Dev matchingStrikeDev = null; + if (matchingDoor.DoorStrikeEndpointId.HasValue) + { + matchingStrikeDev = await _z9DevRepository.Get(matchingDoor.DoorStrikeEndpointId.Value); + } if (!eventArgs.Handler.IsValid()) { @@ -200,10 +213,10 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA if (granted) { // Only open door if strike is assigned - community controllers may not have one - if (matchingDoorStrike != null) + if (matchingStrikeDev != null) { var strikeTimeMs = GetStrikeTimeMs(accessPoint.DriverEndpointId, useExtendedTime); - await OpenDoor(eventArgs.Access, matchingDoorStrike, strikeTimeMs); + await OpenDoor(eventArgs.Access, matchingStrikeDev, strikeTimeMs); } else { @@ -298,7 +311,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA { // Insert RAW_CRED_READ event with raw bits — credential will be created // later from this event during enrollment - await InsertRawCredReadEvt(matchingCardData, accessPoint); + await InsertRawCredReadEvt(matchingCardData, accessPoint.DriverEndpointId); } await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); @@ -397,7 +410,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA EventReason = EventReason.CredentialNotYetEffective, CardNumber = matchingCardData }); - + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs @@ -431,7 +444,7 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA EventReason = EventReason.CredentialExpired, CardNumber = matchingCardData }); - + await _hubContext.Clients.All.SendAsync(Methods.NewEventReceived, eventId); AccessDecisionMade?.Invoke(this, new AccessDecisionEventArgs @@ -591,7 +604,7 @@ private async Task InsertAccessEvt(EventType eventType, EventReason reason, return await _z9EvtRepository.Insert(evt); } - private async Task InsertRawCredReadEvt(string rawBits, Endpoint accessPoint) + private async Task InsertRawCredReadEvt(string rawBits, string driverEndpointId) { var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); var evt = new Evt @@ -605,7 +618,7 @@ private async Task InsertRawCredReadEvt(string rawBits, Endpoint accessPoint) }; // Set EvtDevRef to the CredReader dev if available - var credReaderDev = await _z9DevRepository.GetByExternalId(accessPoint.DriverEndpointId); + var credReaderDev = await _z9DevRepository.GetByExternalId(driverEndpointId); if (credReaderDev != null) { evt.EvtDevRef = new EvtDevRef @@ -627,17 +640,24 @@ private int GetStrikeTimeMs(string endpointId, bool useExtendedTime) return strikeTimeMs ?? 3000; } - private async Task OpenDoor(IAccess access, Endpoint matchingDoorStrike, int strikeTimeMs) + private async Task OpenDoor(IAccess access, Dev strikeDev, int strikeTimeMs) { + var extensionId = await _z9DevRepository.GetExtensionId(strikeDev); + if (!extensionId.HasValue) + { + _logger.LogWarning("No extension ID found for strike z9_dev {Unid}", strikeDev.Unid); + return; + } + var controlPoint = - _extensionService.GetControlPoint(matchingDoorStrike.ExtensionId, matchingDoorStrike.DriverEndpointId); - + _extensionService.GetControlPoint(extensionId.Value, strikeDev.ExternalId); + async Task ControlStrike() { await controlPoint.SetState(true); await Task.Delay(TimeSpan.FromMilliseconds(strikeTimeMs)); await controlPoint.SetState(false); - } + } // Fire strike asynchronously - don't block access processing // (blocking would keep the task in WaitingForActivation state, @@ -863,7 +883,7 @@ private async Task IsInSchedule(SchedRestriction schedRestriction) return inSched; } - private async Task MatchingDoor(string accessPointId, Endpoint[] endpoints) + private async Task MatchingDoor(string accessPointId) { // Find CredReader Dev by ExternalId = accessPointId (DriverEndpointId) var credReaderDev = await _z9DevRepository.GetByExternalId(accessPointId); @@ -889,9 +909,4 @@ private async Task MatchingDoor(string accessPointId, Endpoint[] endpoints return await _doorConfigurationService.BuildDoorDto(parentDev); } - - private static Endpoint MatchingDoorStrike(int? doorStrikeEndpointId, IEnumerable endpoints) - { - return endpoints.FirstOrDefault(endpoint => doorStrikeEndpointId == endpoint.Id); - } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/Services/DoorConfigurationService.cs b/src/Aporta.Core/Services/DoorConfigurationService.cs index c4d624b..61e1b04 100644 --- a/src/Aporta.Core/Services/DoorConfigurationService.cs +++ b/src/Aporta.Core/Services/DoorConfigurationService.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -20,32 +21,52 @@ public class DoorConfigurationService( IHubContext hubContext, ILogger logger) { - private readonly EndpointRepository _endpointRepository = new(dataAccess); private readonly Z9DevRepository _z9DevRepository = new(dataAccess); public async Task> AvailableAccessPoints() { - var endpoints = await _endpointRepository.GetAll(); - var credReaders = await _z9DevRepository.GetAllByDevType(DevType.CredReader); - var credReaderExternalIds = credReaders - .Where(d => !string.IsNullOrEmpty(d.ExternalId)) - .Select(d => d.ExternalId) - .ToHashSet(); - return endpoints.Where(endpoint => - endpoint.Type == EndpointType.Reader && - !credReaderExternalIds.Contains(endpoint.DriverEndpointId)); + var available = await _z9DevRepository.GetAvailableByDevType(DevType.CredReader); + var tasks = available.Select(async d => + { + var extensionId = await _z9DevRepository.GetExtensionId(d); + return new Endpoint + { + Id = d.Unid, + Name = d.Name, + DriverEndpointId = d.ExternalId, + ExtensionId = extensionId ?? Guid.Empty, + Type = EndpointType.Reader, + }; + }); + return await Task.WhenAll(tasks); } public async Task> AvailableEndPoints() { - var endpoints = await _endpointRepository.GetAll(); - var allDevs = (await _z9DevRepository.GetAll()).ToArray(); - var assignedExternalIds = allDevs - .Where(d => !string.IsNullOrEmpty(d.ExternalId)) - .Select(d => d.ExternalId) - .ToHashSet(); - return endpoints.Where(endpoint => - !assignedExternalIds.Contains(endpoint.DriverEndpointId)); + var allAvailable = (await _z9DevRepository.GetAll()) + .Where(d => d.DevPlatformCase == Dev.DevPlatformOneofCase.DevPlatform && + d.DevPlatform == DevPlatform.External && + d.DevType != DevType.IoController); + var tasks = allAvailable.Select(async d => + { + var extensionId = await _z9DevRepository.GetExtensionId(d); + var type = d.DevType switch + { + DevType.Actuator => EndpointType.Output, + DevType.Sensor => EndpointType.Input, + DevType.CredReader => EndpointType.Reader, + _ => EndpointType.Output, + }; + return new Endpoint + { + Id = d.Unid, + Name = d.Name, + DriverEndpointId = d.ExternalId, + ExtensionId = extensionId ?? Guid.Empty, + Type = type, + }; + }); + return await Task.WhenAll(tasks); } public async Task> GetAll() @@ -94,23 +115,20 @@ public async Task Insert(Door door) SpCoreProtoUtil.InitRequired(doorDev); var doorUnid = await _z9DevRepository.Insert(doorDev); - // Create CredReader child for in-access + // Assign CredReader child for in-access (from pool z9_dev) if (door.InAccessEndpointId.HasValue) { - var endpoint = await _endpointRepository.Get(door.InAccessEndpointId.Value); - if (endpoint != null) - { - var childUnid = await CreateChildDev(doorUnid, DevType.CredReader, DevUse.ActuatorDoorStrike, - endpoint.DriverEndpointId, endpoint.Name, setDevUse: false); - doorDev.LogicalChildrenUnid.Add(childUnid); - } + var childUnid = await AssignPoolDevAsDoorChild( + door.InAccessEndpointId.Value, doorUnid, DevUse.ActuatorDoorStrike, setDevUse: false); + if (childUnid.HasValue) + doorDev.LogicalChildrenUnid.Add(childUnid.Value); } // Create exit Door child + CredReader grandchild for out-access if (door.OutAccessEndpointId.HasValue) { - var endpoint = await _endpointRepository.Get(door.OutAccessEndpointId.Value); - if (endpoint != null) + var poolDev = await _z9DevRepository.Get(door.OutAccessEndpointId.Value); + if (poolDev != null) { var exitDoorDev = new Dev { @@ -122,47 +140,41 @@ public async Task Insert(Door door) var exitDoorUnid = await _z9DevRepository.Insert(exitDoorDev); doorDev.LogicalChildrenUnid.Add(exitDoorUnid); - var grandchildUnid = await CreateChildDev(exitDoorUnid, DevType.CredReader, DevUse.ActuatorDoorStrike, - endpoint.DriverEndpointId, endpoint.Name, setDevUse: false); - exitDoorDev.LogicalChildrenUnid.Add(grandchildUnid); - await _z9DevRepository.Upsert(exitDoorDev); + var grandchildUnid = await AssignPoolDevAsDoorChild( + door.OutAccessEndpointId.Value, exitDoorUnid, DevUse.ActuatorDoorStrike, setDevUse: false); + if (grandchildUnid.HasValue) + { + exitDoorDev.LogicalChildrenUnid.Add(grandchildUnid.Value); + await _z9DevRepository.Upsert(exitDoorDev); + } } } - // Create Sensor child for door contact + // Assign Sensor child for door contact (from pool z9_dev) if (door.DoorContactEndpointId.HasValue) { - var endpoint = await _endpointRepository.Get(door.DoorContactEndpointId.Value); - if (endpoint != null) - { - var childUnid = await CreateChildDev(doorUnid, DevType.Sensor, DevUse.SensorDoorContact, - endpoint.DriverEndpointId, endpoint.Name); - doorDev.LogicalChildrenUnid.Add(childUnid); - } + var childUnid = await AssignPoolDevAsDoorChild( + door.DoorContactEndpointId.Value, doorUnid, DevUse.SensorDoorContact); + if (childUnid.HasValue) + doorDev.LogicalChildrenUnid.Add(childUnid.Value); } - // Create Sensor child for REX + // Assign Sensor child for REX (from pool z9_dev) if (door.RequestToExitEndpointId.HasValue) { - var endpoint = await _endpointRepository.Get(door.RequestToExitEndpointId.Value); - if (endpoint != null) - { - var childUnid = await CreateChildDev(doorUnid, DevType.Sensor, DevUse.SensorRex, - endpoint.DriverEndpointId, endpoint.Name); - doorDev.LogicalChildrenUnid.Add(childUnid); - } + var childUnid = await AssignPoolDevAsDoorChild( + door.RequestToExitEndpointId.Value, doorUnid, DevUse.SensorRex); + if (childUnid.HasValue) + doorDev.LogicalChildrenUnid.Add(childUnid.Value); } - // Create Actuator child for door strike + // Assign Actuator child for door strike (from pool z9_dev) if (door.DoorStrikeEndpointId.HasValue) { - var endpoint = await _endpointRepository.Get(door.DoorStrikeEndpointId.Value); - if (endpoint != null) - { - var childUnid = await CreateChildDev(doorUnid, DevType.Actuator, DevUse.ActuatorDoorStrike, - endpoint.DriverEndpointId, endpoint.Name); - doorDev.LogicalChildrenUnid.Add(childUnid); - } + var childUnid = await AssignPoolDevAsDoorChild( + door.DoorStrikeEndpointId.Value, doorUnid, DevUse.ActuatorDoorStrike); + if (childUnid.HasValue) + doorDev.LogicalChildrenUnid.Add(childUnid.Value); } // Update Door Dev with children @@ -172,6 +184,25 @@ public async Task Insert(Door door) await hubContext.Clients.All.SendAsync(Methods.DoorInserted, door.Id); } + /// + /// Assigns a pool z9_dev as a door child by setting logicalParentUnid and clearing DevPlatform. + /// Returns the z9_dev unid, or null if the pool dev was not found. + /// + private async Task AssignPoolDevAsDoorChild(int poolDevUnid, int doorUnid, DevUse devUse, bool setDevUse = true) + { + var poolDev = await _z9DevRepository.Get(poolDevUnid); + if (poolDev == null) return null; + + poolDev.LogicalParentUnid = doorUnid; + poolDev.DevPlatform = DevPlatform.Z9Security; // Clear the External marker + if (setDevUse) + { + poolDev.DevUse = devUse; + } + await _z9DevRepository.Upsert(poolDev); + return poolDev.Unid; + } + public async Task Delete(int id) { logger.LogDebug("Request to delete door with id of {Id}", id); @@ -200,24 +231,6 @@ public async Task Delete(int id) await hubContext.Clients.All.SendAsync(Methods.DoorDeleted, id); } - private async Task CreateChildDev(int parentUnid, DevType devType, DevUse devUse, - string externalId, string name, bool setDevUse = true) - { - var dev = new Dev - { - Name = name, - DevType = devType, - ExternalId = externalId, - LogicalParentUnid = parentUnid, - }; - if (setDevUse) - { - dev.DevUse = devUse; - } - SpCoreProtoUtil.InitRequired(dev); - return await _z9DevRepository.Insert(dev); - } - internal async Task BuildDoorDto(Dev doorDev) { var door = new Door @@ -233,10 +246,8 @@ internal async Task BuildDoorDto(Dev doorDev) switch (child.DevType) { case DevType.CredReader: - // In-access reader - var inEndpoint = await _endpointRepository.GetByDriverEndpointId(child.ExternalId); - if (inEndpoint != null) - door.InAccessEndpointId = inEndpoint.Id; + // In-access reader — EndpointId is the z9_dev unid + door.InAccessEndpointId = child.Unid; break; case DevType.Door: @@ -244,29 +255,19 @@ internal async Task BuildDoorDto(Dev doorDev) var grandchildren = (await _z9DevRepository.GetChildren(child.Unid)).ToArray(); var outReader = grandchildren.FirstOrDefault(gc => gc.DevType == DevType.CredReader); if (outReader != null) - { - var outEndpoint = await _endpointRepository.GetByDriverEndpointId(outReader.ExternalId); - if (outEndpoint != null) - door.OutAccessEndpointId = outEndpoint.Id; - } + door.OutAccessEndpointId = outReader.Unid; break; case DevType.Sensor when child.DevUseCase == Dev.DevUseOneofCase.DevUse && child.DevUse == DevUse.SensorDoorContact: - var contactEndpoint = await _endpointRepository.GetByDriverEndpointId(child.ExternalId); - if (contactEndpoint != null) - door.DoorContactEndpointId = contactEndpoint.Id; + door.DoorContactEndpointId = child.Unid; break; case DevType.Sensor when child.DevUseCase == Dev.DevUseOneofCase.DevUse && child.DevUse == DevUse.SensorRex: - var rexEndpoint = await _endpointRepository.GetByDriverEndpointId(child.ExternalId); - if (rexEndpoint != null) - door.RequestToExitEndpointId = rexEndpoint.Id; + door.RequestToExitEndpointId = child.Unid; break; case DevType.Actuator when child.DevUseCase == Dev.DevUseOneofCase.DevUse && child.DevUse == DevUse.ActuatorDoorStrike: - var strikeEndpoint = await _endpointRepository.GetByDriverEndpointId(child.ExternalId); - if (strikeEndpoint != null) - door.DoorStrikeEndpointId = strikeEndpoint.Id; + door.DoorStrikeEndpointId = child.Unid; break; } } diff --git a/src/Aporta.Core/Services/ExtensionService.cs b/src/Aporta.Core/Services/ExtensionService.cs index 32ce715..f8d7e36 100644 --- a/src/Aporta.Core/Services/ExtensionService.cs +++ b/src/Aporta.Core/Services/ExtensionService.cs @@ -20,11 +20,13 @@ using Aporta.Extensions.Hardware; using Aporta.Shared.Messaging; using Aporta.Shared.Models; +using Z9.Protobuf; +using Z9.Spcore.Proto; namespace Aporta.Core.Services; /// -/// +/// /// public class ExtensionService( IDataAccess dataAccess, @@ -36,7 +38,6 @@ public class ExtensionService( private static readonly SemaphoreSlim EndpointUpdateSemaphore = new(1, 1); private readonly ExtensionRepository _extensionRepository = new(dataAccess); - private readonly EndpointRepository _endpointRepository = new(dataAccess); private readonly Z9DevRepository _z9DevRepository = new(dataAccess); private readonly List _extensions = new(); private readonly object _extensionLock = new (); @@ -110,7 +111,7 @@ public IOutput GetControlPoint(Guid extensionId, string endpointId) return _extensions.First(extension => extension.Id == extensionId).Driver.Endpoints .First(endpoint => endpoint.Id == endpointId) as IOutput; } - + public IInput GetMonitorPoint(Guid extensionId, string endpointId) { return _extensions.First(extension => extension.Id == extensionId).Driver.Endpoints @@ -123,6 +124,26 @@ public IAccess GetAccessPoint(Guid extensionId, string endpointId) .First(endpoint => endpoint.Id == endpointId) as IAccess; } + /// + /// Returns all endpoints from all loaded drivers, paired with their extension (driver) GUID. + /// + public IEnumerable<(IEndpoint Endpoint, Guid ExtensionId)> GetAllDriverEndpoints() + { + return _extensions + .Where(e => e.Loaded && e.Driver != null) + .SelectMany(e => e.Driver.Endpoints.Select(ep => (ep, e.Id))); + } + + /// + /// Checks if a driver endpoint exists in any loaded driver. + /// + public bool DriverEndpointExists(string driverEndpointId) + { + return _extensions + .Where(e => e.Loaded && e.Driver != null) + .Any(e => e.Driver.Endpoints.Any(ep => ep.Id == driverEndpointId)); + } + public IEnumerable GetExtensions() { return _extensions.Select(extension => @@ -132,14 +153,14 @@ public IAccess GetAccessPoint(Guid extensionId, string endpointId) return clone; }); } - + public Shared.Models.Extension GetExtension(Guid extensionId) { var extension = _extensions.FirstOrDefault(extension => extension.Id == extensionId); var clone = extension?.ShallowCopy(); - + if (clone == null) return null; - + clone.Configuration = extension.Driver?.ScrubSensitiveConfigurationData(clone.Configuration); return clone; @@ -237,6 +258,34 @@ private void LoadExtension(ExtensionHost extension) extension.Loaded = true; } + // Controller z9_dev is created lazily in DriverOnUpdatedEndpoints when the driver + // first reports its endpoints, avoiding a race with the concurrent endpoint sync. + } + + /// + /// Ensures an IO_CONTROLLER_EXTERNAL z9_dev exists for the given driver extension. + /// + private async Task EnsureControllerDev(ExtensionHost extension) + { + var existingController = await _z9DevRepository.GetController(extension.Id); + if (existingController != null) + return; + + var controllerDev = new Dev + { + Name = extension.Name, + DevType = DevType.IoController, + DevMod = DevMod.IoControllerExternal, + DevPlatform = DevPlatform.External, + ExternalDevModId = extension.Id.ToString(), + ExternalDevModText = extension.Name, + ExternalId = extension.Id.ToString(), + }; + SpCoreProtoUtil.InitRequired(controllerDev); + await _z9DevRepository.Insert(controllerDev); + + logger.LogInformation("Created IO_CONTROLLER_EXTERNAL z9_dev for driver {Name} (extensionId={ExtensionId})", + extension.Name, extension.Id); } private void DriverOnUpdatedEndpoints(object sender, EventArgs eventArgs) @@ -249,48 +298,81 @@ private void DriverOnUpdatedEndpoints(object sender, EventArgs eventArgs) try { - var existingEndpoints = (await _endpointRepository.GetForExtension(driver.Id)).ToArray(); - foreach (var endpoint in EndpointsToBeInserted(driver, existingEndpoints)) + // Ensure controller exists before syncing endpoints + var controllerDev = await _z9DevRepository.GetController(driver.Id); + if (controllerDev == null) { - var insertEndpoint = new Endpoint + // Controller not yet created; EnsureControllerDev will handle it + var extension = _extensions.FirstOrDefault(e => e.Id == driver.Id); + if (extension != null) { - DriverEndpointId = endpoint.Id, ExtensionId = driver.Id, Name = endpoint.Name, - Type = endpoint switch - { - IOutput _ => EndpointType.Output, - IInput _ => EndpointType.Input, - IAccess _ => EndpointType.Reader, - _ => throw new Exception("Invalid endpoint type") - } - }; + await EnsureControllerDev(extension); + controllerDev = await _z9DevRepository.GetController(driver.Id); + } + } - await _endpointRepository.Insert(insertEndpoint); + if (controllerDev == null) + { + logger.LogWarning("No controller z9_dev found for driver {DriverId}, skipping endpoint sync", driver.Id); + return; } - foreach (var endpoint in EndpointsToBeUpdated(driver, existingEndpoints)) + var existingPoolDevs = (await _z9DevRepository.GetPhysicalChildren(controllerDev.Unid)) + .Where(d => d.DevPlatformCase == Dev.DevPlatformOneofCase.DevPlatform && + d.DevPlatform == DevPlatform.External) + .ToArray(); + + var existingExternalIds = existingPoolDevs + .Select(d => d.ExternalId) + .ToHashSet(); + + // Insert new endpoints as pool z9_devs + foreach (var endpoint in driver.Endpoints.Where(ep => + ep.ExtensionId == driver.Id && !existingExternalIds.Contains(ep.Id))) { - var updateEndpoint = new Endpoint + var devType = endpoint switch { - DriverEndpointId = endpoint.Id, ExtensionId = driver.Id, Name = endpoint.Name, - Type = endpoint switch - { - IOutput _ => EndpointType.Output, - IInput _ => EndpointType.Input, - IAccess _ => EndpointType.Reader, - _ => throw new Exception("Invalid endpoint type") - } + IAccess => DevType.CredReader, + IOutput => DevType.Actuator, + IInput => DevType.Sensor, + _ => DevType.Reserved0 }; - await _endpointRepository.Update(updateEndpoint); + var poolDev = new Dev + { + Name = endpoint.Name, + DevType = devType, + DevPlatform = DevPlatform.External, + ExternalId = endpoint.Id, + PhysicalParentUnid = controllerDev.Unid, + }; + SpCoreProtoUtil.InitRequired(poolDev); + await _z9DevRepository.Insert(poolDev); } - foreach (var endpoint in EndpointsToBeDeleted(driver, existingEndpoints)) + + // Update existing pool z9_devs (name changes etc.) + var driverEndpointIds = driver.Endpoints + .Where(ep => ep.ExtensionId == driver.Id) + .Select(ep => ep.Id) + .ToHashSet(); + + foreach (var poolDev in existingPoolDevs.Where(d => driverEndpointIds.Contains(d.ExternalId))) { - if (await IsEndPointAvailableForDelete(endpoint)) + var driverEndpoint = driver.Endpoints.First(ep => ep.Id == poolDev.ExternalId); + if (poolDev.Name != driverEndpoint.Name) { - await _endpointRepository.Delete(endpoint.Id); + poolDev.Name = driverEndpoint.Name; + await _z9DevRepository.Upsert(poolDev); } } + // Delete pool z9_devs for endpoints no longer reported by driver + foreach (var poolDev in existingPoolDevs.Where(d => !driverEndpointIds.Contains(d.ExternalId))) + { + // Only delete pool entries (DevPlatform=External); assigned devices are left alone + await _z9DevRepository.Delete(poolDev.Unid); + } + await SaveCurrentConfiguration(MatchingExtensionHost(driver.Id)); } finally @@ -300,19 +382,11 @@ private void DriverOnUpdatedEndpoints(object sender, EventArgs eventArgs) }); } - - private async Task IsEndPointAvailableForDelete(Endpoint endpointToDelete) - { - // Check if any z9_dev references this endpoint's DriverEndpointId - var dev = await _z9DevRepository.GetByExternalId(endpointToDelete.DriverEndpointId); - return dev == null; - } - private void DriverOnAccessCredentialReceived(object sender, AccessCredentialReceivedEventArgs eventArgs) { AccessCredentialReceived?.Invoke(this, eventArgs); } - + private void DriverOnStateChanged(object sender, StateChangedEventArgs eventArgs) { StateChanged?.Invoke(this, eventArgs); @@ -323,29 +397,6 @@ private void DriverOnOnlineStatusChanged(object sender, OnlineStatusChangedEvent OnlineStatusChanged?.Invoke(this, eventArgs); } - private static IEnumerable EndpointsToBeInserted(IHardwareDriver driver, - Endpoint[] existingEndpoints) - { - return driver.Endpoints.Where(endpoint => - endpoint.ExtensionId == driver.Id && !existingEndpoints - .Select(existingEndpoint => existingEndpoint.DriverEndpointId).Contains(endpoint.Id)); - } - - private static IEnumerable EndpointsToBeUpdated(IHardwareDriver driver, Endpoint[] existingEndpoints) - { - return driver.Endpoints.Where(endpoint => - endpoint.ExtensionId == driver.Id && existingEndpoints - .Select(existingEndpoint => existingEndpoint.DriverEndpointId).Contains(endpoint.Id)); - } - - private static IEnumerable EndpointsToBeDeleted(IHardwareDriver driver, - IEnumerable existingEndpoints) - { - return existingEndpoints.Where(existingEndpoint => - existingEndpoint.ExtensionId == driver.Id && !driver.Endpoints - .Select(endpoint => endpoint.Id).Contains(existingEndpoint.DriverEndpointId)); - } - private async Task SaveCurrentConfiguration(ExtensionHost extension) { try @@ -384,7 +435,7 @@ private void UnloadExtension(ExtensionHost extension) { return; } - + extension.Driver.Unload(); extension.Driver.UpdatedEndpoints -= DriverOnUpdatedEndpoints; extension.Driver.AccessCredentialReceived -= DriverOnAccessCredentialReceived; @@ -395,4 +446,4 @@ private void UnloadExtension(ExtensionHost extension) extension.Loaded = false; } } -} \ No newline at end of file +} diff --git a/src/Aporta.Core/Services/InputService.cs b/src/Aporta.Core/Services/InputService.cs index f2239ac..6178646 100644 --- a/src/Aporta.Core/Services/InputService.cs +++ b/src/Aporta.Core/Services/InputService.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -8,14 +9,12 @@ using Aporta.Shared.Messaging; using Aporta.Shared.Models; using Microsoft.AspNetCore.SignalR; -using Z9.Protobuf; using Z9.Spcore.Proto; namespace Aporta.Core.Services; public class InputService { - private readonly EndpointRepository _endpointRepository; private readonly Z9DevRepository _z9DevRepository; private readonly IHubContext _hubContext; private readonly ExtensionService _extensionService; @@ -25,7 +24,6 @@ public InputService(IDataAccess dataAccess, IHubContext> GetAll() { var devs = await _z9DevRepository.GetAllByDevType(DevType.Sensor); - var tasks = devs.Select(async dev => await DevToInput(dev)); - return await Task.WhenAll(tasks); + // Exclude pool z9_devs (DevPlatform=External) — only return user-assigned inputs + var assignedDevs = devs.Where(d => + d.DevPlatformCase != Dev.DevPlatformOneofCase.DevPlatform || + d.DevPlatform != DevPlatform.External); + return assignedDevs.Select(DevToInput); } public async Task Get(int inputId) { var dev = await _z9DevRepository.Get(inputId); - return dev == null ? null : await DevToInput(dev); + return dev == null ? null : DevToInput(dev); } public async Task Insert(Input input) { - var endpoint = await _endpointRepository.Get(input.EndpointId); - var dev = new Dev - { - Name = input.Name, - DevType = DevType.Sensor, - ExternalId = endpoint.DriverEndpointId, - }; - SpCoreProtoUtil.InitRequired(dev); - var id = await _z9DevRepository.Insert(dev); - input.Id = id; + // EndpointId is now a z9_dev unid (from the pool) + var poolDev = await _z9DevRepository.Get(input.EndpointId); + if (poolDev == null) + throw new InvalidOperationException($"Pool z9_dev {input.EndpointId} not found"); + + // Assign: update name, clear DevPlatform to remove from pool + poolDev.Name = input.Name; + poolDev.DevPlatform = DevPlatform.Z9Security; // Clear the External marker + await _z9DevRepository.Upsert(poolDev); + + input.Id = poolDev.Unid; await _hubContext.Clients.All.SendAsync(Methods.InputInserted, input.Id); } @@ -87,38 +89,41 @@ public async Task Delete(int id) public async Task> AvailableMonitorPoints() { - var endpoints = await _endpointRepository.GetAll(); - var sensors = await _z9DevRepository.GetAllByDevType(DevType.Sensor); - var sensorExternalIds = sensors - .Where(d => !string.IsNullOrEmpty(d.ExternalId)) - .Select(d => d.ExternalId) - .ToHashSet(); - return endpoints.Where(endpoint => - endpoint.Type == EndpointType.Input && - !sensorExternalIds.Contains(endpoint.DriverEndpointId)); + var availableSensors = await _z9DevRepository.GetAvailableByDevType(DevType.Sensor); + var tasks = availableSensors.Select(d => DevToEndpoint(d, EndpointType.Input)); + return await Task.WhenAll(tasks); } public async Task GetState(int inputId) { var dev = await _z9DevRepository.Get(inputId); - var endpoint = await _endpointRepository.GetByDriverEndpointId(dev.ExternalId); - return await _extensionService.GetMonitorPoint(endpoint.ExtensionId, dev.ExternalId).GetState(); + var extensionId = await _z9DevRepository.GetExtensionId(dev); + if (!extensionId.HasValue) + return null; + + return await _extensionService.GetMonitorPoint(extensionId.Value, dev.ExternalId).GetState(); } - private async Task DevToInput(Dev dev) + private static Input DevToInput(Dev dev) { - var endpointId = 0; - if (!string.IsNullOrEmpty(dev.ExternalId)) - { - var endpoint = await _endpointRepository.GetByDriverEndpointId(dev.ExternalId); - if (endpoint != null) - endpointId = endpoint.Id; - } return new Input { Id = dev.Unid, Name = dev.Name, - EndpointId = endpointId, + EndpointId = dev.Unid, + }; + } + + private async Task DevToEndpoint(Dev dev, EndpointType type) + { + var extensionId = await _z9DevRepository.GetExtensionId(dev); + return new Endpoint + { + Id = dev.Unid, + Name = dev.Name, + DriverEndpointId = dev.ExternalId, + ExtensionId = extensionId ?? Guid.Empty, + Type = type, }; } } diff --git a/src/Aporta.Core/Services/OutputService.cs b/src/Aporta.Core/Services/OutputService.cs index f686335..dae1169 100644 --- a/src/Aporta.Core/Services/OutputService.cs +++ b/src/Aporta.Core/Services/OutputService.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -8,14 +9,12 @@ using Aporta.Shared.Messaging; using Aporta.Shared.Models; using Microsoft.AspNetCore.SignalR; -using Z9.Protobuf; using Z9.Spcore.Proto; namespace Aporta.Core.Services; public class OutputService { - private readonly EndpointRepository _endpointRepository; private readonly Z9DevRepository _z9DevRepository; private readonly IHubContext _hubContext; private readonly ExtensionService _extensionService; @@ -25,7 +24,6 @@ public OutputService(IDataAccess dataAccess, IHubContext> GetAll() { var devs = await _z9DevRepository.GetAllByDevType(DevType.Actuator); - var tasks = devs.Select(async dev => await DevToOutput(dev)); - return await Task.WhenAll(tasks); + // Exclude pool z9_devs (DevPlatform=External) — only return user-assigned outputs + var assignedDevs = devs.Where(d => + d.DevPlatformCase != Dev.DevPlatformOneofCase.DevPlatform || + d.DevPlatform != DevPlatform.External); + return assignedDevs.Select(DevToOutput); } public async Task Get(int outputId) { var dev = await _z9DevRepository.Get(outputId); - return dev == null ? null : await DevToOutput(dev); + return dev == null ? null : DevToOutput(dev); } public async Task Insert(Output output) { - var endpoint = await _endpointRepository.Get(output.EndpointId); - var dev = new Dev - { - Name = output.Name, - DevType = DevType.Actuator, - ExternalId = endpoint.DriverEndpointId, - }; - SpCoreProtoUtil.InitRequired(dev); - var id = await _z9DevRepository.Insert(dev); - output.Id = id; + // EndpointId is now a z9_dev unid (from the pool) + var poolDev = await _z9DevRepository.Get(output.EndpointId); + if (poolDev == null) + throw new InvalidOperationException($"Pool z9_dev {output.EndpointId} not found"); + + // Assign: update name, clear DevPlatform to remove from pool + poolDev.Name = output.Name; + poolDev.DevPlatform = DevPlatform.Z9Security; // Clear the External marker + await _z9DevRepository.Upsert(poolDev); + + output.Id = poolDev.Unid; await _hubContext.Clients.All.SendAsync(Methods.OutputInserted, output.Id); } @@ -86,22 +88,19 @@ public async Task Delete(int id) public async Task> AvailableControlPoints() { - var endpoints = await _endpointRepository.GetAll(); - var actuators = await _z9DevRepository.GetAllByDevType(DevType.Actuator); - var actuatorExternalIds = actuators - .Where(d => !string.IsNullOrEmpty(d.ExternalId)) - .Select(d => d.ExternalId) - .ToHashSet(); - return endpoints.Where(endpoint => - endpoint.Type == EndpointType.Output && - !actuatorExternalIds.Contains(endpoint.DriverEndpointId)); + var availableActuators = await _z9DevRepository.GetAvailableByDevType(DevType.Actuator); + var tasks = availableActuators.Select(d => DevToEndpoint(d, EndpointType.Output)); + return await Task.WhenAll(tasks); } public async Task SetState(int outputId, bool state) { var dev = await _z9DevRepository.Get(outputId); - var endpoint = await _endpointRepository.GetByDriverEndpointId(dev.ExternalId); - await _extensionService.GetControlPoint(endpoint.ExtensionId, endpoint.DriverEndpointId).SetState(state); + var extensionId = await _z9DevRepository.GetExtensionId(dev); + if (!extensionId.HasValue) + throw new InvalidOperationException($"No extension ID found for z9_dev {outputId}"); + + await _extensionService.GetControlPoint(extensionId.Value, dev.ExternalId).SetState(state); await _hubContext.Clients.All.SendAsync(Methods.OutputStateChanged, dev.Unid, state); } @@ -109,24 +108,33 @@ public async Task SetState(int outputId, bool state) public async Task GetState(int outputId) { var dev = await _z9DevRepository.Get(outputId); - var endpoint = await _endpointRepository.GetByDriverEndpointId(dev.ExternalId); - return await _extensionService.GetControlPoint(endpoint.ExtensionId, endpoint.DriverEndpointId).GetState(); + var extensionId = await _z9DevRepository.GetExtensionId(dev); + if (!extensionId.HasValue) + return null; + + return await _extensionService.GetControlPoint(extensionId.Value, dev.ExternalId).GetState(); } - private async Task DevToOutput(Dev dev) + private static Output DevToOutput(Dev dev) { - var endpointId = 0; - if (!string.IsNullOrEmpty(dev.ExternalId)) - { - var endpoint = await _endpointRepository.GetByDriverEndpointId(dev.ExternalId); - if (endpoint != null) - endpointId = endpoint.Id; - } return new Output { Id = dev.Unid, Name = dev.Name, - EndpointId = endpointId, + EndpointId = dev.Unid, + }; + } + + private async Task DevToEndpoint(Dev dev, EndpointType type) + { + var extensionId = await _z9DevRepository.GetExtensionId(dev); + return new Endpoint + { + Id = dev.Unid, + Name = dev.Name, + DriverEndpointId = dev.ExternalId, + ExtensionId = extensionId ?? Guid.Empty, + Type = type, }; } } diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index cf5f9f8..57dcb12 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 62a99e6..a656c69 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 95cb8b1..5a4635c 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -33,7 +33,6 @@ public class StartupWorker : BackgroundService private readonly ExtensionService _extensionService; private readonly AccessService _accessService; private readonly Z9OpenCommunityProtocolService _z9OpenCommunityProtocolService; - private readonly EndpointRepository _endpointRepository; private readonly Z9DevRepository _z9DevRepository; private readonly HashSet _configuredOsdpBuses = new(); private readonly Dictionary _doorStrikeActive = new(); @@ -57,7 +56,6 @@ public StartupWorker(IDataAccess dataAccess, _configuration = configuration; _logger = logger; _applicationLifetime = applicationLifetime; - _endpointRepository = new EndpointRepository(dataAccess); _z9DevRepository = new Z9DevRepository(dataAccess); } @@ -474,30 +472,22 @@ private static bool IsReaderEndpoint(string endpointId) private async Task EnsureDoorExistsForReader(string driverEndpointId, string readerName) { - // Check if CredReader Dev with this ExternalId already exists — door already exists - Dev existingCredReader = null; - for (int retry = 0; retry < 10; retry++) + // Wait for the pool z9_dev for this reader to appear (created by DriverOnUpdatedEndpoints) + var readerPoolDev = await WaitForPoolDev(driverEndpointId); + if (readerPoolDev == null) { - existingCredReader = await _z9DevRepository.GetByExternalId(driverEndpointId); - if (existingCredReader != null) - break; - - // Endpoint may not be persisted immediately, check if it exists yet - var endpoint = await _endpointRepository.GetByDriverEndpointId(driverEndpointId); - if (endpoint != null) - break; // Endpoint exists but no dev yet — proceed to create - - await Task.Delay(500); // Wait for endpoint to be persisted + _logger.LogWarning("Pool z9_dev for reader endpoint {EndpointId} not found after retries", driverEndpointId); + return; } - if (existingCredReader != null && existingCredReader.DevType == DevType.CredReader) + // If already assigned to a door (has logicalParentUnid), door already exists + if (readerPoolDev.LogicalParentUnidCase == Dev.LogicalParentUnidOneofCase.LogicalParentUnid) { - _logger.LogDebug("CredReader Dev already exists for endpoint {EndpointId}, door exists", - driverEndpointId); + _logger.LogDebug("CredReader z9_dev already assigned to door for endpoint {EndpointId}", driverEndpointId); return; } - // Create Door Dev tree + // Create Door Dev var doorDev = new Dev { Name = $"Door - {readerName}", @@ -506,128 +496,80 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea SpCoreProtoUtil.InitRequired(doorDev); var doorUnid = await _z9DevRepository.Insert(doorDev); - // Create CredReader child - var credReaderDev = new Dev - { - Name = readerName, - DevType = DevType.CredReader, - ExternalId = driverEndpointId, - LogicalParentUnid = doorUnid, - }; - SpCoreProtoUtil.InitRequired(credReaderDev); - var credReaderUnid = await _z9DevRepository.Insert(credReaderDev); - doorDev.LogicalChildrenUnid.Add(credReaderUnid); + // Assign the reader pool dev as door child + readerPoolDev.LogicalParentUnid = doorUnid; + readerPoolDev.DevPlatform = DevPlatform.Z9Security; + await _z9DevRepository.Upsert(readerPoolDev); + doorDev.LogicalChildrenUnid.Add(readerPoolDev.Unid); var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); - // If the reader has a strike output configured, create Actuator child + // If the reader has a strike output configured, assign Actuator pool dev if (config?.StrikeOutputNumber != null) { var strikeDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:O{config.StrikeOutputNumber}"; - _logger.LogInformation("Looking for strike output endpoint: {StrikeEndpointId}", strikeDriverEndpointId); + _logger.LogInformation("Looking for strike output pool z9_dev: {StrikeEndpointId}", strikeDriverEndpointId); - Endpoint strikeEndpoint = null; - for (int retry = 0; retry < 20; retry++) + var strikePoolDev = await WaitForPoolDev(strikeDriverEndpointId); + if (strikePoolDev != null) { - strikeEndpoint = await _endpointRepository.GetByDriverEndpointId(strikeDriverEndpointId); - if (strikeEndpoint != null) - break; - await Task.Delay(500); - } - - if (strikeEndpoint != null) - { - var strikeDev = new Dev - { - Name = strikeEndpoint.Name, - DevType = DevType.Actuator, - DevUse = DevUse.ActuatorDoorStrike, - ExternalId = strikeDriverEndpointId, - LogicalParentUnid = doorUnid, - }; - SpCoreProtoUtil.InitRequired(strikeDev); - var strikeUnid = await _z9DevRepository.Insert(strikeDev); - doorDev.LogicalChildrenUnid.Add(strikeUnid); - _logger.LogInformation("Created Actuator Dev for door strike {EndpointId}", strikeDriverEndpointId); + strikePoolDev.LogicalParentUnid = doorUnid; + strikePoolDev.DevPlatform = DevPlatform.Z9Security; + strikePoolDev.DevUse = DevUse.ActuatorDoorStrike; + await _z9DevRepository.Upsert(strikePoolDev); + doorDev.LogicalChildrenUnid.Add(strikePoolDev.Unid); + _logger.LogInformation("Assigned Actuator pool z9_dev for door strike {EndpointId}", strikeDriverEndpointId); } else { - _logger.LogWarning("Strike output endpoint {StrikeEndpointId} not found after retries", strikeDriverEndpointId); + _logger.LogWarning("Strike output pool z9_dev {StrikeEndpointId} not found after retries", strikeDriverEndpointId); } } _logger.LogInformation("Created door '{DoorName}' (unid={DoorUnid}) for reader endpoint {EndpointId}", doorDev.Name, doorUnid, driverEndpointId); - // If the reader has a door contact input configured, create Sensor child + // If the reader has a door contact input configured, assign Sensor pool dev if (config?.DoorContactInputNumber != null) { var contactDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:I{config.DoorContactInputNumber}"; - _logger.LogInformation("Looking for door contact input endpoint: {ContactEndpointId}", contactDriverEndpointId); - - Endpoint contactEndpoint = null; - for (int retry = 0; retry < 20; retry++) - { - contactEndpoint = await _endpointRepository.GetByDriverEndpointId(contactDriverEndpointId); - if (contactEndpoint != null) - break; - await Task.Delay(500); - } + _logger.LogInformation("Looking for door contact input pool z9_dev: {ContactEndpointId}", contactDriverEndpointId); - if (contactEndpoint != null) + var contactPoolDev = await WaitForPoolDev(contactDriverEndpointId); + if (contactPoolDev != null) { - var contactDev = new Dev - { - Name = contactEndpoint.Name, - DevType = DevType.Sensor, - DevUse = DevUse.SensorDoorContact, - ExternalId = contactDriverEndpointId, - LogicalParentUnid = doorUnid, - }; - SpCoreProtoUtil.InitRequired(contactDev); - var contactUnid = await _z9DevRepository.Insert(contactDev); - doorDev.LogicalChildrenUnid.Add(contactUnid); - _logger.LogInformation("Created Sensor Dev for door contact {EndpointId}", contactDriverEndpointId); + contactPoolDev.LogicalParentUnid = doorUnid; + contactPoolDev.DevPlatform = DevPlatform.Z9Security; + contactPoolDev.DevUse = DevUse.SensorDoorContact; + await _z9DevRepository.Upsert(contactPoolDev); + doorDev.LogicalChildrenUnid.Add(contactPoolDev.Unid); + _logger.LogInformation("Assigned Sensor pool z9_dev for door contact {EndpointId}", contactDriverEndpointId); } else { - _logger.LogWarning("Door contact input endpoint {ContactEndpointId} not found after retries", contactDriverEndpointId); + _logger.LogWarning("Door contact input pool z9_dev {ContactEndpointId} not found after retries", contactDriverEndpointId); } } - // If the reader has a REX input configured, create Sensor child + // If the reader has a REX input configured, assign Sensor pool dev if (config?.RexInputNumber != null) { var rexDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:I{config.RexInputNumber}"; - _logger.LogInformation("Looking for REX input endpoint: {RexEndpointId}", rexDriverEndpointId); + _logger.LogInformation("Looking for REX input pool z9_dev: {RexEndpointId}", rexDriverEndpointId); - Endpoint rexEndpoint = null; - for (int retry = 0; retry < 20; retry++) + var rexPoolDev = await WaitForPoolDev(rexDriverEndpointId); + if (rexPoolDev != null) { - rexEndpoint = await _endpointRepository.GetByDriverEndpointId(rexDriverEndpointId); - if (rexEndpoint != null) - break; - await Task.Delay(500); - } - - if (rexEndpoint != null) - { - var rexDev = new Dev - { - Name = rexEndpoint.Name, - DevType = DevType.Sensor, - DevUse = DevUse.SensorRex, - ExternalId = rexDriverEndpointId, - LogicalParentUnid = doorUnid, - }; - SpCoreProtoUtil.InitRequired(rexDev); - var rexUnid = await _z9DevRepository.Insert(rexDev); - doorDev.LogicalChildrenUnid.Add(rexUnid); - _logger.LogInformation("Created Sensor Dev for REX {EndpointId}", rexDriverEndpointId); + rexPoolDev.LogicalParentUnid = doorUnid; + rexPoolDev.DevPlatform = DevPlatform.Z9Security; + rexPoolDev.DevUse = DevUse.SensorRex; + await _z9DevRepository.Upsert(rexPoolDev); + doorDev.LogicalChildrenUnid.Add(rexPoolDev.Unid); + _logger.LogInformation("Assigned Sensor pool z9_dev for REX {EndpointId}", rexDriverEndpointId); } else { - _logger.LogWarning("REX input endpoint {RexEndpointId} not found after retries", rexDriverEndpointId); + _logger.LogWarning("REX input pool z9_dev {RexEndpointId} not found after retries", rexDriverEndpointId); } } @@ -641,6 +583,18 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea } } + private async Task WaitForPoolDev(string driverEndpointId, int maxRetries = 20) + { + for (int retry = 0; retry < maxRetries; retry++) + { + var dev = await _z9DevRepository.GetByExternalId(driverEndpointId); + if (dev != null) + return dev; + await Task.Delay(500); + } + return null; + } + private void OnDevActionRequested(object sender, DevActionReq req) { if (req.DevActionType == DevActionType.DoorMomentaryUnlock) @@ -704,15 +658,21 @@ private async Task HandleDoorMomentaryUnlock(int doorUnid) var strikeDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:O{config.StrikeOutputNumber}"; - var strikeEndpoint = await _endpointRepository.GetByDriverEndpointId(strikeDriverEndpointId); + var strikeDev = await _z9DevRepository.GetByExternalId(strikeDriverEndpointId); + if (strikeDev == null) + { + _logger.LogWarning("Strike z9_dev {EndpointId} not found", strikeDriverEndpointId); + return; + } - if (strikeEndpoint == null) + var extensionId = await _z9DevRepository.GetExtensionId(strikeDev); + if (!extensionId.HasValue) { - _logger.LogWarning("Strike endpoint {EndpointId} not found in database", strikeDriverEndpointId); + _logger.LogWarning("No extension ID found for strike z9_dev {EndpointId}", strikeDriverEndpointId); return; } - var controlPoint = _extensionService.GetControlPoint(strikeEndpoint.ExtensionId, strikeEndpoint.DriverEndpointId); + var controlPoint = _extensionService.GetControlPoint(extensionId.Value, strikeDev.ExternalId); if (controlPoint == null) { _logger.LogWarning("No control point found for strike endpoint {EndpointId}", strikeDriverEndpointId); @@ -796,11 +756,14 @@ private async Task ApplyDoorMode(int doorUnid, DoorMode doorMode, Z9OpenCommunit if (config.StrikeOutputNumber != null) { var strikeDriverEndpointId = $"{config.Host}:{config.TcpPort}:{config.OsdpAddress}:O{config.StrikeOutputNumber}"; - var strikeEndpoint = await _endpointRepository.GetByDriverEndpointId(strikeDriverEndpointId); + var strikeDev = await _z9DevRepository.GetByExternalId(strikeDriverEndpointId); - if (strikeEndpoint != null) + if (strikeDev != null) { - var controlPoint = _extensionService.GetControlPoint(strikeEndpoint.ExtensionId, strikeEndpoint.DriverEndpointId); + var strikeExtensionId = await _z9DevRepository.GetExtensionId(strikeDev); + var controlPoint = strikeExtensionId.HasValue + ? _extensionService.GetControlPoint(strikeExtensionId.Value, strikeDev.ExternalId) + : null; if (controlPoint != null) { if (effectiveMode == DoorModeType.StaticStateUnlocked) diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 9579cd0..a862396 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/EndpointRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/EndpointRepositoryTests.cs deleted file mode 100644 index 7038fb1..0000000 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/EndpointRepositoryTests.cs +++ /dev/null @@ -1,100 +0,0 @@ -using System; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using Aporta.Core.DataAccess; -using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Models; -using Aporta.Shared.Models; -using NUnit.Framework; - -namespace Aporta.Core.Tests.DataAccess.Repositories; - -[TestFixture] -public class EndpointRepositoryTests -{ - private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); - private IDbConnection _persistConnection; - private Guid _extensionId; - - [SetUp] - public async Task Setup() - { - _persistConnection = _dataAccess.CreateDbConnection(); - _persistConnection.Open(); - - await _dataAccess.UpdateSchema(); - - _extensionId = Guid.NewGuid(); - var extensions = new[] - { - new ExtensionHost {Id = _extensionId, Name = "ExtensionTest", Enabled = false} - }; - - var extensionRepository = new ExtensionRepository(_dataAccess); - foreach (var extension in extensions) - { - await extensionRepository.Insert(extension); - } - } - - [TearDown] - public void TearDown() - { - _persistConnection?.Close(); - _persistConnection?.Dispose(); - } - - [Test] - public async Task Insert() - { - // Arrange - var endpoints = new[] - { - new Endpoint {Name = "Test1", Type = EndpointType.Output, ExtensionId = _extensionId}, - new Endpoint {Name = "Test2", Type = EndpointType.Input, ExtensionId = _extensionId}, - new Endpoint {Name = "Test3", Type = EndpointType.Reader, ExtensionId = _extensionId} - }; - - var endpointRepository = new EndpointRepository(_dataAccess); - foreach (var endpoint in endpoints) - { - await endpointRepository.Insert(endpoint); - } - - // Act - var actualEndpoint = await endpointRepository.Get(3); - - // Assert - Assert.That(endpoints[2].Id, Is.EqualTo(3)); - Assert.That(actualEndpoint.Id, Is.EqualTo(3)); - Assert.That(actualEndpoint.Name, Is.EqualTo("Test3")); - Assert.That(actualEndpoint.Type, Is.EqualTo(EndpointType.Reader)); - Assert.That(actualEndpoint.ExtensionId, Is.EqualTo(_extensionId)); - } - - [Test] - public async Task Delete() - { - // Arrange - var endpoints = new[] - { - new Endpoint {Name = "Test1", Type = EndpointType.Output, ExtensionId = _extensionId}, - new Endpoint {Name = "Test2", Type = EndpointType.Input, ExtensionId = _extensionId}, - new Endpoint {Name = "Test3", Type = EndpointType.Reader, ExtensionId = _extensionId} - }; - - var endpointRepository = new EndpointRepository(_dataAccess); - foreach (var endpoint in endpoints) - { - await endpointRepository.Insert(endpoint); - } - - // Act - await endpointRepository.Delete(3); - - // Assert - var actualEndpoints = await endpointRepository.GetAll(); - Assert.That(2, Is.EqualTo(actualEndpoints.Count())); - } -} \ No newline at end of file diff --git a/test/Aporta.Core.Tests/Services/InputServiceTests.cs b/test/Aporta.Core.Tests/Services/InputServiceTests.cs index 6ec7034..8a6cb2d 100644 --- a/test/Aporta.Core.Tests/Services/InputServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/InputServiceTests.cs @@ -47,17 +47,17 @@ public async Task Setup() await _extensionService.Startup(); await _extensionService.EnableExtension(_extensionId, true); - // Wait for endpoints to be inserted - var endpointRepository = new EndpointRepository(_dataAccess); + // Wait for pool z9_devs to be synced from driver (1 controller + 5 endpoints) + var z9DevRepository = new Z9DevRepository(_dataAccess); using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5)); - while ((await endpointRepository.GetAll()).Count() != 5 && !cancellationTokenSource.Token.IsCancellationRequested) + while ((await z9DevRepository.GetAll()).Count() < 6 && !cancellationTokenSource.Token.IsCancellationRequested) { await Task.Delay(TimeSpan.FromSeconds(1), cancellationTokenSource.Token); } if(cancellationTokenSource.Token.IsCancellationRequested) { - Assert.Fail("Timeout waiting for endpoints to be inserted"); + Assert.Fail("Timeout waiting for pool z9_devs to be synced"); } } @@ -77,10 +77,14 @@ public async Task GetState() var inputService = new InputService(_dataAccess, new UnitTestingSupportForIHubContext().IHubContextMock.Object, _extensionService); + + var available = (await inputService.AvailableMonitorPoints()).ToArray(); + Assert.That(available.Length, Is.EqualTo(2), "Expected 2 available sensor endpoints"); + var inputs = new[] { - new Input {Name = "TestInput1", EndpointId = 4}, - new Input {Name = "TestInput2", EndpointId = 5} + new Input {Name = "TestInput1", EndpointId = available[0].Id}, + new Input {Name = "TestInput2", EndpointId = available[1].Id} }; foreach (var input in inputs) @@ -88,8 +92,8 @@ public async Task GetState() await inputService.Insert(input); } - // Act - await SendInputState("I2", true); + // Act — send state via named pipe using the driver endpoint ID of the second input + await SendInputState(available[1].DriverEndpointId, true); // Assert Assert.That(async () => await inputService.GetState(inputs[0].Id), @@ -104,10 +108,14 @@ public async Task ReceiveStateChange() // Arrange var hubContext = new UnitTestingSupportForIHubContext(); var inputService = new InputService(_dataAccess, hubContext.IHubContextMock.Object, _extensionService); + + var available = (await inputService.AvailableMonitorPoints()).ToArray(); + Assert.That(available.Length, Is.EqualTo(2), "Expected 2 available sensor endpoints"); + var inputs = new[] { - new Input {Name = "TestInput1", EndpointId = 4}, - new Input {Name = "TestInput2", EndpointId = 5} + new Input {Name = "TestInput1", EndpointId = available[0].Id}, + new Input {Name = "TestInput2", EndpointId = available[1].Id} }; foreach (var input in inputs) @@ -115,8 +123,8 @@ public async Task ReceiveStateChange() await inputService.Insert(input); } - // Act - await SendInputState("I2", true); + // Act — send state via named pipe using the driver endpoint ID of the second input + await SendInputState(available[1].DriverEndpointId, true); // Assert // Wait for state to be updated on service before verifying diff --git a/test/Aporta.Core.Tests/Services/OutputServiceTests.cs b/test/Aporta.Core.Tests/Services/OutputServiceTests.cs index 972bc00..204582d 100644 --- a/test/Aporta.Core.Tests/Services/OutputServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/OutputServiceTests.cs @@ -41,17 +41,17 @@ public async Task Setup() await _extensionService.Startup(); await _extensionService.EnableExtension(_extensionId, true); - // Wait for endpoints to be inserted - var endpointRepository = new EndpointRepository(_dataAccess); + // Wait for pool z9_devs to be synced from driver (1 controller + 5 endpoints) + var z9DevRepository = new Z9DevRepository(_dataAccess); using CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5)); - while ((await endpointRepository.GetAll()).Count() != 5 && !cancellationTokenSource.Token.IsCancellationRequested) + while ((await z9DevRepository.GetAll()).Count() < 6 && !cancellationTokenSource.Token.IsCancellationRequested) { await Task.Delay(TimeSpan.FromSeconds(1), cancellationTokenSource.Token); } if(cancellationTokenSource.Token.IsCancellationRequested) { - Assert.Fail("Timeout waiting for endpoints to be inserted"); + Assert.Fail("Timeout waiting for pool z9_devs to be synced"); } } @@ -72,10 +72,13 @@ public async Task SetState() new UnitTestingSupportForIHubContext().IHubContextMock.Object, _extensionService); + var available = (await outputService.AvailableControlPoints()).ToArray(); + Assert.That(available.Length, Is.EqualTo(2), "Expected 2 available actuator endpoints"); + var outputs = new[] { - new Output {Name = "TestOutput1", EndpointId = 2}, - new Output {Name = "TestOutput2", EndpointId = 3} + new Output {Name = "TestOutput1", EndpointId = available[0].Id}, + new Output {Name = "TestOutput2", EndpointId = available[1].Id} }; foreach (var output in outputs) { diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index eb2b3fc..6ec1d0e 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,7 +10,7 @@ - + From becb6d434b894238f7332bb5f108015dba31616d Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Mon, 9 Feb 2026 07:29:20 -0500 Subject: [PATCH 57/86] Use Dev.Enabled for pool/assigned distinction, regenerate community proto 1.0.10 Regenerated community proto from z9main (Dev now has externalDevModId and externalDevModText fields). Updated Z9.Protobuf.Community to 1.0.10. Replaced DevPlatform swapping with Dev.Enabled flag: pool z9_devs stay Enabled=false, assigned z9_devs set Enabled=true. DevPlatform remains Community for all driver-synced devices. Fixed enum names to match z9main spec (IoControllerCommunity, DevPlatform.Community). Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- .../Repositories/Z9DevRepository.cs | 25 +++++++++++++------ .../Services/DoorConfigurationService.cs | 4 +-- src/Aporta.Core/Services/ExtensionService.cs | 24 ++++++++---------- src/Aporta.Core/Services/InputService.cs | 8 +++--- src/Aporta.Core/Services/OutputService.cs | 8 +++--- src/Aporta.Migration/Aporta.Migration.csproj | 2 +- src/Aporta/Aporta.csproj | 2 +- src/Aporta/Workers/StartupWorker.cs | 8 +++--- .../Aporta.Core.Tests.csproj | 2 +- .../Aporta.Migration.Tests.csproj | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 0939531..f1c9f88 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs b/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs index 9595802..aa14db4 100644 --- a/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/Z9DevRepository.cs @@ -58,7 +58,7 @@ public async Task GetForDriverId(string driverId) } /// - /// Gets the IO_CONTROLLER_EXTERNAL z9_dev for the given extension (driver) GUID. + /// Gets the IO_CONTROLLER_COMMUNITY z9_dev for the given extension (driver) GUID. /// Uses the denormalized external_dev_mod_id column. /// public async Task GetController(Guid extensionId) @@ -92,7 +92,7 @@ WHERE json_extract(data, '$.physicalParentUnid') = @parentUnid", /// /// Gets available (pool) z9_devs matching the given devType. - /// Available = DevPlatform is External (auto-synced from driver, not yet assigned by user). + /// Available = DevPlatform is Community and Enabled is false (auto-synced from driver, not yet assigned by user). /// public async Task> GetAvailableByDevType(DevType devType) { @@ -100,17 +100,19 @@ public async Task> GetAvailableByDevType(DevType devType) return all.Where(d => d.DevType == devType && d.DevPlatformCase == Dev.DevPlatformOneofCase.DevPlatform && - d.DevPlatform == DevPlatform.External); + d.DevPlatform == DevPlatform.Community && + !d.Enabled); } /// /// Gets the extension (driver) GUID for any z9_dev by walking physicalParentUnid - /// to its IO_CONTROLLER_EXTERNAL parent. + /// to its IO_CONTROLLER_COMMUNITY parent. + /// The controller stores the driver GUID in ExternalDevModId. /// public async Task GetExtensionId(Dev dev) { // If this dev IS the controller, return its ExternalDevModId directly - if (dev.DevMod == DevMod.IoControllerExternal && + if (dev.DevMod == DevMod.IoControllerCommunity && !string.IsNullOrEmpty(dev.ExternalDevModId)) { return Guid.TryParse(dev.ExternalDevModId, out var id) ? id : null; @@ -137,7 +139,7 @@ public async Task Insert(Dev dev) dev.Unid = nextId; var json = Formatter.Format(dev); - var externalDevModId = string.IsNullOrEmpty(dev.ExternalDevModId) ? null : dev.ExternalDevModId; + var externalDevModId = GetExternalDevModId(dev); await connection.ExecuteAsync( "INSERT INTO z9_dev (id, data, external_dev_mod_id) VALUES (@id, @data, @externalDevModId)", @@ -153,11 +155,20 @@ await connection.ExecuteAsync( var id = GetUnid(message); var json = Formatter.Format(message); - var externalDevModId = string.IsNullOrEmpty(message.ExternalDevModId) ? null : message.ExternalDevModId; + var externalDevModId = GetExternalDevModId(message); await connection.ExecuteAsync( @"INSERT INTO z9_dev (id, data, external_dev_mod_id) VALUES (@id, @data, @externalDevModId) ON CONFLICT(id) DO UPDATE SET data = @data, external_dev_mod_id = @externalDevModId", new { id, data = json, externalDevModId }); } + + /// + /// Extracts the external_dev_mod_id for the SQL column. + /// Only IO_CONTROLLER_COMMUNITY z9_devs have ExternalDevModId set. + /// + private static string GetExternalDevModId(Dev dev) + { + return string.IsNullOrEmpty(dev.ExternalDevModId) ? null : dev.ExternalDevModId; + } } diff --git a/src/Aporta.Core/Services/DoorConfigurationService.cs b/src/Aporta.Core/Services/DoorConfigurationService.cs index 61e1b04..817f226 100644 --- a/src/Aporta.Core/Services/DoorConfigurationService.cs +++ b/src/Aporta.Core/Services/DoorConfigurationService.cs @@ -45,7 +45,7 @@ public async Task> AvailableEndPoints() { var allAvailable = (await _z9DevRepository.GetAll()) .Where(d => d.DevPlatformCase == Dev.DevPlatformOneofCase.DevPlatform && - d.DevPlatform == DevPlatform.External && + d.DevPlatform == DevPlatform.Community && d.DevType != DevType.IoController); var tasks = allAvailable.Select(async d => { @@ -194,7 +194,7 @@ public async Task Insert(Door door) if (poolDev == null) return null; poolDev.LogicalParentUnid = doorUnid; - poolDev.DevPlatform = DevPlatform.Z9Security; // Clear the External marker + poolDev.Enabled = true; if (setDevUse) { poolDev.DevUse = devUse; diff --git a/src/Aporta.Core/Services/ExtensionService.cs b/src/Aporta.Core/Services/ExtensionService.cs index f8d7e36..57e9302 100644 --- a/src/Aporta.Core/Services/ExtensionService.cs +++ b/src/Aporta.Core/Services/ExtensionService.cs @@ -275,8 +275,8 @@ private async Task EnsureControllerDev(ExtensionHost extension) { Name = extension.Name, DevType = DevType.IoController, - DevMod = DevMod.IoControllerExternal, - DevPlatform = DevPlatform.External, + DevMod = DevMod.IoControllerCommunity, + DevPlatform = DevPlatform.Community, ExternalDevModId = extension.Id.ToString(), ExternalDevModText = extension.Name, ExternalId = extension.Id.ToString(), @@ -284,7 +284,7 @@ private async Task EnsureControllerDev(ExtensionHost extension) SpCoreProtoUtil.InitRequired(controllerDev); await _z9DevRepository.Insert(controllerDev); - logger.LogInformation("Created IO_CONTROLLER_EXTERNAL z9_dev for driver {Name} (extensionId={ExtensionId})", + logger.LogInformation("Created IO_CONTROLLER_COMMUNITY z9_dev for driver {Name} (extensionId={ExtensionId})", extension.Name, extension.Id); } @@ -317,32 +317,31 @@ private void DriverOnUpdatedEndpoints(object sender, EventArgs eventArgs) return; } - var existingPoolDevs = (await _z9DevRepository.GetPhysicalChildren(controllerDev.Unid)) - .Where(d => d.DevPlatformCase == Dev.DevPlatformOneofCase.DevPlatform && - d.DevPlatform == DevPlatform.External) - .ToArray(); + var allPhysicalChildren = (await _z9DevRepository.GetPhysicalChildren(controllerDev.Unid)).ToArray(); + var existingPoolDevs = allPhysicalChildren.Where(d => !d.Enabled).ToArray(); - var existingExternalIds = existingPoolDevs + // Use ALL children's external IDs to avoid creating duplicates for assigned devs + var allExternalIds = allPhysicalChildren .Select(d => d.ExternalId) .ToHashSet(); // Insert new endpoints as pool z9_devs foreach (var endpoint in driver.Endpoints.Where(ep => - ep.ExtensionId == driver.Id && !existingExternalIds.Contains(ep.Id))) + ep.ExtensionId == driver.Id && !allExternalIds.Contains(ep.Id))) { var devType = endpoint switch { IAccess => DevType.CredReader, IOutput => DevType.Actuator, IInput => DevType.Sensor, - _ => DevType.Reserved0 + _ => DevType.IoController }; var poolDev = new Dev { Name = endpoint.Name, DevType = devType, - DevPlatform = DevPlatform.External, + DevPlatform = DevPlatform.Community, ExternalId = endpoint.Id, PhysicalParentUnid = controllerDev.Unid, }; @@ -350,7 +349,7 @@ private void DriverOnUpdatedEndpoints(object sender, EventArgs eventArgs) await _z9DevRepository.Insert(poolDev); } - // Update existing pool z9_devs (name changes etc.) + // Update existing pool z9_devs (name changes etc.) — only pool, not assigned var driverEndpointIds = driver.Endpoints .Where(ep => ep.ExtensionId == driver.Id) .Select(ep => ep.Id) @@ -369,7 +368,6 @@ private void DriverOnUpdatedEndpoints(object sender, EventArgs eventArgs) // Delete pool z9_devs for endpoints no longer reported by driver foreach (var poolDev in existingPoolDevs.Where(d => !driverEndpointIds.Contains(d.ExternalId))) { - // Only delete pool entries (DevPlatform=External); assigned devices are left alone await _z9DevRepository.Delete(poolDev.Unid); } diff --git a/src/Aporta.Core/Services/InputService.cs b/src/Aporta.Core/Services/InputService.cs index 6178646..4204dd2 100644 --- a/src/Aporta.Core/Services/InputService.cs +++ b/src/Aporta.Core/Services/InputService.cs @@ -50,10 +50,8 @@ await _hubContext.Clients.All.SendAsync(Methods.InputStateChanged, dev.Unid, public async Task> GetAll() { var devs = await _z9DevRepository.GetAllByDevType(DevType.Sensor); - // Exclude pool z9_devs (DevPlatform=External) — only return user-assigned inputs - var assignedDevs = devs.Where(d => - d.DevPlatformCase != Dev.DevPlatformOneofCase.DevPlatform || - d.DevPlatform != DevPlatform.External); + // Only return user-assigned inputs (Enabled=true) + var assignedDevs = devs.Where(d => d.Enabled); return assignedDevs.Select(DevToInput); } @@ -72,7 +70,7 @@ public async Task Insert(Input input) // Assign: update name, clear DevPlatform to remove from pool poolDev.Name = input.Name; - poolDev.DevPlatform = DevPlatform.Z9Security; // Clear the External marker + poolDev.Enabled = true; await _z9DevRepository.Upsert(poolDev); input.Id = poolDev.Unid; diff --git a/src/Aporta.Core/Services/OutputService.cs b/src/Aporta.Core/Services/OutputService.cs index dae1169..f131a27 100644 --- a/src/Aporta.Core/Services/OutputService.cs +++ b/src/Aporta.Core/Services/OutputService.cs @@ -49,10 +49,8 @@ private async void ExtensionServiceOnOutputStateChanged(object sender, StateChan public async Task> GetAll() { var devs = await _z9DevRepository.GetAllByDevType(DevType.Actuator); - // Exclude pool z9_devs (DevPlatform=External) — only return user-assigned outputs - var assignedDevs = devs.Where(d => - d.DevPlatformCase != Dev.DevPlatformOneofCase.DevPlatform || - d.DevPlatform != DevPlatform.External); + // Only return user-assigned outputs (Enabled=true) + var assignedDevs = devs.Where(d => d.Enabled); return assignedDevs.Select(DevToOutput); } @@ -71,7 +69,7 @@ public async Task Insert(Output output) // Assign: update name, clear DevPlatform to remove from pool poolDev.Name = output.Name; - poolDev.DevPlatform = DevPlatform.Z9Security; // Clear the External marker + poolDev.Enabled = true; await _z9DevRepository.Upsert(poolDev); output.Id = poolDev.Unid; diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index 57dcb12..562457c 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index a656c69..0221fa6 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 5a4635c..3a4305c 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -498,7 +498,7 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea // Assign the reader pool dev as door child readerPoolDev.LogicalParentUnid = doorUnid; - readerPoolDev.DevPlatform = DevPlatform.Z9Security; + readerPoolDev.Enabled = true; await _z9DevRepository.Upsert(readerPoolDev); doorDev.LogicalChildrenUnid.Add(readerPoolDev.Unid); @@ -514,7 +514,7 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea if (strikePoolDev != null) { strikePoolDev.LogicalParentUnid = doorUnid; - strikePoolDev.DevPlatform = DevPlatform.Z9Security; + strikePoolDev.Enabled = true; strikePoolDev.DevUse = DevUse.ActuatorDoorStrike; await _z9DevRepository.Upsert(strikePoolDev); doorDev.LogicalChildrenUnid.Add(strikePoolDev.Unid); @@ -539,7 +539,7 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea if (contactPoolDev != null) { contactPoolDev.LogicalParentUnid = doorUnid; - contactPoolDev.DevPlatform = DevPlatform.Z9Security; + contactPoolDev.Enabled = true; contactPoolDev.DevUse = DevUse.SensorDoorContact; await _z9DevRepository.Upsert(contactPoolDev); doorDev.LogicalChildrenUnid.Add(contactPoolDev.Unid); @@ -561,7 +561,7 @@ private async Task EnsureDoorExistsForReader(string driverEndpointId, string rea if (rexPoolDev != null) { rexPoolDev.LogicalParentUnid = doorUnid; - rexPoolDev.DevPlatform = DevPlatform.Z9Security; + rexPoolDev.Enabled = true; rexPoolDev.DevUse = DevUse.SensorRex; await _z9DevRepository.Upsert(rexPoolDev); doorDev.LogicalChildrenUnid.Add(rexPoolDev.Unid); diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index a862396..9141e65 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index 6ec1d0e..4bb8f0b 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,7 +10,7 @@ - + From 05ca7900d0680caacee6b4950939d91321b262bd Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Mon, 9 Feb 2026 11:13:36 -0500 Subject: [PATCH 58/86] Add DevStateService for centralized in-memory device state tracking Introduces DevStateRecord-based state tracking using z9/open proto types, replacing the need for ad-hoc state queries. DevStateService is wired into InputService, OutputService, StartupWorker (door aspects), and the SpCore protocol service (batch/continuous DevStateRecord forwarding). Adds Flex REST API endpoint at flex/devStateRecord/list for read-only state queries. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- src/Aporta.Core/Services/DevStateService.cs | 76 +++++++++++++++++++ src/Aporta.Core/Services/FlexMapper.cs | 60 +++++++++++++++ src/Aporta.Core/Services/InputService.cs | 7 +- src/Aporta.Core/Services/OutputService.cs | 10 ++- .../Z9OpenCommunityProtocolService.cs | 60 ++++++++++++++- src/Aporta.Migration/Aporta.Migration.csproj | 2 +- .../Models/Flex/FlexDevStateRecord.cs | 70 +++++++++++++++++ src/Aporta/Aporta.csproj | 2 +- .../Flex/FlexDevStateRecordController.cs | 33 ++++++++ src/Aporta/Startup.cs | 1 + src/Aporta/Workers/StartupWorker.cs | 25 ++++++ .../Aporta.Core.Tests.csproj | 2 +- .../Services/InputServiceTests.cs | 4 +- .../Services/OutputServiceTests.cs | 2 +- .../Z9OpenCommunityProtocolServiceTests.cs | 3 +- .../Aporta.Migration.Tests.csproj | 2 +- 17 files changed, 349 insertions(+), 12 deletions(-) create mode 100644 src/Aporta.Core/Services/DevStateService.cs create mode 100644 src/Aporta.Shared/Models/Flex/FlexDevStateRecord.cs create mode 100644 src/Aporta/Controllers/Flex/FlexDevStateRecordController.cs diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index f1c9f88..303e9c7 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Core/Services/DevStateService.cs b/src/Aporta.Core/Services/DevStateService.cs new file mode 100644 index 0000000..9b08d8d --- /dev/null +++ b/src/Aporta.Core/Services/DevStateService.cs @@ -0,0 +1,76 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; +using Z9.Spcore.Proto; + +namespace Aporta.Core.Services; + +public class DevAspectStateChangedEventArgs : EventArgs +{ + public int DevUnid { get; set; } + public DevAspect Aspect { get; set; } + public DevAspectState State { get; set; } +} + +public class DevStateService +{ + private readonly ConcurrentDictionary _stateRecords = new(); + + public event EventHandler DevAspectStateChanged; + + public void UpdateAspect(int devUnid, DevAspect aspect, Action mutator) + { + var record = _stateRecords.GetOrAdd(devUnid, _ => + { + var r = new DevStateRecord { DevUnid = devUnid, Unid = devUnid }; + r.DevState = new DevState(); + return r; + }); + + lock (record) + { + if (record.DevState == null) + record.DevState = new DevState(); + + var entry = record.DevState.DevAspectStates + .FirstOrDefault(e => e.KeyCase == DevState.Types.DevAspect_DevAspectState_Entry.KeyOneofCase.Key && e.Key == aspect); + + if (entry == null) + { + entry = new DevState.Types.DevAspect_DevAspectState_Entry { Key = aspect }; + entry.Value = new DevAspectState { DevAspect = aspect }; + record.DevState.DevAspectStates.Add(entry); + } + + if (entry.Value == null) + entry.Value = new DevAspectState { DevAspect = aspect }; + + entry.Value.DbTime = new DateTimeData { Millis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() }; + + mutator(entry.Value); + + DevAspectStateChanged?.Invoke(this, new DevAspectStateChangedEventArgs + { + DevUnid = devUnid, + Aspect = aspect, + State = entry.Value, + }); + } + } + + public DevStateRecord GetDevStateRecord(int devUnid) + { + return _stateRecords.TryGetValue(devUnid, out var record) ? record : null; + } + + public List GetAllDevStateRecords() + { + return _stateRecords.Values.ToList(); + } + + public void RemoveDevStateRecord(int devUnid) + { + _stateRecords.TryRemove(devUnid, out _); + } +} diff --git a/src/Aporta.Core/Services/FlexMapper.cs b/src/Aporta.Core/Services/FlexMapper.cs index 28e2bbb..66c2ae7 100644 --- a/src/Aporta.Core/Services/FlexMapper.cs +++ b/src/Aporta.Core/Services/FlexMapper.cs @@ -1030,6 +1030,66 @@ public static DataLayout ToProto(FlexDataLayout flex) return proto; } + // --- DevStateRecord --- + + public static FlexDevStateRecord ToFlex(DevStateRecord proto) + { + var flex = new FlexDevStateRecord + { + Unid = proto.UnidCase == DevStateRecord.UnidOneofCase.Unid ? proto.Unid : null, + Dev = MakeObjRef("dev", proto.DevUnid), + }; + + if (proto.DevState != null) + { + flex.DevState = new FlexDevState(); + foreach (var entry in proto.DevState.DevAspectStates) + { + var flexEntry = new FlexDevAspectStateEntry + { + Key = entry.KeyCase == DevState.Types.DevAspect_DevAspectState_Entry.KeyOneofCase.Key ? (int)entry.Key : null, + }; + if (entry.ValueCase == DevState.Types.DevAspect_DevAspectState_Entry.ValueOneofCase.Value && entry.Value != null) + { + flexEntry.Value = ToFlexDevAspectState(entry.Value); + } + flex.DevState.DevAspectStates.Add(flexEntry); + } + } + + return flex; + } + + private static FlexDevAspectState ToFlexDevAspectState(DevAspectState s) + { + var flex = new FlexDevAspectState + { + Unid = s.UnidCase == DevAspectState.UnidOneofCase.Unid ? s.Unid : null, + DevAspect = (int)s.DevAspect, + HwTime = DateTimeDataToIso(s.HwTime), + DbTime = DateTimeDataToIso(s.DbTime), + }; + + if (s.CommStateCase == DevAspectState.CommStateOneofCase.CommState) + flex.CommState = (int)s.CommState; + if (s.CommStateStaleCase == DevAspectState.CommStateStaleOneofCase.CommStateStale) + flex.CommStateStale = s.CommStateStale; + if (s.ActivityStateCase == DevAspectState.ActivityStateOneofCase.ActivityState) + flex.ActivityState = (int)s.ActivityState; + if (s.ActivityStateStaleCase == DevAspectState.ActivityStateStaleOneofCase.ActivityStateStale) + flex.ActivityStateStale = s.ActivityStateStale; + if (s.DoorMode != null) + flex.DoorMode = ToFlexDoorMode(s.DoorMode); + if (s.DoorModeStaleCase == DevAspectState.DoorModeStaleOneofCase.DoorModeStale) + flex.DoorModeStale = s.DoorModeStale; + if (s.ExternalStateCase == DevAspectState.ExternalStateOneofCase.ExternalState) + flex.ExternalState = s.ExternalState; + if (s.ExternalStateStaleCase == DevAspectState.ExternalStateStaleOneofCase.ExternalStateStale) + flex.ExternalStateStale = s.ExternalStateStale; + + return flex; + } + // --- EncryptionKey --- public static FlexEncryptionKey ToFlex(EncryptionKey proto) diff --git a/src/Aporta.Core/Services/InputService.cs b/src/Aporta.Core/Services/InputService.cs index 4204dd2..eabaa5c 100644 --- a/src/Aporta.Core/Services/InputService.cs +++ b/src/Aporta.Core/Services/InputService.cs @@ -18,12 +18,14 @@ public class InputService private readonly Z9DevRepository _z9DevRepository; private readonly IHubContext _hubContext; private readonly ExtensionService _extensionService; + private readonly DevStateService _devStateService; public InputService(IDataAccess dataAccess, IHubContext hubContext, - ExtensionService extensionService) + ExtensionService extensionService, DevStateService devStateService) { _hubContext = hubContext; _extensionService = extensionService; + _devStateService = devStateService; _z9DevRepository = new Z9DevRepository(dataAccess); _extensionService.StateChanged += ExtensionServiceOnStateChanged; @@ -39,6 +41,9 @@ private async void ExtensionServiceOnStateChanged(object sender, StateChangedEve { await _hubContext.Clients.All.SendAsync(Methods.InputStateChanged, dev.Unid, eventArgs.State); + + _devStateService.UpdateAspect(dev.Unid, DevAspect.Primary, + s => s.ActivityState = eventArgs.State ? ActivityState.Active : ActivityState.Inactive); } } catch diff --git a/src/Aporta.Core/Services/OutputService.cs b/src/Aporta.Core/Services/OutputService.cs index f131a27..deb653a 100644 --- a/src/Aporta.Core/Services/OutputService.cs +++ b/src/Aporta.Core/Services/OutputService.cs @@ -18,12 +18,14 @@ public class OutputService private readonly Z9DevRepository _z9DevRepository; private readonly IHubContext _hubContext; private readonly ExtensionService _extensionService; + private readonly DevStateService _devStateService; public OutputService(IDataAccess dataAccess, IHubContext hubContext, - ExtensionService extensionService) + ExtensionService extensionService, DevStateService devStateService) { _hubContext = hubContext; _extensionService = extensionService; + _devStateService = devStateService; _z9DevRepository = new Z9DevRepository(dataAccess); _extensionService.StateChanged += ExtensionServiceOnOutputStateChanged; @@ -38,6 +40,9 @@ private async void ExtensionServiceOnOutputStateChanged(object sender, StateChan if (dev != null && dev.DevType == DevType.Actuator) { await _hubContext.Clients.All.SendAsync(Methods.OutputStateChanged, dev.Unid, eventArgs.State); + + _devStateService.UpdateAspect(dev.Unid, DevAspect.Primary, + s => s.ActivityState = eventArgs.State ? ActivityState.Active : ActivityState.Inactive); } } catch @@ -101,6 +106,9 @@ public async Task SetState(int outputId, bool state) await _extensionService.GetControlPoint(extensionId.Value, dev.ExternalId).SetState(state); await _hubContext.Clients.All.SendAsync(Methods.OutputStateChanged, dev.Unid, state); + + _devStateService.UpdateAspect(dev.Unid, DevAspect.Primary, + s => s.ActivityState = state ? ActivityState.Active : ActivityState.Inactive); } public async Task GetState(int outputId) diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 6981b6e..e029597 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -86,6 +86,9 @@ public class OsdpReaderConfig public int? ExtendedHeldTimeMs { get; set; } public DoorMode DefaultDoorMode { get; set; } } + private readonly DevStateService _devStateService; + private volatile bool _continuousDevStateRecord; + private Thread _thread; private volatile bool _stopping; private TcpClient _client; @@ -103,9 +106,11 @@ public class OsdpReaderConfig public Z9OpenCommunityProtocolService( ILogger logger, - IDataAccess dataAccess) + IDataAccess dataAccess, + DevStateService devStateService) { _logger = logger; + _devStateService = devStateService; _dataFormatRepository = new DataFormatRepository(dataAccess); _dataLayoutRepository = new DataLayoutRepository(dataAccess); _credTemplateRepository = new CredTemplateRepository(dataAccess); @@ -117,6 +122,8 @@ public Z9OpenCommunityProtocolService( _z9CredRepository = new Z9CredRepository(dataAccess); _z9EvtRepository = new Z9EvtRepository(dataAccess); _z9DevRepository = new Z9DevRepository(dataAccess); + + _devStateService.DevAspectStateChanged += OnDevAspectStateChanged; } public void Start(string host, int port, string id = null) @@ -219,6 +226,7 @@ private void HandleMessage(SpCoreMessage message) IsIdentified = true; _logger.LogInformation("Z9/Open Community host identified"); // Don't re-send - we already sent ours as the initiating side + SendAllDevStateRecords(); break; case SpCoreMessage.Types.Type.DbChange: @@ -243,6 +251,10 @@ private void HandleMessage(SpCoreMessage message) case SpCoreMessage.Types.Type.EvtControl: break; + case SpCoreMessage.Types.Type.DevStateRecordControl: + HandleDevStateRecordControl(message.DevStateRecordControl); + break; + default: _logger.LogInformation("Ignoring unhandled message type {Type}", message.Type); break; @@ -1389,4 +1401,50 @@ private void WriteMessage(SpCoreMessage message) _mos?.Write(message); } } + + private void HandleDevStateRecordControl(DevStateRecordControl control) + { + if (control == null) return; + + var flowControl = control.DevStateRecordFlowControl; + _logger.LogInformation("DevStateRecordControl: {FlowControl}", flowControl); + + switch (flowControl) + { + case DevStateRecordFlowControl.SendOneBatch: + SendAllDevStateRecords(); + break; + case DevStateRecordFlowControl.StartContinuous: + _continuousDevStateRecord = true; + SendAllDevStateRecords(); + break; + case DevStateRecordFlowControl.StopContinuous: + _continuousDevStateRecord = false; + break; + } + } + + private void SendAllDevStateRecords() + { + var records = _devStateService.GetAllDevStateRecords(); + if (records.Count == 0) return; + + var message = new SpCoreMessage { Type = SpCoreMessage.Types.Type.DevStateRecord }; + message.DevStateRecord.AddRange(records); + + _logger.LogInformation("Sending {Count} DevStateRecords", records.Count); + WriteMessage(message); + } + + private void OnDevAspectStateChanged(object sender, DevAspectStateChangedEventArgs e) + { + if (!_continuousDevStateRecord || !IsConnected) return; + + var record = _devStateService.GetDevStateRecord(e.DevUnid); + if (record == null) return; + + var message = new SpCoreMessage { Type = SpCoreMessage.Types.Type.DevStateRecord }; + message.DevStateRecord.Add(record); + WriteMessage(message); + } } diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index 562457c..cf5f9f8 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Aporta.Shared/Models/Flex/FlexDevStateRecord.cs b/src/Aporta.Shared/Models/Flex/FlexDevStateRecord.cs new file mode 100644 index 0000000..b7ea33f --- /dev/null +++ b/src/Aporta.Shared/Models/Flex/FlexDevStateRecord.cs @@ -0,0 +1,70 @@ +using System.Collections.Generic; +using System.Text.Json.Serialization; + +namespace Aporta.Shared.Models.Flex; + +public class FlexDevStateRecord +{ + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("dev")] + public FlexObjRef Dev { get; set; } + + [JsonPropertyName("devState")] + public FlexDevState DevState { get; set; } +} + +public class FlexDevState +{ + [JsonPropertyName("devAspectStates")] + public List DevAspectStates { get; set; } = new(); +} + +public class FlexDevAspectStateEntry +{ + [JsonPropertyName("key")] + public int? Key { get; set; } + + [JsonPropertyName("value")] + public FlexDevAspectState Value { get; set; } +} + +public class FlexDevAspectState +{ + [JsonPropertyName("unid")] + public int? Unid { get; set; } + + [JsonPropertyName("devAspect")] + public int? DevAspect { get; set; } + + [JsonPropertyName("hwTime")] + public string HwTime { get; set; } + + [JsonPropertyName("dbTime")] + public string DbTime { get; set; } + + [JsonPropertyName("commState")] + public int? CommState { get; set; } + + [JsonPropertyName("commStateStale")] + public bool? CommStateStale { get; set; } + + [JsonPropertyName("activityState")] + public int? ActivityState { get; set; } + + [JsonPropertyName("activityStateStale")] + public bool? ActivityStateStale { get; set; } + + [JsonPropertyName("doorMode")] + public FlexDoorMode DoorMode { get; set; } + + [JsonPropertyName("doorModeStale")] + public bool? DoorModeStale { get; set; } + + [JsonPropertyName("externalState")] + public string ExternalState { get; set; } + + [JsonPropertyName("externalStateStale")] + public bool? ExternalStateStale { get; set; } +} diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 0221fa6..62a99e6 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Aporta/Controllers/Flex/FlexDevStateRecordController.cs b/src/Aporta/Controllers/Flex/FlexDevStateRecordController.cs new file mode 100644 index 0000000..bc8bba9 --- /dev/null +++ b/src/Aporta/Controllers/Flex/FlexDevStateRecordController.cs @@ -0,0 +1,33 @@ +using System.Linq; +using Aporta.Shared.Models.Flex; +using Aporta.Core.Services; +using Microsoft.AspNetCore.Mvc; + +namespace Aporta.Controllers.Flex; + +[ApiController] +[Route("flex/devStateRecord")] +public class FlexDevStateRecordController : ControllerBase +{ + private readonly DevStateService _devStateService; + + public FlexDevStateRecordController(DevStateService devStateService) + { + _devStateService = devStateService; + } + + [HttpGet("list")] + public IActionResult List([FromQuery] int offset = 0, [FromQuery] int max = 50) + { + var all = _devStateService.GetAllDevStateRecords(); + var paged = all.Skip(offset).Take(max).Select(FlexMapper.ToFlex).ToList(); + + return Ok(new FlexListResponse + { + Offset = offset, + Max = max, + Count = all.Count, + InstanceList = paged, + }); + } +} diff --git a/src/Aporta/Startup.cs b/src/Aporta/Startup.cs index 9fdda21..b0ad188 100644 --- a/src/Aporta/Startup.cs +++ b/src/Aporta/Startup.cs @@ -50,6 +50,7 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSignalR(); diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 3a4305c..e8a681f 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -33,6 +33,7 @@ public class StartupWorker : BackgroundService private readonly ExtensionService _extensionService; private readonly AccessService _accessService; private readonly Z9OpenCommunityProtocolService _z9OpenCommunityProtocolService; + private readonly DevStateService _devStateService; private readonly Z9DevRepository _z9DevRepository; private readonly HashSet _configuredOsdpBuses = new(); private readonly Dictionary _doorStrikeActive = new(); @@ -46,6 +47,7 @@ public StartupWorker(IDataAccess dataAccess, ExtensionService extensionService, AccessService accessService, Z9OpenCommunityProtocolService z9OpenCommunityProtocolService, + DevStateService devStateService, IConfiguration configuration, ILogger logger, IHostApplicationLifetime applicationLifetime) { @@ -53,6 +55,7 @@ public StartupWorker(IDataAccess dataAccess, _extensionService = extensionService; _accessService = accessService; _z9OpenCommunityProtocolService = z9OpenCommunityProtocolService; + _devStateService = devStateService; _configuration = configuration; _logger = logger; _applicationLifetime = applicationLifetime; @@ -458,6 +461,9 @@ private void OnOnlineStatusChanged(object sender, OnlineStatusChangedEventArgs e } _z9OpenCommunityProtocolService.SendCredReaderOnlineEvent(config, e.IsOnline); + + _devStateService.UpdateAspect(config.Unid, DevAspect.Primary, + s => s.CommState = e.IsOnline ? CommState.Online : CommState.Offline); } /// @@ -752,6 +758,9 @@ private async Task ApplyDoorMode(int doorUnid, DoorMode doorMode, Z9OpenCommunit _logger.LogInformation("Door unid={DoorUnid} mode changed to {Mode}", doorUnid, effectiveMode); + _devStateService.UpdateAspect(doorUnid, DevAspect.Primary, + s => s.DoorMode = doorMode.Clone()); + // Actuate strike based on mode if (config.StrikeOutputNumber != null) { @@ -859,7 +868,11 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) if (dev.DevType == DevType.Actuator && dev.DevUseCase == Dev.DevUseOneofCase.DevUse && dev.DevUse == DevUse.ActuatorDoorStrike) { if (doorUnid > 0) + { _doorStrikeActive[doorUnid] = state; + _devStateService.UpdateAspect(doorUnid, DevAspect.DoorUnlocked, + s => s.ActivityState = state ? ActivityState.Active : ActivityState.Inactive); + } var evtCode = state ? EvtCode.DoorUnlocked : EvtCode.DoorLocked; var config2 = _z9OpenCommunityProtocolService.GetConfigForEndpoint(driverEndpointId); if (config2 != null) @@ -877,6 +890,8 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) if (!state) // Door opened { _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorOpened); + _devStateService.UpdateAspect(doorUnid, DevAspect.DoorOpen, + s => s.ActivityState = ActivityState.Active); _doorStrikeActive.TryGetValue(doorUnid, out var strikeActive); if (!strikeActive) @@ -884,6 +899,8 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) _logger.LogWarning("Door forced open: door unid={DoorUnid}", doorUnid); _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorForced); _doorForced[doorUnid] = true; + _devStateService.UpdateAspect(doorUnid, DevAspect.DoorForced, + s => s.ActivityState = ActivityState.Active); } StartDoorHeldTimer(doorUnid, dev.Name, config2); @@ -893,12 +910,16 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) CancelDoorHeldTimer(doorUnid); _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorClosed); + _devStateService.UpdateAspect(doorUnid, DevAspect.DoorOpen, + s => s.ActivityState = ActivityState.Inactive); if (_doorForced.TryGetValue(doorUnid, out var wasForced) && wasForced) { _logger.LogInformation("Door forced cleared: door unid={DoorUnid}", doorUnid); _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorNotForced); _doorForced[doorUnid] = false; + _devStateService.UpdateAspect(doorUnid, DevAspect.DoorForced, + s => s.ActivityState = ActivityState.Inactive); } if (_doorHeld.TryGetValue(doorUnid, out var wasHeld) && wasHeld) @@ -906,6 +927,8 @@ private async Task HandleStateChanged(string driverEndpointId, bool state) _logger.LogInformation("Door held cleared: door unid={DoorUnid}", doorUnid); _z9OpenCommunityProtocolService.SendDoorStateEvent(config2, EvtCode.DoorNotHeld); _doorHeld[doorUnid] = false; + _devStateService.UpdateAspect(doorUnid, DevAspect.DoorHeld, + s => s.ActivityState = ActivityState.Inactive); } } return; @@ -996,6 +1019,8 @@ private void StartDoorHeldTimer(int doorId, string doorName, Z9OpenCommunityProt doorName, heldTimeMs, useExtended); _doorHeld[doorId] = true; _z9OpenCommunityProtocolService.SendDoorStateEvent(config, EvtCode.DoorHeld); + _devStateService.UpdateAspect(doorId, DevAspect.DoorHeld, + s => s.ActivityState = ActivityState.Active); } catch (TaskCanceledException) { diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 9141e65..9579cd0 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Core.Tests/Services/InputServiceTests.cs b/test/Aporta.Core.Tests/Services/InputServiceTests.cs index 8a6cb2d..7562989 100644 --- a/test/Aporta.Core.Tests/Services/InputServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/InputServiceTests.cs @@ -76,7 +76,7 @@ public async Task GetState() // Arrange var inputService = new InputService(_dataAccess, new UnitTestingSupportForIHubContext().IHubContextMock.Object, - _extensionService); + _extensionService, new DevStateService()); var available = (await inputService.AvailableMonitorPoints()).ToArray(); Assert.That(available.Length, Is.EqualTo(2), "Expected 2 available sensor endpoints"); @@ -107,7 +107,7 @@ public async Task ReceiveStateChange() { // Arrange var hubContext = new UnitTestingSupportForIHubContext(); - var inputService = new InputService(_dataAccess, hubContext.IHubContextMock.Object, _extensionService); + var inputService = new InputService(_dataAccess, hubContext.IHubContextMock.Object, _extensionService, new DevStateService()); var available = (await inputService.AvailableMonitorPoints()).ToArray(); Assert.That(available.Length, Is.EqualTo(2), "Expected 2 available sensor endpoints"); diff --git a/test/Aporta.Core.Tests/Services/OutputServiceTests.cs b/test/Aporta.Core.Tests/Services/OutputServiceTests.cs index 204582d..5e83d25 100644 --- a/test/Aporta.Core.Tests/Services/OutputServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/OutputServiceTests.cs @@ -70,7 +70,7 @@ public async Task SetState() // Arrange var outputService = new OutputService(_dataAccess, new UnitTestingSupportForIHubContext().IHubContextMock.Object, - _extensionService); + _extensionService, new DevStateService()); var available = (await outputService.AvailableControlPoints()).ToArray(); Assert.That(available.Length, Is.EqualTo(2), "Expected 2 available actuator endpoints"); diff --git a/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs index cc15e18..996330e 100644 --- a/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/Z9OpenCommunityProtocolServiceTests.cs @@ -35,7 +35,8 @@ public async Task Setup() _z9OpenCommunityProtocolService = new Z9OpenCommunityProtocolService( NullLogger.Instance, - _dataAccess); + _dataAccess, + new DevStateService()); _z9OpenCommunityProtocolService.Start("127.0.0.1", hostPort); } diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index 4bb8f0b..eb2b3fc 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,7 +10,7 @@ - + From cc29907540bd62dc90139b0c7a9e285ba0ce6b78 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Mon, 9 Feb 2026 12:33:15 -0500 Subject: [PATCH 59/86] Remove Events/Credentials/People legacy code, migrate Credentials UI to Flex API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Events cleanup: Delete EventsController, EventService, and EventServiceTests — Monitoring.razor already uses FlexApi exclusively. Move EventType enum to EventData.cs and delete Event.cs. Credentials migration: Enhance FlexCredController with Save override (auto-assign unid, ensure default CredTemplate, SignalR notify), Delete override, and Enroll endpoint. Add FlexPostAsync/SaveCredAsync/DeleteCredAsync/EnrollCredAsync to FlexApiService. Rewrite Credentials.razor to use Flex API exclusively. Delete CredentialsController, PeopleController, CredentialService, PeopleService. Remove service registrations from Startup.cs and paths from Paths.cs. Co-Authored-By: Claude Opus 4.6 --- .../Repositories/Z9CredRepository.cs | 2 +- src/Aporta.Core/Services/CredentialService.cs | 70 -------- src/Aporta.Core/Services/EventService.cs | 53 ------ src/Aporta.Core/Services/PeopleService.cs | 99 ----------- src/Aporta.Shared/Calls/FlexApiService.cs | 42 +++++ src/Aporta.Shared/Calls/Paths.cs | 3 - src/Aporta.Shared/Models/Event.cs | 25 --- src/Aporta.Shared/Models/EventData.cs | 9 + .../Pages/configuration/Credentials.razor | 77 +++++---- .../Controllers/CredentialsController.cs | 50 ------ src/Aporta/Controllers/EventsController.cs | 32 ---- .../Controllers/Flex/FlexCredController.cs | 86 +++++++++- src/Aporta/Controllers/PeopleController.cs | 44 ----- src/Aporta/Startup.cs | 3 - .../Services/EventServiceTests.cs | 157 ------------------ 15 files changed, 175 insertions(+), 577 deletions(-) delete mode 100644 src/Aporta.Core/Services/CredentialService.cs delete mode 100644 src/Aporta.Core/Services/EventService.cs delete mode 100644 src/Aporta.Core/Services/PeopleService.cs delete mode 100644 src/Aporta.Shared/Models/Event.cs delete mode 100644 src/Aporta/Controllers/CredentialsController.cs delete mode 100644 src/Aporta/Controllers/EventsController.cs delete mode 100644 src/Aporta/Controllers/PeopleController.cs delete mode 100644 test/Aporta.Core.Tests/Services/EventServiceTests.cs diff --git a/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs b/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs index 9583f1b..b3a986f 100644 --- a/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs @@ -51,7 +51,7 @@ public static string ExtractCredNum(Cred cred) /// /// Returns the next available ID (MAX(id) + 1, or 1 if empty). - /// Used by PeopleService for person creation. + /// Used by FlexCredController for person creation. /// public async Task NextId() { diff --git a/src/Aporta.Core/Services/CredentialService.cs b/src/Aporta.Core/Services/CredentialService.cs deleted file mode 100644 index 42d58c1..0000000 --- a/src/Aporta.Core/Services/CredentialService.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Aporta.Core.DataAccess; -using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Hubs; -using Aporta.Shared.Messaging; -using Aporta.Shared.Models; -using Microsoft.AspNetCore.SignalR; - -namespace Aporta.Core.Services; - -public class CredentialService -{ - private readonly CredentialRepository _credentialRepository; - private readonly Z9CredRepository _z9CredRepository; - private readonly IHubContext _hubContext; - - public CredentialService(IDataAccess dataAccess, IHubContext hubContext) - { - _hubContext = hubContext; - _credentialRepository = new CredentialRepository(dataAccess); - _z9CredRepository = new Z9CredRepository(dataAccess); - } - - public async Task> GetAll() - { - return await _credentialRepository.GetAll(); - } - - public async Task Get(int credentialId) - { - return await _credentialRepository.Get(credentialId); - } - - public async Task> GetUnassigned() - { - return await _credentialRepository.Unassigned(); - } - - public async Task Enroll(int credentialId, int personId) - { - // Get Z9 Creds for both - var swipeZ9Cred = await _z9CredRepository.Get(credentialId); - var personZ9Cred = await _z9CredRepository.Get(personId); - - if (swipeZ9Cred == null || personZ9Cred == null) return; - - // Transfer CardPin from swipe to person - if (swipeZ9Cred.CardPin != null) - { - personZ9Cred.CardPin = swipeZ9Cred.CardPin; - } - - // Merge PrivBindings - personZ9Cred.PrivBindings.Add(swipeZ9Cred.PrivBindings); - - // Delete swipe z9_cred first (frees the unique cred_num) - await _z9CredRepository.Delete(credentialId); - - // Upsert person z9_cred (sets cred_num from transferred CardPin) - await _z9CredRepository.Upsert(personZ9Cred); - - await _hubContext.Clients.All.SendAsync(Methods.PersonUpdated, personId); - } - - public async Task> GetAssigned() - { - return await _credentialRepository.Assigned(); - } -} diff --git a/src/Aporta.Core/Services/EventService.cs b/src/Aporta.Core/Services/EventService.cs deleted file mode 100644 index 42d92e0..0000000 --- a/src/Aporta.Core/Services/EventService.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Linq; -using System.Threading.Tasks; - -using Aporta.Core.DataAccess; -using Aporta.Core.DataAccess.Repositories; -using Aporta.Shared.Models; -using Z9.Spcore.Proto; - -namespace Aporta.Core.Services; - -public class EventService -{ - private readonly Z9EvtRepository _z9EvtRepository; - - public EventService(IDataAccess dataAccess) - { - _z9EvtRepository = new Z9EvtRepository(dataAccess); - } - - public async Task Get(int eventId) - { - var evt = await _z9EvtRepository.Get(eventId); - return evt != null ? EvtToEvent(evt) : null; - } - - public async Task> GetAll(int pageNumber, int pageSize) - { - var page = await _z9EvtRepository.GetAll(pageNumber, pageSize); - return new PaginatedItemsDto - { - Items = page.Items.Select(EvtToEvent), - PageNumber = page.PageNumber, - PageSize = page.PageSize, - TotalItems = page.TotalItems - }; - } - - private static Event EvtToEvent(Evt evt) - { - var (eventType, _) = EventReasonMapping.ToEventTypeAndReason( - evt.EvtCode, - evt.EvtSubCodeCase == Evt.EvtSubCodeOneofCase.EvtSubCode ? evt.EvtSubCode : 0); - - return new Event - { - Id = (int)evt.Unid, - Timestamp = DateTimeOffset.FromUnixTimeMilliseconds(evt.DbTime.Millis).UtcDateTime, - Type = eventType, - Data = evt.Data - }; - } -} diff --git a/src/Aporta.Core/Services/PeopleService.cs b/src/Aporta.Core/Services/PeopleService.cs deleted file mode 100644 index 759854d..0000000 --- a/src/Aporta.Core/Services/PeopleService.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Aporta.Core.DataAccess; -using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Hubs; -using Aporta.Shared.Messaging; -using Aporta.Shared.Models; -using Microsoft.AspNetCore.SignalR; -using Z9.Protobuf; -using Z9.Spcore.Proto; - -namespace Aporta.Core.Services; - -public class PeopleService -{ - private readonly CredentialRepository _credentialRepository; - private readonly Z9CredRepository _z9CredRepository; - private readonly CredTemplateRepository _credTemplateRepository; - private readonly IHubContext _hubContext; - - public PeopleService(IDataAccess dataAccess, IHubContext hubContext) - { - _hubContext = hubContext; - _credentialRepository = new CredentialRepository(dataAccess); - _z9CredRepository = new Z9CredRepository(dataAccess); - _credTemplateRepository = new CredTemplateRepository(dataAccess); - } - - - public async Task> GetAll() - { - return await _credentialRepository.Named(); - } - - public async Task Get(int personId) - { - var z9Cred = await _z9CredRepository.Get(personId); - if (z9Cred == null) return null; - - var enabled = z9Cred.EnabledCase == Cred.EnabledOneofCase.Enabled ? z9Cred.Enabled : true; - return CredentialRepository.ParsePersonFromName(z9Cred.Name, personId, enabled); - } - - public async Task Insert(Person person) - { - // Get next available ID - var credentialId = await _z9CredRepository.NextId(); - - // Ensure default cred template exists - await EnsureDefaultCredTemplate(); - - // Create Z9 Cred with name="Last, First" and enabled=true - var name = !string.IsNullOrWhiteSpace(person.LastName) - ? $"{person.LastName}, {person.FirstName}" - : person.FirstName; - - var cred = new Cred - { - Unid = credentialId, - Name = name, - Enabled = person.Enabled, - CredTemplateUnid = 1 - }; - SpCoreProtoUtil.InitRequired(cred); - await _z9CredRepository.Upsert(cred); - - person.Id = credentialId; - await _hubContext.Clients.All.SendAsync(Methods.PersonInserted, person.Id); - } - - public async Task Delete(int personId) - { - await _z9CredRepository.Delete(personId); - - await _hubContext.Clients.All.SendAsync(Methods.PersonDeleted, personId); - } - - private async Task EnsureDefaultCredTemplate() - { - var existing = await _credTemplateRepository.Get(1); - if (existing != null) return; - - var credTemplate = new CredTemplate - { - Unid = 1, - Name = "Card (Auto)", - Priority = 0, - CardPinTemplate = new CardPinTemplate - { - CredComponentPresence = CredComponentPresence.Required, - CredNumPresence = CredComponentPresence.Required, - PinPresence = CredComponentPresence.Absent, - AnyDataLayout = true - } - }; - SpCoreProtoUtil.InitRequired(credTemplate); - await _credTemplateRepository.Upsert(credTemplate); - } -} diff --git a/src/Aporta.Shared/Calls/FlexApiService.cs b/src/Aporta.Shared/Calls/FlexApiService.cs index 1e57b4e..532798a 100644 --- a/src/Aporta.Shared/Calls/FlexApiService.cs +++ b/src/Aporta.Shared/Calls/FlexApiService.cs @@ -49,6 +49,21 @@ private async Task EnsureAuthenticated() _sessionToken = result?.SessionToken; } + public async Task> SaveCredAsync(FlexCred cred) + { + return await FlexPostAsync>("flex/cred/save", cred); + } + + public async Task DeleteCredAsync(int unid) + { + return await FlexPostAsync($"flex/cred/delete/{unid}"); + } + + public async Task EnrollCredAsync(int credentialId, int personId) + { + return await FlexPostAsync($"flex/cred/{credentialId}/enroll/{personId}"); + } + private async Task FlexGetAsync(string url) { await EnsureAuthenticated(); @@ -71,4 +86,31 @@ private async Task FlexGetAsync(string url) response.EnsureSuccessStatusCode(); return await response.Content.ReadFromJsonAsync(); } + + private async Task FlexPostAsync(string url, object body = null) + { + await EnsureAuthenticated(); + + var request = new HttpRequestMessage(HttpMethod.Post, url); + request.Headers.Add("sessionToken", _sessionToken); + if (body != null) + request.Content = JsonContent.Create(body); + + var response = await _httpClient.SendAsync(request); + + if (response.StatusCode == HttpStatusCode.Unauthorized) + { + _sessionToken = null; + await EnsureAuthenticated(); + + request = new HttpRequestMessage(HttpMethod.Post, url); + request.Headers.Add("sessionToken", _sessionToken); + if (body != null) + request.Content = JsonContent.Create(body); + response = await _httpClient.SendAsync(request); + } + + response.EnsureSuccessStatusCode(); + return await response.Content.ReadFromJsonAsync(); + } } diff --git a/src/Aporta.Shared/Calls/Paths.cs b/src/Aporta.Shared/Calls/Paths.cs index 1c0910c..3896b09 100644 --- a/src/Aporta.Shared/Calls/Paths.cs +++ b/src/Aporta.Shared/Calls/Paths.cs @@ -5,9 +5,6 @@ public static class Paths public const string Extensions = "api/Extensions"; public const string ExtensionPerformAction = "api/Extensions/{0}/action/{1}"; public const string Doors = "api/Doors"; - public const string Events = "api/Events"; public const string Outputs = "api/Outputs"; public const string Inputs = "api/Inputs"; - public const string People = "/api/People"; - public const string Credentials = "/api/Credentials"; } \ No newline at end of file diff --git a/src/Aporta.Shared/Models/Event.cs b/src/Aporta.Shared/Models/Event.cs deleted file mode 100644 index 2ca505c..0000000 --- a/src/Aporta.Shared/Models/Event.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; - -namespace Aporta.Shared.Models; - -public class Event -{ - public int Id { get; set; } - - public int EndpointId { get; set; } - - public DateTime Timestamp { get; set; } = DateTime.UtcNow; - - public EventType Type { get; set; } - - public string Data { get; set; } = ""; -} - -public enum EventType -{ - [Description("Access Granted")] - AccessGranted, - - [Description("Access Denied")] - AccessDenied -} \ No newline at end of file diff --git a/src/Aporta.Shared/Models/EventData.cs b/src/Aporta.Shared/Models/EventData.cs index 36f3577..82e6b47 100644 --- a/src/Aporta.Shared/Models/EventData.cs +++ b/src/Aporta.Shared/Models/EventData.cs @@ -14,6 +14,15 @@ public class EventData public string? CardNumber { get; init; } } +public enum EventType +{ + [Description("Access Granted")] + AccessGranted, + + [Description("Access Denied")] + AccessDenied +} + public enum EventReason { [Description("None")] diff --git a/src/Aporta.WebClient/Pages/configuration/Credentials.razor b/src/Aporta.WebClient/Pages/configuration/Credentials.razor index b0d7eac..8af69c3 100644 --- a/src/Aporta.WebClient/Pages/configuration/Credentials.razor +++ b/src/Aporta.WebClient/Pages/configuration/Credentials.razor @@ -1,16 +1,13 @@ @page "/configuration/credentials" -@using System.Text -@using System.Text.Json +@using System.Linq @using Microsoft.AspNetCore.SignalR.Client @using Aporta.Shared.Calls @using Aporta.Shared.Messaging -@using Aporta.Shared.Models @using Aporta.Shared.Models.Flex @using Aporta.WebClient.Messaging -@inject HttpClient Http @inject FlexApiService FlexApi @inject NavigationManager NavigationManager @@ -117,7 +114,7 @@ else First Name - + Please enter the person's first name @@ -131,7 +128,7 @@ else Last Name - + Please enter the person's last name @@ -144,7 +141,7 @@ else Enabled - + @@ -172,7 +169,7 @@ else @@ -272,12 +269,14 @@ else IMessageService MessageService { get; set; } private FlexListResponse _credentials; - private Person _addPerson; + private string _addFirstName; + private string _addLastName; + private bool _addEnabled = true; private FlexCred _enrollCred; private FlexCred _detailsCred; private int _enrollCredentialId; - private readonly List _availableCredentialsForEnrollment = new(); + private List _availableCredentialsForEnrollment = new(); private HubConnection _hubConnection; @@ -296,8 +295,6 @@ else { _credentials = await FlexApi.GetCredListAsync(0, 1000); - _addPerson = new Person{Enabled = true}; - _hubConnection = new HubConnectionBuilder() .WithUrl(NavigationManager.ToAbsoluteUri(Locations.DataChangeNotification)) .WithAutomaticReconnect(new SignalRRetryPolicy()) @@ -329,19 +326,29 @@ else } await _addPersonModal.Hide(); - const string url = Paths.People; - var response = await Http.PutAsync(url, - new StringContent(JsonSerializer.Serialize(_addPerson), Encoding.UTF8, "application/json")); - if (response.IsSuccessStatusCode) + var cred = new FlexCred + { + Name = $"{_addLastName}, {_addFirstName}", + Enabled = _addEnabled + }; + + try { + await FlexApi.SaveCredAsync(cred); _snackbarMessage = "Successfully added person"; _snackbarColor = SnackbarColor.Success; } - else + catch { _snackbarMessage = "Unable to add person"; _snackbarColor = SnackbarColor.Danger; } + + _addFirstName = null; + _addLastName = null; + _addEnabled = true; + + await _snackbar.Show(); } private async Task RemovePerson(FlexCred cred) @@ -357,15 +364,13 @@ else return; } - string url = $"{Paths.People}/{cred.Unid}"; - var response = await Http.DeleteAsync(url); - - if (response.IsSuccessStatusCode) + try { + await FlexApi.DeleteCredAsync(cred.Unid.Value); _snackbarMessage = "Successfully removed person"; _snackbarColor = SnackbarColor.Success; } - else + catch { _snackbarMessage = "Unable to remove person"; _snackbarColor = SnackbarColor.Danger; @@ -382,11 +387,13 @@ else private async Task ShowEnroll(FlexCred cred) { _enrollCred = cred; - _availableCredentialsForEnrollment.Clear(); - string url = $"{Paths.Credentials}/unassigned"; - var unassignedCredentials = await Http.GetFromJsonAsync>(url); - if (unassignedCredentials.Count == 0) + var unassigned = _credentials.InstanceList + .Where(c => string.IsNullOrEmpty(c.Name) && !string.IsNullOrEmpty(c.CardPin?.CredNum)) + .OrderByDescending(c => c.Unid) + .ToList(); + + if (unassigned.Count == 0) { _snackbarMessage = "No unassigned credentials are available. Swipe an unassigned card at a reader."; _snackbarColor = SnackbarColor.Warning; @@ -394,14 +401,8 @@ else return; } - foreach (var credential in unassignedCredentials) - { - _availableCredentialsForEnrollment.Add(credential); - } - - _availableCredentialsForEnrollment.Sort((x, y) => y.Id.CompareTo(x.Id)); - - _enrollCredentialId = _availableCredentialsForEnrollment.First().Id; + _availableCredentialsForEnrollment = unassigned; + _enrollCredentialId = _availableCredentialsForEnrollment.First().Unid ?? 0; await _enrollModal.Show(); } @@ -410,15 +411,13 @@ else { await _enrollModal.Hide(); - string url = $"{Paths.Credentials}/{_enrollCredentialId}/enroll/{_enrollCred.Unid}"; - var response = await Http.PostAsync(url, new StringContent(string.Empty)); - - if (response.IsSuccessStatusCode) + try { + await FlexApi.EnrollCredAsync(_enrollCredentialId, _enrollCred.Unid.Value); _snackbarMessage = "Successfully enrolled person"; _snackbarColor = SnackbarColor.Success; } - else + catch { _snackbarMessage = "Unable to enroll person"; _snackbarColor = SnackbarColor.Danger; diff --git a/src/Aporta/Controllers/CredentialsController.cs b/src/Aporta/Controllers/CredentialsController.cs deleted file mode 100644 index 954957d..0000000 --- a/src/Aporta/Controllers/CredentialsController.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Aporta.Core.Services; -using Microsoft.AspNetCore.Mvc; - -using Aporta.Shared.Models; - -namespace Aporta.Controllers; - -[ApiController] -[Route("api/[controller]")] -public class CredentialsController -{ - private readonly CredentialService _credentialService; - - public CredentialsController(CredentialService credentialService) - { - _credentialService = credentialService; - } - - [HttpGet] - public async Task> Get() - { - return await _credentialService.GetAll(); - } - - [HttpGet("{credentialId:int}")] - public async Task Get(int credentialId) - { - return await _credentialService.Get(credentialId); - } - - [HttpGet("assigned")] - public async Task> GetAssigned() - { - return await _credentialService.GetAssigned(); - } - - [HttpGet("unassigned")] - public async Task> GetUnassigned() - { - return await _credentialService.GetUnassigned(); - } - - [HttpPost("{credentialId:int}/enroll/{personId:int}")] - public async Task Enroll(int credentialId, int personId) - { - await _credentialService.Enroll(credentialId, personId); - } -} \ No newline at end of file diff --git a/src/Aporta/Controllers/EventsController.cs b/src/Aporta/Controllers/EventsController.cs deleted file mode 100644 index 236119f..0000000 --- a/src/Aporta/Controllers/EventsController.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Threading.Tasks; - -using Microsoft.AspNetCore.Mvc; - -using Aporta.Shared.Models; -using Aporta.Core.Services; - -namespace Aporta.Controllers; - -[ApiController] -[Route("api/[controller]")] -public class EventsController -{ - private readonly EventService _eventService; - - public EventsController(EventService eventService) - { - _eventService = eventService; - } - - [HttpGet("{eventId:int}")] - public async Task Get(int eventId) - { - return await _eventService.Get(eventId); - } - - [HttpGet] - public async Task> GetPagination([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 10) - { - return await _eventService.GetAll(pageNumber, pageSize); - } -} \ No newline at end of file diff --git a/src/Aporta/Controllers/Flex/FlexCredController.cs b/src/Aporta/Controllers/Flex/FlexCredController.cs index 7607b4f..077a3a5 100644 --- a/src/Aporta/Controllers/Flex/FlexCredController.cs +++ b/src/Aporta/Controllers/Flex/FlexCredController.cs @@ -1,8 +1,13 @@ +using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Hubs; +using Aporta.Shared.Messaging; using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.SignalR; +using Z9.Protobuf; using Z9.Spcore.Proto; namespace Aporta.Controllers.Flex; @@ -12,10 +17,14 @@ namespace Aporta.Controllers.Flex; public class FlexCredController : FlexCrudControllerBase { private readonly Z9CredRepository _repository; + private readonly CredTemplateRepository _credTemplateRepository; + private readonly IHubContext _hubContext; - public FlexCredController(IDataAccess dataAccess) + public FlexCredController(IDataAccess dataAccess, IHubContext hubContext) { _repository = new Z9CredRepository(dataAccess); + _credTemplateRepository = new CredTemplateRepository(dataAccess); + _hubContext = hubContext; } protected override ProtoJsonRepository Repository => _repository; @@ -23,4 +32,79 @@ public FlexCredController(IDataAccess dataAccess) protected override Cred ToProto(FlexCred flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexCred flex) => flex.Unid ?? 0; protected override string GetUuidFromProto(Cred proto) => proto.Uuid; + + public override async Task Save([FromBody] FlexCred body) + { + if (body.Unid == null || body.Unid == 0) + body.Unid = await _repository.NextId(); + + if (!string.IsNullOrEmpty(body.Name)) + { + await EnsureDefaultCredTemplate(); + body.CredTemplate ??= new FlexObjRef { Unid = 1 }; + } + + var proto = ToProto(body); + SpCoreProtoUtil.InitRequired(proto); + await _repository.Upsert(proto); + + if (!string.IsNullOrEmpty(body.Name)) + await _hubContext.Clients.All.SendAsync(Methods.PersonInserted, body.Unid); + + return Ok(new FlexInstanceResponse { Instance = ToFlex(proto) }); + } + + public override async Task Delete(string id) + { + var result = await base.Delete(id); + + if (int.TryParse(id, out var unid)) + await _hubContext.Clients.All.SendAsync(Methods.PersonDeleted, unid); + + return result; + } + + [HttpPost("{credentialId:int}/enroll/{personId:int}")] + public async Task Enroll(int credentialId, int personId) + { + var swipeZ9Cred = await _repository.Get(credentialId); + var personZ9Cred = await _repository.Get(personId); + + if (swipeZ9Cred == null || personZ9Cred == null) + return NotFound(); + + if (swipeZ9Cred.CardPin != null) + personZ9Cred.CardPin = swipeZ9Cred.CardPin; + + personZ9Cred.PrivBindings.Add(swipeZ9Cred.PrivBindings); + + await _repository.Delete(credentialId); + await _repository.Upsert(personZ9Cred); + + await _hubContext.Clients.All.SendAsync(Methods.PersonUpdated, personId); + + return Ok(new FlexVoid()); + } + + private async Task EnsureDefaultCredTemplate() + { + var existing = await _credTemplateRepository.Get(1); + if (existing != null) return; + + var credTemplate = new CredTemplate + { + Unid = 1, + Name = "Card (Auto)", + Priority = 0, + CardPinTemplate = new CardPinTemplate + { + CredComponentPresence = CredComponentPresence.Required, + CredNumPresence = CredComponentPresence.Required, + PinPresence = CredComponentPresence.Absent, + AnyDataLayout = true + } + }; + SpCoreProtoUtil.InitRequired(credTemplate); + await _credTemplateRepository.Upsert(credTemplate); + } } diff --git a/src/Aporta/Controllers/PeopleController.cs b/src/Aporta/Controllers/PeopleController.cs deleted file mode 100644 index c49ad16..0000000 --- a/src/Aporta/Controllers/PeopleController.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Aporta.Core.Services; -using Microsoft.AspNetCore.Mvc; - -using Aporta.Shared.Models; - -namespace Aporta.Controllers; - -[ApiController] -[Route("api/[controller]")] -public class PeopleController -{ - private readonly PeopleService _peopleService; - - public PeopleController(PeopleService peopleService) - { - _peopleService = peopleService; - } - - [HttpGet] - public async Task> Get() - { - return await _peopleService.GetAll(); - } - - [HttpGet("{personId}")] - public async Task Get(int personId) - { - return await _peopleService.Get(personId); - } - - [HttpPut] - public async Task Put([FromBody]Person person) - { - await _peopleService.Insert(person); - } - - [HttpDelete("{personId:int}")] - public async Task Delete(int personId) - { - await _peopleService.Delete(personId); - } -} \ No newline at end of file diff --git a/src/Aporta/Startup.cs b/src/Aporta/Startup.cs index b0ad188..9f4dce3 100644 --- a/src/Aporta/Startup.cs +++ b/src/Aporta/Startup.cs @@ -41,14 +41,11 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/test/Aporta.Core.Tests/Services/EventServiceTests.cs b/test/Aporta.Core.Tests/Services/EventServiceTests.cs deleted file mode 100644 index 5c96136..0000000 --- a/test/Aporta.Core.Tests/Services/EventServiceTests.cs +++ /dev/null @@ -1,157 +0,0 @@ -using System; -using System.Data; -using System.Linq; -using System.Text.Json; -using System.Threading.Tasks; -using Aporta.Core.DataAccess; -using Aporta.Core.DataAccess.Repositories; -using Aporta.Core.Services; -using Aporta.Shared.Models; -using NUnit.Framework; -using Z9.Spcore.Proto; - -namespace Aporta.Core.Tests.Services; - -public class EventServiceTests -{ - private readonly IDataAccess _dataAccess = new SqLiteDataAccess(true); - private IDbConnection _persistConnection; - - [SetUp] - public async Task Setup() - { - _persistConnection = _dataAccess.CreateDbConnection(); - _persistConnection.Open(); - - await _dataAccess.UpdateSchema(); - } - - [TearDown] - public void TearDown() - { - _persistConnection?.Close(); - _persistConnection?.Dispose(); - } - - [Test] - public async Task Get_ReturnsCorrectEventDto() - { - // Arrange - var repository = new Z9EvtRepository(_dataAccess); - var service = new EventService(_dataAccess); - - var eventData = new EventData - { - EventReason = EventReason.None, - Endpoint = new Endpoint { Id = 1, Name = "Reader 1", DriverEndpointId = "ep1", ExtensionId = Guid.Empty } - }; - var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); - - var evt = new Evt - { - EvtCode = EvtCode.DoorAccessGranted, - HwTime = new DateTimeData { Millis = nowMillis }, - DbTime = new DateTimeData { Millis = nowMillis }, - Consumed = false, - Priority = 0, - Data = JsonSerializer.Serialize(eventData) - }; - - int id = await repository.Insert(evt); - - // Act - var result = await service.Get(id); - - // Assert - Assert.That(result, Is.Not.Null); - Assert.That(result.Id, Is.EqualTo(id)); - Assert.That(result.Type, Is.EqualTo(EventType.AccessGranted)); - Assert.That(result.Data, Is.Not.Null.And.Not.Empty); - - var roundTrippedData = JsonSerializer.Deserialize(result.Data); - Assert.That(roundTrippedData.EventReason, Is.EqualTo(EventReason.None)); - - // Verify timestamp is close to now - var expectedTime = DateTimeOffset.FromUnixTimeMilliseconds(nowMillis).UtcDateTime; - Assert.That(result.Timestamp, Is.EqualTo(expectedTime)); - } - - [Test] - public async Task Get_DeniedEvent_ReturnsCorrectType() - { - // Arrange - var repository = new Z9EvtRepository(_dataAccess); - var service = new EventService(_dataAccess); - - var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); - - var evt = new Evt - { - EvtCode = EvtCode.DoorAccessDenied, - EvtSubCode = EvtSubCode.AccessDeniedExpired, - HwTime = new DateTimeData { Millis = nowMillis }, - DbTime = new DateTimeData { Millis = nowMillis }, - Data = JsonSerializer.Serialize(new EventData - { - EventReason = EventReason.CredentialExpired, - Endpoint = new Endpoint { Id = 1, Name = "Reader 1", DriverEndpointId = "ep1", ExtensionId = Guid.Empty } - }) - }; - - int id = await repository.Insert(evt); - - // Act - var result = await service.Get(id); - - // Assert - Assert.That(result.Type, Is.EqualTo(EventType.AccessDenied)); - } - - [Test] - public async Task Get_NonExistentId_ReturnsNull() - { - // Arrange - var service = new EventService(_dataAccess); - - // Act - var result = await service.Get(999); - - // Assert - Assert.That(result, Is.Null); - } - - [Test] - public async Task GetAll_ReturnsPaginatedEvents() - { - // Arrange - var repository = new Z9EvtRepository(_dataAccess); - var service = new EventService(_dataAccess); - - for (int i = 0; i < 5; i++) - { - var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() + i; - await repository.Insert(new Evt - { - EvtCode = EvtCode.DoorAccessGranted, - HwTime = new DateTimeData { Millis = nowMillis }, - DbTime = new DateTimeData { Millis = nowMillis }, - Data = JsonSerializer.Serialize(new EventData - { - EventReason = EventReason.None, - Endpoint = new Endpoint { Id = 1, Name = "Reader 1", DriverEndpointId = "ep1", ExtensionId = Guid.Empty } - }) - }); - } - - // Act - var page = await service.GetAll(1, 3); - - // Assert - Assert.That(page.TotalItems, Is.EqualTo(5)); - Assert.That(page.PageNumber, Is.EqualTo(1)); - Assert.That(page.PageSize, Is.EqualTo(3)); - var items = page.Items.ToList(); - Assert.That(items, Has.Count.EqualTo(3)); - Assert.That(items.All(e => e.Type == EventType.AccessGranted), Is.True); - } -} From 4daa372c6ff161b7255e2110c0190e001b7cf0c8 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Mon, 9 Feb 2026 14:54:58 -0500 Subject: [PATCH 60/86] Migrate Sensors, Actuators, and Monitoring pages to Flex API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sensors.razor, Actuators.razor, and Monitoring.razor were hybrid — listing via Flex but create/delete/available/state via legacy REST controllers. Now all three pages use Flex API exclusively, continuing the pre-fork alignment started with the Credentials migration. - Rewrite FlexSensorController and FlexActuatorController with full endpoints: list (enabled-only filter), save/assign, delete, available pool, and state get/set - Add 9 FlexApiService client methods for sensor/actuator CRUD and state - Strip InputService/OutputService to event-handler-only singletons (retain hardware→SignalR state relay) - Delete InputsController, OutputsController, Input.cs, Output.cs - Update Doors.razor to use FlexApi for available actuators Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Services/InputService.cs | 83 -------- src/Aporta.Core/Services/OutputService.cs | 98 --------- src/Aporta.Shared/Calls/FlexApiService.cs | 59 ++++++ src/Aporta.Shared/Calls/Paths.cs | 2 - src/Aporta.Shared/Models/Input.cs | 10 - src/Aporta.Shared/Models/Output.cs | 10 - src/Aporta.WebClient/Pages/Monitoring.razor | 126 +++++------ .../Pages/configuration/Actuators.razor | 66 ++---- .../Pages/configuration/Doors.razor | 10 +- .../Pages/configuration/Sensors.razor | 66 ++---- .../Controllers/Flex/FlexDevController.cs | 200 +++++++++++++++++- src/Aporta/Controllers/InputsController.cs | 55 ----- src/Aporta/Controllers/OutputsController.cs | 63 ------ .../Services/InputServiceTests.cs | 58 ++--- .../Services/OutputServiceTests.cs | 31 +-- 15 files changed, 406 insertions(+), 531 deletions(-) delete mode 100644 src/Aporta.Shared/Models/Input.cs delete mode 100644 src/Aporta.Shared/Models/Output.cs delete mode 100644 src/Aporta/Controllers/InputsController.cs delete mode 100644 src/Aporta/Controllers/OutputsController.cs diff --git a/src/Aporta.Core/Services/InputService.cs b/src/Aporta.Core/Services/InputService.cs index eabaa5c..1305b21 100644 --- a/src/Aporta.Core/Services/InputService.cs +++ b/src/Aporta.Core/Services/InputService.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; using Aporta.Core.Hubs; using Aporta.Extensions.Hardware; using Aporta.Shared.Messaging; -using Aporta.Shared.Models; using Microsoft.AspNetCore.SignalR; using Z9.Spcore.Proto; @@ -51,82 +46,4 @@ await _hubContext.Clients.All.SendAsync(Methods.InputStateChanged, dev.Unid, // ignored } } - - public async Task> GetAll() - { - var devs = await _z9DevRepository.GetAllByDevType(DevType.Sensor); - // Only return user-assigned inputs (Enabled=true) - var assignedDevs = devs.Where(d => d.Enabled); - return assignedDevs.Select(DevToInput); - } - - public async Task Get(int inputId) - { - var dev = await _z9DevRepository.Get(inputId); - return dev == null ? null : DevToInput(dev); - } - - public async Task Insert(Input input) - { - // EndpointId is now a z9_dev unid (from the pool) - var poolDev = await _z9DevRepository.Get(input.EndpointId); - if (poolDev == null) - throw new InvalidOperationException($"Pool z9_dev {input.EndpointId} not found"); - - // Assign: update name, clear DevPlatform to remove from pool - poolDev.Name = input.Name; - poolDev.Enabled = true; - await _z9DevRepository.Upsert(poolDev); - - input.Id = poolDev.Unid; - - await _hubContext.Clients.All.SendAsync(Methods.InputInserted, input.Id); - } - - public async Task Delete(int id) - { - await _z9DevRepository.Delete(id); - - await _hubContext.Clients.All.SendAsync(Methods.InputDeleted, id); - } - - public async Task> AvailableMonitorPoints() - { - var availableSensors = await _z9DevRepository.GetAvailableByDevType(DevType.Sensor); - var tasks = availableSensors.Select(d => DevToEndpoint(d, EndpointType.Input)); - return await Task.WhenAll(tasks); - } - - public async Task GetState(int inputId) - { - var dev = await _z9DevRepository.Get(inputId); - var extensionId = await _z9DevRepository.GetExtensionId(dev); - if (!extensionId.HasValue) - return null; - - return await _extensionService.GetMonitorPoint(extensionId.Value, dev.ExternalId).GetState(); - } - - private static Input DevToInput(Dev dev) - { - return new Input - { - Id = dev.Unid, - Name = dev.Name, - EndpointId = dev.Unid, - }; - } - - private async Task DevToEndpoint(Dev dev, EndpointType type) - { - var extensionId = await _z9DevRepository.GetExtensionId(dev); - return new Endpoint - { - Id = dev.Unid, - Name = dev.Name, - DriverEndpointId = dev.ExternalId, - ExtensionId = extensionId ?? Guid.Empty, - Type = type, - }; - } } diff --git a/src/Aporta.Core/Services/OutputService.cs b/src/Aporta.Core/Services/OutputService.cs index deb653a..438ff18 100644 --- a/src/Aporta.Core/Services/OutputService.cs +++ b/src/Aporta.Core/Services/OutputService.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; using Aporta.Core.Hubs; using Aporta.Extensions.Hardware; using Aporta.Shared.Messaging; -using Aporta.Shared.Models; using Microsoft.AspNetCore.SignalR; using Z9.Spcore.Proto; @@ -50,97 +45,4 @@ private async void ExtensionServiceOnOutputStateChanged(object sender, StateChan // ignored } } - - public async Task> GetAll() - { - var devs = await _z9DevRepository.GetAllByDevType(DevType.Actuator); - // Only return user-assigned outputs (Enabled=true) - var assignedDevs = devs.Where(d => d.Enabled); - return assignedDevs.Select(DevToOutput); - } - - public async Task Get(int outputId) - { - var dev = await _z9DevRepository.Get(outputId); - return dev == null ? null : DevToOutput(dev); - } - - public async Task Insert(Output output) - { - // EndpointId is now a z9_dev unid (from the pool) - var poolDev = await _z9DevRepository.Get(output.EndpointId); - if (poolDev == null) - throw new InvalidOperationException($"Pool z9_dev {output.EndpointId} not found"); - - // Assign: update name, clear DevPlatform to remove from pool - poolDev.Name = output.Name; - poolDev.Enabled = true; - await _z9DevRepository.Upsert(poolDev); - - output.Id = poolDev.Unid; - - await _hubContext.Clients.All.SendAsync(Methods.OutputInserted, output.Id); - } - - public async Task Delete(int id) - { - await _z9DevRepository.Delete(id); - - await _hubContext.Clients.All.SendAsync(Methods.OutputDeleted, id); - } - - public async Task> AvailableControlPoints() - { - var availableActuators = await _z9DevRepository.GetAvailableByDevType(DevType.Actuator); - var tasks = availableActuators.Select(d => DevToEndpoint(d, EndpointType.Output)); - return await Task.WhenAll(tasks); - } - - public async Task SetState(int outputId, bool state) - { - var dev = await _z9DevRepository.Get(outputId); - var extensionId = await _z9DevRepository.GetExtensionId(dev); - if (!extensionId.HasValue) - throw new InvalidOperationException($"No extension ID found for z9_dev {outputId}"); - - await _extensionService.GetControlPoint(extensionId.Value, dev.ExternalId).SetState(state); - - await _hubContext.Clients.All.SendAsync(Methods.OutputStateChanged, dev.Unid, state); - - _devStateService.UpdateAspect(dev.Unid, DevAspect.Primary, - s => s.ActivityState = state ? ActivityState.Active : ActivityState.Inactive); - } - - public async Task GetState(int outputId) - { - var dev = await _z9DevRepository.Get(outputId); - var extensionId = await _z9DevRepository.GetExtensionId(dev); - if (!extensionId.HasValue) - return null; - - return await _extensionService.GetControlPoint(extensionId.Value, dev.ExternalId).GetState(); - } - - private static Output DevToOutput(Dev dev) - { - return new Output - { - Id = dev.Unid, - Name = dev.Name, - EndpointId = dev.Unid, - }; - } - - private async Task DevToEndpoint(Dev dev, EndpointType type) - { - var extensionId = await _z9DevRepository.GetExtensionId(dev); - return new Endpoint - { - Id = dev.Unid, - Name = dev.Name, - DriverEndpointId = dev.ExternalId, - ExtensionId = extensionId ?? Guid.Empty, - Type = type, - }; - } } diff --git a/src/Aporta.Shared/Calls/FlexApiService.cs b/src/Aporta.Shared/Calls/FlexApiService.cs index 532798a..646abf8 100644 --- a/src/Aporta.Shared/Calls/FlexApiService.cs +++ b/src/Aporta.Shared/Calls/FlexApiService.cs @@ -2,6 +2,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Json; +using System.Text.Json; using System.Threading.Tasks; using Aporta.Shared.Models.Flex; @@ -64,6 +65,64 @@ public async Task EnrollCredAsync(int credentialId, int personId) return await FlexPostAsync($"flex/cred/{credentialId}/enroll/{personId}"); } + public async Task> GetAvailableSensorsAsync() + { + return await FlexGetAsync>("flex/sensor/available"); + } + + public async Task> GetAvailableActuatorsAsync() + { + return await FlexGetAsync>("flex/actuator/available"); + } + + public async Task> SaveSensorAsync(FlexDev sensor) + { + return await FlexPostAsync>("flex/sensor/save", sensor); + } + + public async Task> SaveActuatorAsync(FlexDev actuator) + { + return await FlexPostAsync>("flex/actuator/save", actuator); + } + + public async Task DeleteSensorAsync(int unid) + { + return await FlexPostAsync($"flex/sensor/delete/{unid}"); + } + + public async Task DeleteActuatorAsync(int unid) + { + return await FlexPostAsync($"flex/actuator/delete/{unid}"); + } + + public async Task GetSensorStateAsync(int id) + { + var json = await FlexGetAsync($"flex/sensor/state/{id}"); + return ParseStateResponse(json); + } + + public async Task GetActuatorStateAsync(int id) + { + var json = await FlexGetAsync($"flex/actuator/state/{id}"); + return ParseStateResponse(json); + } + + public async Task SetActuatorStateAsync(int id, bool state) + { + await FlexPostAsync($"flex/actuator/state/{id}?state={state}"); + } + + private static bool? ParseStateResponse(JsonElement json) + { + if (json.TryGetProperty("state", out var stateProp)) + { + if (stateProp.ValueKind == JsonValueKind.Null) + return null; + return stateProp.GetBoolean(); + } + return null; + } + private async Task FlexGetAsync(string url) { await EnsureAuthenticated(); diff --git a/src/Aporta.Shared/Calls/Paths.cs b/src/Aporta.Shared/Calls/Paths.cs index 3896b09..bab4de5 100644 --- a/src/Aporta.Shared/Calls/Paths.cs +++ b/src/Aporta.Shared/Calls/Paths.cs @@ -5,6 +5,4 @@ public static class Paths public const string Extensions = "api/Extensions"; public const string ExtensionPerformAction = "api/Extensions/{0}/action/{1}"; public const string Doors = "api/Doors"; - public const string Outputs = "api/Outputs"; - public const string Inputs = "api/Inputs"; } \ No newline at end of file diff --git a/src/Aporta.Shared/Models/Input.cs b/src/Aporta.Shared/Models/Input.cs deleted file mode 100644 index bcec11e..0000000 --- a/src/Aporta.Shared/Models/Input.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Aporta.Shared.Models; - -public class Input -{ - public int Id { get; set; } - - public int EndpointId { get; set; } - - public string Name { get; set; } -} \ No newline at end of file diff --git a/src/Aporta.Shared/Models/Output.cs b/src/Aporta.Shared/Models/Output.cs deleted file mode 100644 index 3264ec3..0000000 --- a/src/Aporta.Shared/Models/Output.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Aporta.Shared.Models; - -public class Output -{ - public int Id { get; set; } - - public int EndpointId { get; set; } - - public string Name { get; set; } -} \ No newline at end of file diff --git a/src/Aporta.WebClient/Pages/Monitoring.razor b/src/Aporta.WebClient/Pages/Monitoring.razor index 7e476f7..96f8236 100644 --- a/src/Aporta.WebClient/Pages/Monitoring.razor +++ b/src/Aporta.WebClient/Pages/Monitoring.razor @@ -4,20 +4,18 @@ @using Microsoft.AspNetCore.SignalR.Client -@using Aporta.Shared.Models @using Aporta.Shared.Models.Flex @using Aporta.Shared.Calls @using Aporta.Shared.Messaging @using Aporta.WebClient.Messaging -@inject HttpClient Http @inject FlexApiService FlexApi @inject NavigationManager NavigationManager Monitoring -@if (_outputs == null) +@if (_actuators == null) { } @@ -104,18 +102,18 @@ else - @foreach (var input in _inputs.OrderBy(output => output.Name)) + @foreach (var sensor in _sensors.InstanceList.OrderBy(s => s.Name)) { - @input.Name + @sensor.Name - @if (_inputStates[input.Id].HasValue && _inputStates[input.Id].Value) + @if (_inputStates.ContainsKey(sensor.Unid.Value) && _inputStates[sensor.Unid.Value].HasValue && _inputStates[sensor.Unid.Value].Value) { } - else if (_inputStates[input.Id].HasValue && !_inputStates[input.Id].Value) + else if (_inputStates.ContainsKey(sensor.Unid.Value) && _inputStates[sensor.Unid.Value].HasValue && !_inputStates[sensor.Unid.Value].Value) { } @@ -142,24 +140,24 @@ else - @foreach (var output in _outputs.OrderBy(output => output.Name)) + @foreach (var actuator in _actuators.InstanceList.OrderBy(a => a.Name)) { - @output.Name + @actuator.Name - @if (_outputStates[output.Id].HasValue && _outputStates[output.Id].Value) + @if (_outputStates.ContainsKey(actuator.Unid.Value) && _outputStates[actuator.Unid.Value].HasValue && _outputStates[actuator.Unid.Value].Value) { } - else if (_outputStates[output.Id].HasValue && !_outputStates[output.Id].Value) + else if (_outputStates.ContainsKey(actuator.Unid.Value) && _outputStates[actuator.Unid.Value].HasValue && !_outputStates[actuator.Unid.Value].Value) { } - + } @@ -188,10 +186,10 @@ else private Color _eventRowColor = Color.Default; private bool _liveEventMonitoring; - private List _inputs; + private FlexListResponse _sensors; private readonly Dictionary _inputStates = new(); - private List _outputs; + private FlexListResponse _actuators; private readonly Dictionary _outputStates = new(); private HubConnection _hubConnection; @@ -204,42 +202,43 @@ else { await LoadEvents(); - _inputs = await Http.GetFromJsonAsync>(Paths.Inputs); - if (_inputs != null) + _sensors = await FlexApi.GetSensorListAsync(0, 1000); + foreach (var sensor in _sensors.InstanceList) { - foreach (var input in _inputs) - { - _inputStates[input.Id] = await GetInputState(input.Id); - } + _inputStates[sensor.Unid.Value] = await FlexApi.GetSensorStateAsync(sensor.Unid.Value); } - _outputs = await Http.GetFromJsonAsync>(Paths.Outputs); - if (_outputs != null) + _actuators = await FlexApi.GetActuatorListAsync(0, 1000); + foreach (var actuator in _actuators.InstanceList) { - foreach (var output in _outputs) - { - _outputStates[output.Id] = await GetOutputState(output.Id); - } + _outputStates[actuator.Unid.Value] = await FlexApi.GetActuatorStateAsync(actuator.Unid.Value); } _hubConnection = new HubConnectionBuilder() .WithUrl(NavigationManager.ToAbsoluteUri(Locations.DataChangeNotification)) .WithAutomaticReconnect(new SignalRRetryPolicy()) .Build(); - _hubConnection.On(Methods.OutputInserted, async outputId => + _hubConnection.On(Methods.OutputInserted, async _ => { - _outputs.Add( await Http.GetFromJsonAsync($"{Paths.Outputs}/{outputId}")); - _outputStates[outputId] = await GetOutputState(outputId); + _actuators = await FlexApi.GetActuatorListAsync(0, 1000); + foreach (var actuator in _actuators.InstanceList) + { + if (!_outputStates.ContainsKey(actuator.Unid.Value)) + _outputStates[actuator.Unid.Value] = await FlexApi.GetActuatorStateAsync(actuator.Unid.Value); + } StateHasChanged(); }); _hubConnection.On(Methods.OutputDeleted, outputId => { - var output = _outputs.FirstOrDefault(o => o.Id == outputId); - if (output == null) return; - - _outputs.Remove(output); - _outputStates.Remove(output.Id); + _actuators = new FlexListResponse + { + InstanceList = _actuators.InstanceList.Where(a => a.Unid != outputId).ToList(), + Count = _actuators.Count - 1, + Offset = _actuators.Offset, + Max = _actuators.Max, + }; + _outputStates.Remove(outputId); StateHasChanged(); }); @@ -249,20 +248,27 @@ else StateHasChanged(); }); - _hubConnection.On(Methods.InputInserted, async inputId => + _hubConnection.On(Methods.InputInserted, async _ => { - _inputs.Add( await Http.GetFromJsonAsync($"{Paths.Inputs}/{inputId}")); - _inputStates[inputId] = await GetInputState(inputId); + _sensors = await FlexApi.GetSensorListAsync(0, 1000); + foreach (var sensor in _sensors.InstanceList) + { + if (!_inputStates.ContainsKey(sensor.Unid.Value)) + _inputStates[sensor.Unid.Value] = await FlexApi.GetSensorStateAsync(sensor.Unid.Value); + } StateHasChanged(); }); _hubConnection.On(Methods.InputDeleted, inputId => { - var input = _inputs.FirstOrDefault(i => i.Id == inputId); - if (input == null) return; - - _inputs.Remove(input); - _inputStates.Remove(input.Id); + _sensors = new FlexListResponse + { + InstanceList = _sensors.InstanceList.Where(s => s.Unid != inputId).ToList(), + Count = _sensors.Count - 1, + Offset = _sensors.Offset, + Max = _sensors.Max, + }; + _inputStates.Remove(inputId); StateHasChanged(); }); @@ -287,41 +293,11 @@ else await _hubConnection.StartAsync(); } - private async Task GetInputState(int inputId) + private async Task SetActuatorState(int actuatorId, bool? checkedValue) { - string url = $"{Paths.Inputs}/state/{inputId}"; - var response = await Http.GetAsync(url); - if (!response.IsSuccessStatusCode) - { - return null; - } - - return bool.Parse(await response.Content.ReadAsStringAsync()); - } - - private async Task GetOutputState(int outputId) - { - string url = $"{Paths.Outputs}/set/{outputId}"; - var response = await Http.GetAsync(url); - if (!response.IsSuccessStatusCode) - { - return null; - } - - return bool.Parse(await response.Content.ReadAsStringAsync()); - } + if (!checkedValue.HasValue) return; - private async Task SetOutputState(int outputId, bool? checkedValue) - { - string url = $"{Paths.Outputs}/set/{outputId}"; - url = QueryHelpers.AddQueryString(url, "state", checkedValue.ToString()); - var response = await Http.PostAsync(url, new StringContent(string.Empty)); - if (!response.IsSuccessStatusCode) - { - _snackbarMessage = "Unable to set output"; - _snackbarColor = SnackbarColor.Danger; - await _snackbar.Show(); - } + await FlexApi.SetActuatorStateAsync(actuatorId, checkedValue.Value); } private bool IsActive(string page) => _currentPage == page; diff --git a/src/Aporta.WebClient/Pages/configuration/Actuators.razor b/src/Aporta.WebClient/Pages/configuration/Actuators.razor index f11f254..b030ac2 100644 --- a/src/Aporta.WebClient/Pages/configuration/Actuators.razor +++ b/src/Aporta.WebClient/Pages/configuration/Actuators.razor @@ -1,17 +1,12 @@ @page "/configuration/actuators" -@using System.Text -@using System.Text.Json - @using Microsoft.AspNetCore.SignalR.Client -@using Aporta.Shared.Models @using Aporta.Shared.Models.Flex @using Aporta.Shared.Calls @using Aporta.Shared.Messaging @using Aporta.WebClient.Messaging -@inject HttpClient Http @inject FlexApiService FlexApi @inject NavigationManager NavigationManager @@ -26,7 +21,7 @@ else { - @if (_availableControlPoints.Any()) + @if (_availableActuators != null && _availableActuators.InstanceList.Any()) { } @@ -58,7 +53,7 @@ else @actuator.Name - @@ -85,7 +80,7 @@ else Name - + Please enter a name for the actuator @@ -99,10 +94,10 @@ else Device Endpoint - + @foreach (var available in _availableActuators.InstanceList) { - @controlPoint.Name + @available.Name } @@ -111,7 +106,7 @@ else - + @@ -130,8 +125,9 @@ else IMessageService MessageService { get; set; } private FlexListResponse _actuators; - private Endpoint[] _availableControlPoints; - private Output _addOutput; + private FlexListResponse _availableActuators; + private string _addName; + private int _addEndpointUnid; private HubConnection _hubConnection; @@ -146,7 +142,7 @@ else { _actuators = await FlexApi.GetActuatorListAsync(0, 1000); - await InitializedAvailableOutputs(); + await InitializeAvailableActuators(); _hubConnection = new HubConnectionBuilder() .WithUrl(NavigationManager.ToAbsoluteUri(Locations.DataChangeNotification)) @@ -155,30 +151,26 @@ else _hubConnection.On(Methods.OutputInserted, async _ => { _actuators = await FlexApi.GetActuatorListAsync(0, 1000); - await InitializedAvailableOutputs(); + await InitializeAvailableActuators(); StateHasChanged(); }); _hubConnection.On(Methods.OutputDeleted, async _ => { _actuators = await FlexApi.GetActuatorListAsync(0, 1000); - await InitializedAvailableOutputs(); + await InitializeAvailableActuators(); StateHasChanged(); }); await _hubConnection.StartAsync(); } - private async Task InitializedAvailableOutputs() + private async Task InitializeAvailableActuators() { - _availableControlPoints = await Http.GetFromJsonAsync($"{Paths.Outputs}/available"); - - _addOutput = new Output(); - if (_availableControlPoints != null && _availableControlPoints.Any()) - { - _addOutput.EndpointId = _availableControlPoints.First().Id; - } + _availableActuators = await FlexApi.GetAvailableActuatorsAsync(); + _addName = ""; + _addEndpointUnid = _availableActuators.InstanceList.FirstOrDefault()?.Unid ?? 0; } - private async Task AddOutput() + private async Task AddActuator() { if (!await _addOutputValidations.ValidateAll()) { @@ -186,18 +178,11 @@ else } await _addOutputModal.Hide(); - string url = string.Format(Paths.Outputs); - var response = await Http.PutAsync(url, - new StringContent(JsonSerializer.Serialize(_addOutput), Encoding.UTF8, "application/json")); - if (!response.IsSuccessStatusCode) - { - _snackbarMessage = "Unable to add actuator"; - _snackbarColor = SnackbarColor.Danger; - await _snackbar.Show(); - } + var dev = new FlexDev { Unid = _addEndpointUnid, Name = _addName }; + await FlexApi.SaveActuatorAsync(dev); } - private async Task RemoveOutput(FlexDev actuator) + private async Task RemoveActuator(FlexDev actuator) { if (!await MessageService.Confirm($"Are you sure you want to delete actuator '{actuator.Name}'?", "Delete Actuator", options => { @@ -208,14 +193,7 @@ else return; } - string url = string.Format($"{Paths.Outputs}/{actuator.Unid}"); - var response = await Http.DeleteAsync(url); - if (!response.IsSuccessStatusCode) - { - _snackbarMessage = "Unable to remove actuator"; - _snackbarColor = SnackbarColor.Danger; - await _snackbar.Show(); - } + await FlexApi.DeleteActuatorAsync(actuator.Unid.Value); } } diff --git a/src/Aporta.WebClient/Pages/configuration/Doors.razor b/src/Aporta.WebClient/Pages/configuration/Doors.razor index b6201a9..40ad6d8 100644 --- a/src/Aporta.WebClient/Pages/configuration/Doors.razor +++ b/src/Aporta.WebClient/Pages/configuration/Doors.razor @@ -6,11 +6,13 @@ @using Microsoft.AspNetCore.SignalR.Client @using Aporta.Shared.Models +@using Aporta.Shared.Models.Flex @using Aporta.Shared.Calls @using Aporta.Shared.Messaging @using Aporta.WebClient.Messaging @inject HttpClient Http +@inject FlexApiService FlexApi @inject NavigationManager NavigationManager Doors @@ -145,9 +147,9 @@ else - @foreach (var monitorPoint in _availableMonitorPoints) + @@ -111,7 +106,7 @@ else - + @@ -130,8 +125,9 @@ else IMessageService MessageService { get; set; } private FlexListResponse _sensors; - private Endpoint[] _availableMonitorPoints; - private Input _addInput; + private FlexListResponse _availableSensors; + private string _addName; + private int _addEndpointUnid; private HubConnection _hubConnection; @@ -145,7 +141,7 @@ else { _sensors = await FlexApi.GetSensorListAsync(0, 1000); - await InitializedAvailableInputs(); + await InitializeAvailableSensors(); _hubConnection = new HubConnectionBuilder() .WithUrl(NavigationManager.ToAbsoluteUri(Locations.DataChangeNotification)) @@ -154,30 +150,26 @@ else _hubConnection.On(Methods.InputInserted, async _ => { _sensors = await FlexApi.GetSensorListAsync(0, 1000); - await InitializedAvailableInputs(); + await InitializeAvailableSensors(); StateHasChanged(); }); _hubConnection.On(Methods.InputDeleted, async _ => { _sensors = await FlexApi.GetSensorListAsync(0, 1000); - await InitializedAvailableInputs(); + await InitializeAvailableSensors(); StateHasChanged(); }); await _hubConnection.StartAsync(); } - private async Task InitializedAvailableInputs() + private async Task InitializeAvailableSensors() { - _availableMonitorPoints = await Http.GetFromJsonAsync($"{Paths.Inputs}/available"); - - _addInput = new Input(); - if (_availableMonitorPoints != null && _availableMonitorPoints.Any()) - { - _addInput.EndpointId = _availableMonitorPoints.First().Id; - } + _availableSensors = await FlexApi.GetAvailableSensorsAsync(); + _addName = ""; + _addEndpointUnid = _availableSensors.InstanceList.FirstOrDefault()?.Unid ?? 0; } - private async Task AddInput() + private async Task AddSensor() { if (! await _addInputValidations.ValidateAll()) { @@ -185,18 +177,11 @@ else } await _addInputModal.Hide(); - string url = string.Format(Paths.Inputs); - var response = await Http.PutAsync(url, - new StringContent(JsonSerializer.Serialize(_addInput), Encoding.UTF8, "application/json")); - if (!response.IsSuccessStatusCode) - { - _snackbarMessage = "Unable to add sensor"; - _snackbarColor = SnackbarColor.Danger; - await _snackbar.Show(); - } + var dev = new FlexDev { Unid = _addEndpointUnid, Name = _addName }; + await FlexApi.SaveSensorAsync(dev); } - private async Task RemoveInput(FlexDev sensor) + private async Task RemoveSensor(FlexDev sensor) { if (!await MessageService.Confirm($"Are you sure you want to delete sensor '{sensor.Name}'?", "Delete Sensor", options => { @@ -207,13 +192,6 @@ else return; } - string url = string.Format($"{Paths.Inputs}/{sensor.Unid}"); - var response = await Http.DeleteAsync(url); - if (!response.IsSuccessStatusCode) - { - _snackbarMessage = "Unable to remove sensor"; - _snackbarColor = SnackbarColor.Danger; - await _snackbar.Show(); - } + await FlexApi.DeleteSensorAsync(sensor.Unid.Value); } } diff --git a/src/Aporta/Controllers/Flex/FlexDevController.cs b/src/Aporta/Controllers/Flex/FlexDevController.cs index ac0e69f..883808f 100644 --- a/src/Aporta/Controllers/Flex/FlexDevController.cs +++ b/src/Aporta/Controllers/Flex/FlexDevController.cs @@ -1,10 +1,14 @@ +using System; using System.Linq; using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; +using Aporta.Core.Hubs; +using Aporta.Shared.Messaging; using Aporta.Shared.Models.Flex; using Aporta.Core.Services; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.SignalR; using Z9.Spcore.Proto; namespace Aporta.Controllers.Flex; @@ -94,16 +98,208 @@ public FlexControllerController(IDataAccess dataAccess) : base(dataAccess) { } [Route("flex/sensor")] public class FlexSensorController : FlexDevTypeControllerBase { - public FlexSensorController(IDataAccess dataAccess) : base(dataAccess) { } + private readonly Z9DevRepository _repository; + private readonly IHubContext _hubContext; + private readonly ExtensionService _extensionService; + + public FlexSensorController(IDataAccess dataAccess, + IHubContext hubContext, + ExtensionService extensionService) : base(dataAccess) + { + _repository = new Z9DevRepository(dataAccess); + _hubContext = hubContext; + _extensionService = extensionService; + } + protected override DevType FilterDevType => DevType.Sensor; + + [HttpGet("list")] + public override async Task List([FromQuery] int offset = 0, [FromQuery] int max = 50) + { + var all = (await Repository.GetAll()) + .Where(d => d.DevType == DevType.Sensor && d.Enabled) + .ToList(); + var count = all.Count; + var page = all.Skip(offset).Take(max).Select(ToFlex).ToList(); + + return Ok(new FlexListResponse + { + Offset = offset, + Max = max, + Count = count, + InstanceList = page, + }); + } + + public override async Task Save([FromBody] FlexDev body) + { + var poolDev = await _repository.Get(body.Unid ?? 0); + if (poolDev == null) + return NotFound(); + + poolDev.Name = body.Name; + poolDev.Enabled = true; + await _repository.Upsert(poolDev); + + await _hubContext.Clients.All.SendAsync(Methods.InputInserted, poolDev.Unid); + + return Ok(new FlexInstanceResponse { Instance = ToFlex(poolDev) }); + } + + public override async Task Delete(string id) + { + var result = await base.Delete(id); + + if (int.TryParse(id, out var unid)) + await _hubContext.Clients.All.SendAsync(Methods.InputDeleted, unid); + + return result; + } + + [HttpGet("available")] + public async Task Available() + { + var available = await _repository.GetAvailableByDevType(DevType.Sensor); + var list = available.Select(ToFlex).ToList(); + return Ok(new FlexListResponse + { + Offset = 0, + Max = list.Count, + Count = list.Count, + InstanceList = list, + }); + } + + [HttpGet("state/{id:int}")] + public async Task GetState(int id) + { + var dev = await _repository.Get(id); + if (dev == null) + return NotFound(); + + var extensionId = await _repository.GetExtensionId(dev); + if (!extensionId.HasValue) + return Ok(new { state = (bool?)null }); + + var state = await _extensionService.GetMonitorPoint(extensionId.Value, dev.ExternalId).GetState(); + return Ok(new { state }); + } } [ApiController] [Route("flex/actuator")] public class FlexActuatorController : FlexDevTypeControllerBase { - public FlexActuatorController(IDataAccess dataAccess) : base(dataAccess) { } + private readonly Z9DevRepository _repository; + private readonly IHubContext _hubContext; + private readonly ExtensionService _extensionService; + private readonly DevStateService _devStateService; + + public FlexActuatorController(IDataAccess dataAccess, + IHubContext hubContext, + ExtensionService extensionService, + DevStateService devStateService) : base(dataAccess) + { + _repository = new Z9DevRepository(dataAccess); + _hubContext = hubContext; + _extensionService = extensionService; + _devStateService = devStateService; + } + protected override DevType FilterDevType => DevType.Actuator; + + [HttpGet("list")] + public override async Task List([FromQuery] int offset = 0, [FromQuery] int max = 50) + { + var all = (await Repository.GetAll()) + .Where(d => d.DevType == DevType.Actuator && d.Enabled) + .ToList(); + var count = all.Count; + var page = all.Skip(offset).Take(max).Select(ToFlex).ToList(); + + return Ok(new FlexListResponse + { + Offset = offset, + Max = max, + Count = count, + InstanceList = page, + }); + } + + public override async Task Save([FromBody] FlexDev body) + { + var poolDev = await _repository.Get(body.Unid ?? 0); + if (poolDev == null) + return NotFound(); + + poolDev.Name = body.Name; + poolDev.Enabled = true; + await _repository.Upsert(poolDev); + + await _hubContext.Clients.All.SendAsync(Methods.OutputInserted, poolDev.Unid); + + return Ok(new FlexInstanceResponse { Instance = ToFlex(poolDev) }); + } + + public override async Task Delete(string id) + { + var result = await base.Delete(id); + + if (int.TryParse(id, out var unid)) + await _hubContext.Clients.All.SendAsync(Methods.OutputDeleted, unid); + + return result; + } + + [HttpGet("available")] + public async Task Available() + { + var available = await _repository.GetAvailableByDevType(DevType.Actuator); + var list = available.Select(ToFlex).ToList(); + return Ok(new FlexListResponse + { + Offset = 0, + Max = list.Count, + Count = list.Count, + InstanceList = list, + }); + } + + [HttpGet("state/{id:int}")] + public async Task GetState(int id) + { + var dev = await _repository.Get(id); + if (dev == null) + return NotFound(); + + var extensionId = await _repository.GetExtensionId(dev); + if (!extensionId.HasValue) + return Ok(new { state = (bool?)null }); + + var state = await _extensionService.GetControlPoint(extensionId.Value, dev.ExternalId).GetState(); + return Ok(new { state }); + } + + [HttpPost("state/{id:int}")] + public async Task SetState(int id, [FromQuery] bool state) + { + var dev = await _repository.Get(id); + if (dev == null) + return NotFound(); + + var extensionId = await _repository.GetExtensionId(dev); + if (!extensionId.HasValue) + return NotFound(); + + await _extensionService.GetControlPoint(extensionId.Value, dev.ExternalId).SetState(state); + + await _hubContext.Clients.All.SendAsync(Methods.OutputStateChanged, dev.Unid, state); + + _devStateService.UpdateAspect(dev.Unid, DevAspect.Primary, + s => s.ActivityState = state ? ActivityState.Active : ActivityState.Inactive); + + return Ok(new FlexVoid()); + } } [ApiController] diff --git a/src/Aporta/Controllers/InputsController.cs b/src/Aporta/Controllers/InputsController.cs deleted file mode 100644 index 696e2ae..0000000 --- a/src/Aporta/Controllers/InputsController.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Aporta.Core.Services; -using Aporta.Shared.Models; -using Microsoft.AspNetCore.Mvc; - -namespace Aporta.Controllers; - -[ApiController] -[Route("api/[controller]")] -public class InputsController : ControllerBase -{ - private readonly InputService _inputService; - - public InputsController(InputService inputService) - { - _inputService = inputService; - } - - [HttpGet] - public async Task> Get() - { - return await _inputService.GetAll(); - } - - [HttpGet("{inputId}")] - public async Task Get(int inputId) - { - return await _inputService.Get(inputId); - } - - [HttpPut] - public async Task Put([FromBody]Input input) - { - await _inputService.Insert(input); - } - - [HttpDelete("{inputId:int}")] - public async Task Delete(int inputId) - { - await _inputService.Delete(inputId); - } - - [HttpGet("available")] - public async Task> Available() - { - return await _inputService.AvailableMonitorPoints(); - } - - [HttpGet("state/{inputId:int}")] - public async Task GetState(int inputId) - { - return await _inputService.GetState(inputId); - } -} \ No newline at end of file diff --git a/src/Aporta/Controllers/OutputsController.cs b/src/Aporta/Controllers/OutputsController.cs deleted file mode 100644 index 9eada93..0000000 --- a/src/Aporta/Controllers/OutputsController.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Aporta.Core.Services; -using Aporta.Shared.Models; -using Microsoft.AspNetCore.Mvc; - -namespace Aporta.Controllers; - -[ApiController] -[Route("api/[controller]")] -public class OutputsController : ControllerBase -{ - private readonly OutputService _outputService; - - public OutputsController(OutputService outputService) - { - _outputService = outputService; - } - - [HttpGet] - public async Task> Get() - { - return await _outputService.GetAll(); - } - - [HttpGet("{outputId}")] - public async Task Get(int outputId) - { - return await _outputService.Get(outputId); - } - - [HttpPut] - public async Task Put([FromBody]Output output) - { - await _outputService.Insert(output); - } - - [HttpDelete("{outputId:int}")] - public async Task Delete(int outputId) - { - await _outputService.Delete(outputId); - } - - [HttpGet("available")] - public async Task> Available() - { - return await _outputService.AvailableControlPoints(); - } - - [HttpGet("set/{outputId:int}")] - public async Task GetState(int outputId) - { - return await _outputService.GetState(outputId); - } - - [HttpPost("set/{outputId:int}")] - public async Task SetState(int outputId, [FromQuery]bool state) - { - await _outputService.SetState(outputId, state); - - return NoContent(); - } -} \ No newline at end of file diff --git a/test/Aporta.Core.Tests/Services/InputServiceTests.cs b/test/Aporta.Core.Tests/Services/InputServiceTests.cs index 7562989..ad8918e 100644 --- a/test/Aporta.Core.Tests/Services/InputServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/InputServiceTests.cs @@ -19,7 +19,7 @@ using Aporta.Core.Services; using Aporta.Extensions; using Aporta.Shared.Messaging; -using Aporta.Shared.Models; +using Z9.Spcore.Proto; namespace Aporta.Core.Tests.Services; @@ -74,31 +74,34 @@ public void TearDown() public async Task GetState() { // Arrange - var inputService = new InputService(_dataAccess, + var z9DevRepository = new Z9DevRepository(_dataAccess); + // InputService is still instantiated to subscribe to StateChanged events + _ = new InputService(_dataAccess, new UnitTestingSupportForIHubContext().IHubContextMock.Object, _extensionService, new DevStateService()); - var available = (await inputService.AvailableMonitorPoints()).ToArray(); + var available = (await z9DevRepository.GetAvailableByDevType(DevType.Sensor)).ToArray(); Assert.That(available.Length, Is.EqualTo(2), "Expected 2 available sensor endpoints"); - var inputs = new[] - { - new Input {Name = "TestInput1", EndpointId = available[0].Id}, - new Input {Name = "TestInput2", EndpointId = available[1].Id} - }; - - foreach (var input in inputs) + // Assign sensors (set name + enabled) + foreach (var dev in available) { - await inputService.Insert(input); + dev.Name = $"TestInput_{dev.Unid}"; + dev.Enabled = true; + await z9DevRepository.Upsert(dev); } // Act — send state via named pipe using the driver endpoint ID of the second input - await SendInputState(available[1].DriverEndpointId, true); + var secondDev = available[1]; + var extensionId = await z9DevRepository.GetExtensionId(secondDev); + await SendInputState(secondDev.ExternalId, true); // Assert - Assert.That(async () => await inputService.GetState(inputs[0].Id), + Assert.That(async () => + await _extensionService.GetMonitorPoint(extensionId.Value, available[0].ExternalId).GetState(), Is.False.After(1000, 100)); - Assert.That(async () => await inputService.GetState(inputs[1].Id), + Assert.That(async () => + await _extensionService.GetMonitorPoint(extensionId.Value, secondDev.ExternalId).GetState(), Is.True.After(1000, 100)); } @@ -107,31 +110,32 @@ public async Task ReceiveStateChange() { // Arrange var hubContext = new UnitTestingSupportForIHubContext(); - var inputService = new InputService(_dataAccess, hubContext.IHubContextMock.Object, _extensionService, new DevStateService()); + var z9DevRepository = new Z9DevRepository(_dataAccess); + _ = new InputService(_dataAccess, hubContext.IHubContextMock.Object, _extensionService, new DevStateService()); - var available = (await inputService.AvailableMonitorPoints()).ToArray(); + var available = (await z9DevRepository.GetAvailableByDevType(DevType.Sensor)).ToArray(); Assert.That(available.Length, Is.EqualTo(2), "Expected 2 available sensor endpoints"); - var inputs = new[] - { - new Input {Name = "TestInput1", EndpointId = available[0].Id}, - new Input {Name = "TestInput2", EndpointId = available[1].Id} - }; - - foreach (var input in inputs) + // Assign sensors (set name + enabled) + foreach (var dev in available) { - await inputService.Insert(input); + dev.Name = $"TestInput_{dev.Unid}"; + dev.Enabled = true; + await z9DevRepository.Upsert(dev); } // Act — send state via named pipe using the driver endpoint ID of the second input - await SendInputState(available[1].DriverEndpointId, true); + var secondDev = available[1]; + var extensionId = await z9DevRepository.GetExtensionId(secondDev); + await SendInputState(secondDev.ExternalId, true); // Assert // Wait for state to be updated on service before verifying - Assert.That(async () => await inputService.GetState(inputs[1].Id), + Assert.That(async () => + await _extensionService.GetMonitorPoint(extensionId.Value, secondDev.ExternalId).GetState(), Is.True.After(1000, 100)); hubContext.ClientsAllMock.Verify(clientProxy => - clientProxy.SendCoreAsync(Methods.InputStateChanged, new object[] {inputs[1].Id, true}, + clientProxy.SendCoreAsync(Methods.InputStateChanged, new object[] {secondDev.Unid, true}, It.IsAny())); } diff --git a/test/Aporta.Core.Tests/Services/OutputServiceTests.cs b/test/Aporta.Core.Tests/Services/OutputServiceTests.cs index 5e83d25..0f70b6d 100644 --- a/test/Aporta.Core.Tests/Services/OutputServiceTests.cs +++ b/test/Aporta.Core.Tests/Services/OutputServiceTests.cs @@ -8,12 +8,12 @@ using Aporta.Core.Hubs; using Aporta.Core.Services; using Aporta.Extensions; -using Aporta.Shared.Models; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Moq; using NUnit.Framework; using SignalR_UnitTestingSupportCommon.IHubContextSupport; +using Z9.Spcore.Proto; namespace Aporta.Core.Tests.Services; @@ -68,29 +68,32 @@ public void TearDown() public async Task SetState() { // Arrange - var outputService = new OutputService(_dataAccess, + var z9DevRepository = new Z9DevRepository(_dataAccess); + // OutputService is still instantiated to subscribe to StateChanged events + _ = new OutputService(_dataAccess, new UnitTestingSupportForIHubContext().IHubContextMock.Object, _extensionService, new DevStateService()); - var available = (await outputService.AvailableControlPoints()).ToArray(); + var available = (await z9DevRepository.GetAvailableByDevType(DevType.Actuator)).ToArray(); Assert.That(available.Length, Is.EqualTo(2), "Expected 2 available actuator endpoints"); - var outputs = new[] - { - new Output {Name = "TestOutput1", EndpointId = available[0].Id}, - new Output {Name = "TestOutput2", EndpointId = available[1].Id} - }; - foreach (var output in outputs) + // Assign actuators (set name + enabled) + foreach (var dev in available) { - await outputService.Insert(output); + dev.Name = $"TestOutput_{dev.Unid}"; + dev.Enabled = true; + await z9DevRepository.Upsert(dev); } + // Get extension ID for state calls + var extensionId = await z9DevRepository.GetExtensionId(available[0]); + // Act - await outputService.SetState(outputs[0].Id, true); - await outputService.SetState(outputs[1].Id, false); + await _extensionService.GetControlPoint(extensionId.Value, available[0].ExternalId).SetState(true); + await _extensionService.GetControlPoint(extensionId.Value, available[1].ExternalId).SetState(false); // Assert - Assert.That(await outputService.GetState(outputs[0].Id), Is.True); - Assert.That(await outputService.GetState(outputs[1].Id), Is.False); + Assert.That(await _extensionService.GetControlPoint(extensionId.Value, available[0].ExternalId).GetState(), Is.True); + Assert.That(await _extensionService.GetControlPoint(extensionId.Value, available[1].ExternalId).GetState(), Is.False); } } From 024cfa608575d900f927eb988da0945271d936ea Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Mon, 9 Feb 2026 15:54:59 -0500 Subject: [PATCH 61/86] Migrate Doors.razor to Flex API, delete DoorCalls legacy code Doors.razor now uses FlexApiService exclusively for list/create/delete and available readers. FlexDoorController gains custom List (top-level doors only), POST create, Delete (via DoorConfigurationService), and available/readers + available/endpoints routes. DoorsController is slimmed to read-only GETs for integration test compatibility. Virtual driver Configuration.razor also migrated from IDoorCalls to FlexApiService. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Shared/Calls/DoorCalls.cs | 42 ------- src/Aporta.Shared/Calls/FlexApiService.cs | 26 +++++ src/Aporta.Shared/Calls/Paths.cs | 1 - .../Pages/configuration/Doors.razor | 100 ++++++++-------- src/Aporta.WebClient/Program.cs | 3 - src/Aporta/Controllers/DoorsController.cs | 30 +---- .../Controllers/Flex/FlexDevController.cs | 79 ++++++++++++- .../Configuration.razor | 13 ++- .../ConfigurationTest.cs | 108 +++++++++--------- 9 files changed, 214 insertions(+), 188 deletions(-) delete mode 100644 src/Aporta.Shared/Calls/DoorCalls.cs diff --git a/src/Aporta.Shared/Calls/DoorCalls.cs b/src/Aporta.Shared/Calls/DoorCalls.cs deleted file mode 100644 index 81b2158..0000000 --- a/src/Aporta.Shared/Calls/DoorCalls.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System.Net.Http; -using System.Net.Http.Json; -using System.Threading.Tasks; -using Aporta.Shared.Models; - -namespace Aporta.Shared.Calls -{ - /// - public class DoorCalls(HttpClient httpClient) : IDoorCalls - { - - /// - public async Task GetAvailableEndpoints() - { - return await httpClient.GetFromJsonAsync($"{Paths.Doors}/endpointsavailable"); - } - - /// - public async Task GetAvailableAccessPoints() - { - return await httpClient.GetFromJsonAsync($"{Paths.Doors}/available"); - } - - } - - /// - /// Represents a class that handles Door API calls. - /// - public interface IDoorCalls - { - /// - /// Return all endpoints available to be assigned to a door - /// - public Task GetAvailableEndpoints(); - - /// - /// Return all access points available to be assigned to a door - /// - public Task GetAvailableAccessPoints(); - } - -} diff --git a/src/Aporta.Shared/Calls/FlexApiService.cs b/src/Aporta.Shared/Calls/FlexApiService.cs index 646abf8..f841147 100644 --- a/src/Aporta.Shared/Calls/FlexApiService.cs +++ b/src/Aporta.Shared/Calls/FlexApiService.cs @@ -4,6 +4,7 @@ using System.Net.Http.Json; using System.Text.Json; using System.Threading.Tasks; +using Aporta.Shared.Models; using Aporta.Shared.Models.Flex; namespace Aporta.Shared.Calls; @@ -65,6 +66,31 @@ public async Task EnrollCredAsync(int credentialId, int personId) return await FlexPostAsync($"flex/cred/{credentialId}/enroll/{personId}"); } + public async Task> GetDoorListAsync(int offset, int max) + { + return await FlexGetAsync>($"flex/door/list?offset={offset}&max={max}"); + } + + public async Task> GetAvailableCredReadersAsync() + { + return await FlexGetAsync>("flex/door/available/readers"); + } + + public async Task CreateDoorAsync(Door door) + { + return await FlexPostAsync("flex/door/create", door); + } + + public async Task DeleteDoorAsync(int unid) + { + return await FlexPostAsync($"flex/door/delete/{unid}"); + } + + public virtual async Task> GetAvailableEndpointsAsync() + { + return await FlexGetAsync>("flex/door/available/endpoints"); + } + public async Task> GetAvailableSensorsAsync() { return await FlexGetAsync>("flex/sensor/available"); diff --git a/src/Aporta.Shared/Calls/Paths.cs b/src/Aporta.Shared/Calls/Paths.cs index bab4de5..4499281 100644 --- a/src/Aporta.Shared/Calls/Paths.cs +++ b/src/Aporta.Shared/Calls/Paths.cs @@ -4,5 +4,4 @@ public static class Paths { public const string Extensions = "api/Extensions"; public const string ExtensionPerformAction = "api/Extensions/{0}/action/{1}"; - public const string Doors = "api/Doors"; } \ No newline at end of file diff --git a/src/Aporta.WebClient/Pages/configuration/Doors.razor b/src/Aporta.WebClient/Pages/configuration/Doors.razor index 40ad6d8..2a4a357 100644 --- a/src/Aporta.WebClient/Pages/configuration/Doors.razor +++ b/src/Aporta.WebClient/Pages/configuration/Doors.razor @@ -1,8 +1,5 @@ @page "/configuration/doors" -@using System.Text -@using System.Text.Json - @using Microsoft.AspNetCore.SignalR.Client @using Aporta.Shared.Models @@ -11,7 +8,6 @@ @using Aporta.Shared.Messaging @using Aporta.WebClient.Messaging -@inject HttpClient Http @inject FlexApiService FlexApi @inject NavigationManager NavigationManager @@ -26,7 +22,7 @@ else { - @if (_availableAccessPoints.Any()) + @if (_availableAccessPoints.InstanceList.Any()) { } @@ -51,14 +47,14 @@ else - @foreach (var door in _doors.OrderBy(door => door.Name)) + @foreach (var door in _doors.InstanceList.OrderBy(door => door.Name)) { @door.Name - @@ -68,9 +64,9 @@ else - + - + @@ -95,7 +91,7 @@ else - + Access Reader In @@ -103,9 +99,9 @@ else None - @foreach (var accessPoint in _availableAccessPoints) + @foreach (var available in _availableAccessPoints.InstanceList) { - @accessPoint.Name + @available.Name } @@ -152,7 +148,7 @@ else @controlPoint.Name } - + Validation error @@ -181,16 +177,16 @@ else @code { - [Inject] + [Inject] IMessageService MessageService { get; set; } - - private List _doors; - private Endpoint[] _availableAccessPoints; + + private FlexListResponse _doors; + private FlexListResponse _availableAccessPoints; private FlexListResponse _availableControlPoints; private Door _addDoor; - + private HubConnection _hubConnection; - + private Modal _addDoorModal; private Validations _addDoorValidations; #pragma warning disable 649 @@ -198,50 +194,45 @@ else #pragma warning restore 649 private SnackbarColor _snackbarColor; private string _snackbarMessage = string.Empty; - + protected override async Task OnInitializedAsync() { - _doors = await Http.GetFromJsonAsync>(Paths.Doors); + _doors = await FlexApi.GetDoorListAsync(0, 1000); + + await InitializeAvailableEndpoints(); - await InitializedAvailableEndpoints(); - _hubConnection = new HubConnectionBuilder() .WithUrl(NavigationManager.ToAbsoluteUri(Locations.DataChangeNotification)) .WithAutomaticReconnect(new SignalRRetryPolicy()) .Build(); - _hubConnection.On(Methods.DoorInserted, async doorId => + _hubConnection.On(Methods.DoorInserted, async _ => { - _doors.Add( await Http.GetFromJsonAsync($"{Paths.Doors}/{doorId}")); - - await InitializedAvailableEndpoints(); - + _doors = await FlexApi.GetDoorListAsync(0, 1000); + + await InitializeAvailableEndpoints(); + StateHasChanged(); }); - _hubConnection.On(Methods.DoorDeleted, async doorId => + _hubConnection.On(Methods.DoorDeleted, async _ => { - var door = _doors.FirstOrDefault(o => o.Id == doorId); - if (door == null) return; - - _doors.Remove(door); - - await InitializedAvailableEndpoints(); + _doors = await FlexApi.GetDoorListAsync(0, 1000); + + await InitializeAvailableEndpoints(); StateHasChanged(); }); _hubConnection.On(Methods.ExtensionDataChanged, async _ => { - - - await InitializedAvailableEndpoints(); + await InitializeAvailableEndpoints(); StateHasChanged(); }); await _hubConnection.StartAsync(); } - private async Task InitializedAvailableEndpoints() + private async Task InitializeAvailableEndpoints() { - _availableAccessPoints = await Http.GetFromJsonAsync($"{Paths.Doors}/available"); + _availableAccessPoints = await FlexApi.GetAvailableCredReadersAsync(); _availableControlPoints = await FlexApi.GetAvailableActuatorsAsync(); _addDoor = new Door {InAccessEndpointId = -1, OutAccessEndpointId = -1, DoorStrikeEndpointId = -1}; @@ -258,16 +249,17 @@ else if (_addDoor.InAccessEndpointId == -1) _addDoor.InAccessEndpointId = null; if (_addDoor.OutAccessEndpointId == -1) _addDoor.OutAccessEndpointId = null; if (_addDoor.DoorStrikeEndpointId == -1) _addDoor.DoorStrikeEndpointId = null; - - string url = string.Format(Paths.Doors); - var response = await Http.PutAsync(url, - new StringContent(JsonSerializer.Serialize(_addDoor), Encoding.UTF8, "application/json")); - if (!response.IsSuccessStatusCode) + + try + { + await FlexApi.CreateDoorAsync(_addDoor); + } + catch { _snackbarMessage = "Unable to add door"; _snackbarColor = SnackbarColor.Danger; await _snackbar.Show(); - } + } } private async Task RemoveDoor(int doorId, string doorName) @@ -281,9 +273,11 @@ else return; } - string url = string.Format($"{Paths.Doors}/{doorId}"); - var response = await Http.DeleteAsync(url); - if (!response.IsSuccessStatusCode) + try + { + await FlexApi.DeleteDoorAsync(doorId); + } + catch { _snackbarMessage = "Unable to remove door"; _snackbarColor = SnackbarColor.Danger; @@ -306,11 +300,11 @@ else eventArgs.ErrorText = "Either a in or out access point must be selected"; } } - + private void ValidateDoorStrikeIsSelected(ValidatorEventArgs eventArgs) { eventArgs.Status = _addDoor.DoorStrikeEndpointId > -1 ? ValidationStatus.Success : ValidationStatus.Error; eventArgs.ErrorText = "A door strike must be selected"; } -} \ No newline at end of file +} diff --git a/src/Aporta.WebClient/Program.cs b/src/Aporta.WebClient/Program.cs index 5d51393..f520d46 100644 --- a/src/Aporta.WebClient/Program.cs +++ b/src/Aporta.WebClient/Program.cs @@ -32,9 +32,6 @@ public static async Task Main(string[] args) builder.Services.AddScoped(_ => new ExtensionCalls(new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) })); - builder.Services.AddScoped(_ => new DoorCalls(new HttpClient - { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) })); - builder.Services.AddScoped(); builder.Services.AddScoped(_ => new FlexApiService(new HttpClient diff --git a/src/Aporta/Controllers/DoorsController.cs b/src/Aporta/Controllers/DoorsController.cs index c9ed677..eb06b7d 100644 --- a/src/Aporta/Controllers/DoorsController.cs +++ b/src/Aporta/Controllers/DoorsController.cs @@ -16,40 +16,16 @@ public DoorsController(DoorConfigurationService doorConfigurationService) { _doorConfigurationService = doorConfigurationService; } - + [HttpGet] public async Task> Get() { return await _doorConfigurationService.GetAll(); } - + [HttpGet("{doorId:int}")] public async Task Get(int doorId) { return await _doorConfigurationService.Get(doorId); } - - [HttpPut] - public async Task Put([FromBody]Door door) - { - await _doorConfigurationService.Insert(door); - } - - [HttpDelete("{doorId:int}")] - public async Task Delete(int doorId) - { - await _doorConfigurationService.Delete(doorId); - } - - [HttpGet("available")] - public async Task> Available() - { - return await _doorConfigurationService.AvailableAccessPoints(); - } - - [HttpGet("endpointsavailable")] - public async Task> AvailableEndPoints() - { - return await _doorConfigurationService.AvailableEndPoints(); - } -} \ No newline at end of file +} diff --git a/src/Aporta/Controllers/Flex/FlexDevController.cs b/src/Aporta/Controllers/Flex/FlexDevController.cs index 883808f..f98b944 100644 --- a/src/Aporta/Controllers/Flex/FlexDevController.cs +++ b/src/Aporta/Controllers/Flex/FlexDevController.cs @@ -74,8 +74,85 @@ public override async Task List([FromQuery] int offset = 0, [From [Route("flex/door")] public class FlexDoorController : FlexDevTypeControllerBase { - public FlexDoorController(IDataAccess dataAccess) : base(dataAccess) { } + private readonly Z9DevRepository _repository; + private readonly DoorConfigurationService _doorConfigurationService; + + public FlexDoorController(IDataAccess dataAccess, + DoorConfigurationService doorConfigurationService) : base(dataAccess) + { + _repository = new Z9DevRepository(dataAccess); + _doorConfigurationService = doorConfigurationService; + } + protected override DevType FilterDevType => DevType.Door; + + [HttpGet("list")] + public override async Task List([FromQuery] int offset = 0, [FromQuery] int max = 50) + { + var doors = await _doorConfigurationService.GetAll(); + var all = doors.ToList(); + var count = all.Count; + var page = all.Skip(offset).Take(max).Select(d => + new FlexDev { Unid = d.Id, Name = d.Name }).ToList(); + + return Ok(new FlexListResponse + { + Offset = offset, + Max = max, + Count = count, + InstanceList = page, + }); + } + + [HttpPost("create")] + public async Task Create([FromBody] Aporta.Shared.Models.Door door) + { + await _doorConfigurationService.Insert(door); + return Ok(new FlexVoid()); + } + + public override async Task Delete(string id) + { + if (int.TryParse(id, out var unid)) + { + await _doorConfigurationService.Delete(unid); + return Ok(new FlexVoid()); + } + return BadRequest(); + } + + [HttpGet("available/readers")] + public async Task AvailableReaders() + { + var available = await _repository.GetAvailableByDevType(DevType.CredReader); + var list = available.Select(ToFlex).ToList(); + return Ok(new FlexListResponse + { + Offset = 0, + Max = list.Count, + Count = list.Count, + InstanceList = list, + }); + } + + [HttpGet("available/endpoints")] + public async Task AvailableEndpoints() + { + var endpoints = await _doorConfigurationService.AvailableEndPoints(); + var list = endpoints.Select(e => new FlexDev + { + Unid = e.Id, + Name = e.Name, + ExternalId = e.DriverEndpointId, + }).ToList(); + return Ok(new FlexListResponse + { + Offset = 0, + Max = list.Count, + Count = list.Count, + InstanceList = list, + }); + } } [ApiController] diff --git a/src/Drivers/Aporta.Drivers.Virtual.WebClient/Configuration.razor b/src/Drivers/Aporta.Drivers.Virtual.WebClient/Configuration.razor index b7c96ef..f1b661d 100644 --- a/src/Drivers/Aporta.Drivers.Virtual.WebClient/Configuration.razor +++ b/src/Drivers/Aporta.Drivers.Virtual.WebClient/Configuration.razor @@ -4,11 +4,12 @@ @using Aporta.Shared.Calls @using Aporta.Shared.Models +@using Aporta.Shared.Models.Flex @using Aporta.Drivers.Virtual.Shared.Actions @using Aporta.Drivers.Virtual.WebClient.Dialogs @inject IDriverConfigurationCalls ConfigurationCalls; -@inject IDoorCalls DoorCalls; +@inject FlexApiService FlexApi; @if (_configuration == null) { @@ -205,7 +206,7 @@ else private BadgeSwipeDialog _badgeSwipeDialog; - private Endpoint[] _availableEndPoints; + private FlexListResponse _availableEndPoints; private Aporta.Drivers.Virtual.Shared.Configuration _configuration; @@ -227,7 +228,7 @@ else private async Task InitializeAvailableEndpoints() { - _availableEndPoints = await DoorCalls.GetAvailableEndpoints(); + _availableEndPoints = await FlexApi.GetAvailableEndpointsAsync(); StateHasChanged(); } @@ -403,16 +404,16 @@ else private bool IsReaderAvailableForDelete(Device reader) { - return _availableEndPoints.Count(endpoint => endpoint.DriverEndpointId == $"VR{reader.Number}") > 0; + return _availableEndPoints.InstanceList.Count(dev => dev.ExternalId == $"VR{reader.Number}") > 0; } private bool IsInputAvailableForDelete(Device input) { - return _availableEndPoints.Count(endpoint => endpoint.DriverEndpointId == $"VI{input.Number}") > 0; + return _availableEndPoints.InstanceList.Count(dev => dev.ExternalId == $"VI{input.Number}") > 0; } private bool IsOutputAvailableForDelete(Device output) { - return _availableEndPoints.Count(endpoint => endpoint.DriverEndpointId == $"VO{output.Number}") > 0; + return _availableEndPoints.InstanceList.Count(dev => dev.ExternalId == $"VO{output.Number}") > 0; } } \ No newline at end of file diff --git a/test/Drivers/Virtual/Aporta.Drivers.Virtual.WebClient.Tests/ConfigurationTest.cs b/test/Drivers/Virtual/Aporta.Drivers.Virtual.WebClient.Tests/ConfigurationTest.cs index 3e8faf2..b7ea836 100644 --- a/test/Drivers/Virtual/Aporta.Drivers.Virtual.WebClient.Tests/ConfigurationTest.cs +++ b/test/Drivers/Virtual/Aporta.Drivers.Virtual.WebClient.Tests/ConfigurationTest.cs @@ -1,6 +1,9 @@ +using System.Collections.Generic; +using System.Net.Http; using Aporta.Drivers.Virtual.Shared; using Aporta.Drivers.Virtual.Shared.Actions; using Aporta.Shared.Calls; +using Aporta.Shared.Models.Flex; using Blazorise; using Bunit; using Microsoft.Extensions.DependencyInjection; @@ -17,17 +20,19 @@ public class ConfigurationTest : AportaTestContext private const string EmptyConfiguration = "{\"Readers\":[],\"Outputs\":[],\"Inputs\":[]}"; private readonly Mock _mockConfigurationCalls = new(); - private readonly Mock _mockDoorCalls = new(); + private readonly Mock _mockFlexApi; private readonly Guid _extensionId = Guid.NewGuid(); private IRenderedComponent? _cut; - + public ConfigurationTest() { BlazoriseConfig.JSInterop.AddTextEdit(JSInterop); BlazoriseConfig.JSInterop.AddButton(JSInterop); + _mockFlexApi = new Mock(new HttpClient()) { CallBase = false }; + Services.AddScoped(_ => _mockConfigurationCalls.Object); } @@ -42,16 +47,20 @@ private Shared.Configuration SetUpDeviceConfiguration() return config; } - private void SetUpDoorMock() + private void SetUpFlexApiMock() { - Services.AddScoped(_ => _mockDoorCalls.Object); + _mockFlexApi.Setup(api => api.GetAvailableEndpointsAsync()) + .ReturnsAsync(new FlexListResponse { InstanceList = new List() }); + + Services.AddScoped(_ => _mockFlexApi.Object); } - private void SetUpDoorMock(Endpoint[] endpoints) - { - _mockDoorCalls.Setup(calls => calls.GetAvailableEndpoints()).ReturnsAsync(endpoints); + private void SetUpFlexApiMock(FlexDev[] endpoints) + { + _mockFlexApi.Setup(api => api.GetAvailableEndpointsAsync()) + .ReturnsAsync(new FlexListResponse { InstanceList = new List(endpoints) }); - Services.AddScoped(_ => _mockDoorCalls.Object); + Services.AddScoped(_ => _mockFlexApi.Object); } [Test] @@ -59,7 +68,7 @@ public async Task SwipeBadge() { // Arrange - SetUpDoorMock(); + SetUpFlexApiMock(); byte readerNumber = 1; var cardData = "2468"; @@ -96,7 +105,7 @@ public async Task SwipeBadge() public void ConfigurationComponentRendersCorrectly() { // Act - Render with an empty configuration - SetUpDoorMock(); + SetUpFlexApiMock(); _cut = RenderComponent(parameters => parameters .Add(p => p.RawConfiguration, EmptyConfiguration) @@ -113,7 +122,7 @@ public void ConfigurationComponentRendersCorrectly() public async Task AddReader() { // Arrange - SetUpDoorMock(); + SetUpFlexApiMock(); var emptyConfig = new Shared.Configuration(); @@ -152,21 +161,19 @@ public async Task EditReader() new() { Name = "Virtual Reader 3", Number = 3 } }; - Endpoint[] availableEndPoints = + FlexDev[] availableEndPoints = { new() { - ExtensionId = _extensionId, Type = EndpointType.Reader, - DriverEndpointId = $"VR{readersOnRazorPage[1].Number}", Id = readersOnRazorPage[1].Number + ExternalId = $"VR{readersOnRazorPage[1].Number}", Unid = readersOnRazorPage[1].Number }, new() { - ExtensionId = _extensionId, Type = EndpointType.Reader, - DriverEndpointId = $"VR{readersOnRazorPage[2].Number}", Id = readersOnRazorPage[2].Number + ExternalId = $"VR{readersOnRazorPage[2].Number}", Unid = readersOnRazorPage[2].Number } }; - SetUpDoorMock(availableEndPoints); + SetUpFlexApiMock(availableEndPoints); var config = new Shared.Configuration(); @@ -181,14 +188,14 @@ public async Task EditReader() !button.Instance.Disabled && button.Nodes[0].TextContent.Trim() == "Edit"); await _cut.InvokeAsync(async () => await editButton.Instance.Clicked.InvokeAsync()); - + var textEdit = _cut.Find("#NameTextEdit"); textEdit.Input("Edit Reader Name"); var modalEditButton = _cut.FindComponents [ApiController] -[Route("flex/binaryFormat")] +[Route("binaryFormat")] public class FlexBinaryFormatController : FlexCrudControllerBase { private readonly DataFormatRepository _repository; diff --git a/src/Aporta/Controllers/Flex/FlexCredController.cs b/src/Aporta/Controllers/Flex/FlexCredController.cs index 077a3a5..e0e886e 100644 --- a/src/Aporta/Controllers/Flex/FlexCredController.cs +++ b/src/Aporta/Controllers/Flex/FlexCredController.cs @@ -13,7 +13,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/cred")] +[Route("cred")] public class FlexCredController : FlexCrudControllerBase { private readonly Z9CredRepository _repository; diff --git a/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs b/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs index 5a3bb6b..b54196d 100644 --- a/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs +++ b/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs @@ -8,7 +8,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/credTemplate")] +[Route("credTemplate")] public class FlexCredTemplateController : FlexCrudControllerBase { private readonly CredTemplateRepository _repository; diff --git a/src/Aporta/Controllers/Flex/FlexDataFormatController.cs b/src/Aporta/Controllers/Flex/FlexDataFormatController.cs index 06f2b7a..37bcad2 100644 --- a/src/Aporta/Controllers/Flex/FlexDataFormatController.cs +++ b/src/Aporta/Controllers/Flex/FlexDataFormatController.cs @@ -8,7 +8,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/dataFormat")] +[Route("dataFormat")] public class FlexDataFormatController : FlexCrudControllerBase { private readonly DataFormatRepository _repository; diff --git a/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs b/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs index 28f19ce..4ed679f 100644 --- a/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs +++ b/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs @@ -8,7 +8,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/dataLayout")] +[Route("dataLayout")] public class FlexDataLayoutController : FlexCrudControllerBase { private readonly DataLayoutRepository _repository; diff --git a/src/Aporta/Controllers/Flex/FlexDevController.cs b/src/Aporta/Controllers/Flex/FlexDevController.cs index f98b944..64b27a6 100644 --- a/src/Aporta/Controllers/Flex/FlexDevController.cs +++ b/src/Aporta/Controllers/Flex/FlexDevController.cs @@ -14,7 +14,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/dev")] +[Route("dev")] public class FlexDevController : FlexCrudControllerBase { private readonly Z9DevRepository _repository; @@ -71,7 +71,7 @@ public override async Task List([FromQuery] int offset = 0, [From } [ApiController] -[Route("flex/door")] +[Route("door")] public class FlexDoorController : FlexDevTypeControllerBase { private readonly Z9DevRepository _repository; @@ -156,7 +156,7 @@ public async Task AvailableEndpoints() } [ApiController] -[Route("flex/credReader")] +[Route("credReader")] public class FlexCredReaderController : FlexDevTypeControllerBase { public FlexCredReaderController(IDataAccess dataAccess) : base(dataAccess) { } @@ -164,7 +164,7 @@ public FlexCredReaderController(IDataAccess dataAccess) : base(dataAccess) { } } [ApiController] -[Route("flex/controller")] +[Route("controller")] public class FlexControllerController : FlexDevTypeControllerBase { public FlexControllerController(IDataAccess dataAccess) : base(dataAccess) { } @@ -172,7 +172,7 @@ public FlexControllerController(IDataAccess dataAccess) : base(dataAccess) { } } [ApiController] -[Route("flex/sensor")] +[Route("sensor")] public class FlexSensorController : FlexDevTypeControllerBase { private readonly Z9DevRepository _repository; @@ -264,7 +264,7 @@ public async Task GetState(int id) } [ApiController] -[Route("flex/actuator")] +[Route("actuator")] public class FlexActuatorController : FlexDevTypeControllerBase { private readonly Z9DevRepository _repository; @@ -380,7 +380,7 @@ public async Task SetState(int id, [FromQuery] bool state) } [ApiController] -[Route("flex/nodeDev")] +[Route("nodeDev")] public class FlexNodeDevController : FlexDevTypeControllerBase { public FlexNodeDevController(IDataAccess dataAccess) : base(dataAccess) { } diff --git a/src/Aporta/Controllers/Flex/FlexDevStateRecordController.cs b/src/Aporta/Controllers/Flex/FlexDevStateRecordController.cs index bc8bba9..9ea7975 100644 --- a/src/Aporta/Controllers/Flex/FlexDevStateRecordController.cs +++ b/src/Aporta/Controllers/Flex/FlexDevStateRecordController.cs @@ -6,7 +6,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/devStateRecord")] +[Route("devStateRecord")] public class FlexDevStateRecordController : ControllerBase { private readonly DevStateService _devStateService; diff --git a/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs b/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs index 9e2f8d9..3384d91 100644 --- a/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs +++ b/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs @@ -8,7 +8,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/doorAccessPriv")] +[Route("doorAccessPriv")] public class FlexDoorAccessPrivController : FlexCrudControllerBase { private readonly PrivRepository _repository; diff --git a/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs b/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs index 505b114..82b44a8 100644 --- a/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs +++ b/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs @@ -8,7 +8,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/encryptionKey")] +[Route("encryptionKey")] public class FlexEncryptionKeyController : FlexCrudControllerBase { private readonly EncryptionKeyRepository _repository; diff --git a/src/Aporta/Controllers/Flex/FlexEvtController.cs b/src/Aporta/Controllers/Flex/FlexEvtController.cs index cf2c0e5..05a1c7f 100644 --- a/src/Aporta/Controllers/Flex/FlexEvtController.cs +++ b/src/Aporta/Controllers/Flex/FlexEvtController.cs @@ -10,7 +10,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/evt")] +[Route("evt")] public class FlexEvtController : ControllerBase { private readonly Z9EvtRepository _repository; diff --git a/src/Aporta/Controllers/Flex/FlexHolCalController.cs b/src/Aporta/Controllers/Flex/FlexHolCalController.cs index 8ea68eb..39e7166 100644 --- a/src/Aporta/Controllers/Flex/FlexHolCalController.cs +++ b/src/Aporta/Controllers/Flex/FlexHolCalController.cs @@ -8,7 +8,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/holCal")] +[Route("holCal")] public class FlexHolCalController : FlexCrudControllerBase { private readonly HolCalRepository _repository; diff --git a/src/Aporta/Controllers/Flex/FlexHolController.cs b/src/Aporta/Controllers/Flex/FlexHolController.cs index 0a4df59..0f5fdcd 100644 --- a/src/Aporta/Controllers/Flex/FlexHolController.cs +++ b/src/Aporta/Controllers/Flex/FlexHolController.cs @@ -8,7 +8,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/hol")] +[Route("hol")] public class FlexHolController : FlexCrudControllerBase { private readonly HolRepository _repository; diff --git a/src/Aporta/Controllers/Flex/FlexHolTypeController.cs b/src/Aporta/Controllers/Flex/FlexHolTypeController.cs index f212ca5..828517f 100644 --- a/src/Aporta/Controllers/Flex/FlexHolTypeController.cs +++ b/src/Aporta/Controllers/Flex/FlexHolTypeController.cs @@ -8,7 +8,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/holType")] +[Route("holType")] public class FlexHolTypeController : FlexCrudControllerBase { private readonly HolTypeRepository _repository; diff --git a/src/Aporta/Controllers/Flex/FlexSchedController.cs b/src/Aporta/Controllers/Flex/FlexSchedController.cs index 626a579..eb42071 100644 --- a/src/Aporta/Controllers/Flex/FlexSchedController.cs +++ b/src/Aporta/Controllers/Flex/FlexSchedController.cs @@ -8,7 +8,7 @@ namespace Aporta.Controllers.Flex; [ApiController] -[Route("flex/sched")] +[Route("sched")] public class FlexSchedController : FlexCrudControllerBase { private readonly SchedRepository _repository; diff --git a/src/Aporta/Filters/FlexAuthFilter.cs b/src/Aporta/Filters/FlexAuthFilter.cs index a7ab1fc..6ce8596 100644 --- a/src/Aporta/Filters/FlexAuthFilter.cs +++ b/src/Aporta/Filters/FlexAuthFilter.cs @@ -15,14 +15,15 @@ public FlexAuthFilter(FlexSessionService sessionService) public void OnActionExecuting(ActionExecutingContext context) { - var path = context.HttpContext.Request.Path.Value; + var controllerType = context.Controller.GetType(); - // Skip auth check for authenticate endpoint - if (path != null && path.StartsWith("/flex/authenticate")) + // Only apply to Flex controllers (namespace Aporta.Controllers.Flex) + if (controllerType.Namespace == null || + !controllerType.Namespace.StartsWith("Aporta.Controllers.Flex")) return; - // Only apply to /flex/ routes - if (path == null || !path.StartsWith("/flex/")) + // Skip auth check for authenticate/terminate controller + if (controllerType.Name == "FlexAuthenticateController") return; var token = context.HttpContext.Request.Headers["sessionToken"].ToString(); diff --git a/test/Aporta.FlexClient.Integration.Tests/FlexClientIntegrationTest.cs b/test/Aporta.FlexClient.Integration.Tests/FlexClientIntegrationTest.cs index 4036a22..734b7a1 100644 --- a/test/Aporta.FlexClient.Integration.Tests/FlexClientIntegrationTest.cs +++ b/test/Aporta.FlexClient.Integration.Tests/FlexClientIntegrationTest.cs @@ -13,7 +13,7 @@ namespace Aporta.FlexClient.Integration.Tests; [TestFixture] public class FlexClientIntegrationTest { - private const string BaseUrl = "https://localhost:5001/flex"; + private const string BaseUrl = "https://localhost:5001"; private const int AportaStartupTimeoutSeconds = 60; private static readonly string AportaPath = From b33818af5680434423fe45eca02daddf5ca30d10 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Mon, 9 Feb 2026 23:22:26 -0500 Subject: [PATCH 69/86] Add OSDP LocalStatus handling for tamper and power cycle events Send TAMPER/TAMPER_NORMAL events with DevAspectState tracking when an OSDP reader reports a tamper state change, and CRED_READER_POWER_CYCLE when a reader reports it has power-cycled. Bump Z9.Protobuf.Community to 1.0.12 for the new TamperState enum. Co-Authored-By: Claude Opus 4.6 --- README.md | 4 +- src/Aporta.Core/Aporta.Core.csproj | 2 +- src/Aporta.Core/Services/ExtensionService.cs | 9 ++ .../Z9OpenCommunityProtocolService.cs | 91 ++++++++++++++++ .../Hardware/IHardwareDriver.cs | 2 + .../Hardware/LocalStatusChangedEventArgs.cs | 18 ++++ src/Aporta.Migration/Aporta.Migration.csproj | 2 +- src/Aporta/Aporta.csproj | 2 +- src/Aporta/Workers/StartupWorker.cs | 36 +++++++ .../Aporta.Drivers.IonoPi/IonoPiDriver.cs | 1 + .../IonoPiMaxDriver.cs | 5 +- src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs | 100 +++++++++++++++++- .../Aporta.Drivers.Virtual/VirtualDriver.cs | 3 + .../Aporta.Core.Tests.csproj | 2 +- .../Aporta.Migration.Tests.csproj | 2 +- test/Drivers/TestDriver/TestDriver.cs | 2 + 16 files changed, 271 insertions(+), 10 deletions(-) create mode 100644 src/Aporta.Extensions/Hardware/LocalStatusChangedEventArgs.cs diff --git a/README.md b/README.md index dd4a91c..3bff184 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,8 @@ Aporta supports the Z9/Flex Community Profile as a JSON/REST API, intended for u - Events - CONTROLLER_STARTUP on service start - MOMENTARY_UNLOCK audit trail when host initiates a momentary unlock action + - TAMPER / TAMPER_NORMAL events with dev state tracking when OSDP reader reports tamper + - CRED_READER_POWER_CYCLE event when OSDP reader reports power cycle ## API Architecture ## @@ -98,10 +100,8 @@ The web UI communicates with the server through the Z9/Flex Community Profile AP - EvtControl: Implement event flow control (StartContinuous, ConsumeUpTo) for generic delivery of events persisted while offline - Events: CONTROLLER_ONLINE / CONTROLLER_OFFLINE — distinguish controller restart from connection drop - Events: RAW_CRED_READ — audit trail of all card swipes regardless of access decision -- Events: CRED_READER_POWER_CYCLE — diagnostic event for reader restarts - Events: SCHED_ACTIVE / SCHED_INACTIVE — requires schedule evaluation engine on the controller - Events: Power/battery (POWER_PRIMARY/OFF_PRIMARY/NONE, BATTERY_OK/LOW/FAIL/CRITICAL) — requires power monitoring hardware -- Events: Tamper (TAMPER, TAMPER_NORMAL) — requires tamper sensors on readers ## Installation ## diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 303e9c7..0939531 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Core/Services/ExtensionService.cs b/src/Aporta.Core/Services/ExtensionService.cs index 57e9302..746d4c9 100644 --- a/src/Aporta.Core/Services/ExtensionService.cs +++ b/src/Aporta.Core/Services/ExtensionService.cs @@ -172,6 +172,8 @@ public Shared.Models.Extension GetExtension(Guid extensionId) public event EventHandler OnlineStatusChanged; + public event EventHandler LocalStatusChanged; + [MethodImpl(MethodImplOptions.NoInlining)] private async Task DiscoverExtensions() { @@ -252,6 +254,7 @@ private void LoadExtension(ExtensionHost extension) extension.Driver.AccessCredentialReceived += DriverOnAccessCredentialReceived; extension.Driver.StateChanged += DriverOnStateChanged; extension.Driver.OnlineStatusChanged += DriverOnOnlineStatusChanged; + extension.Driver.LocalStatusChanged += DriverOnLocalStatusChanged; extension.Driver.Load(extension.Configuration, dataEncryption, loggerFactory); extension.Configuration = extension.Driver.CurrentConfiguration(); @@ -395,6 +398,11 @@ private void DriverOnOnlineStatusChanged(object sender, OnlineStatusChangedEvent OnlineStatusChanged?.Invoke(this, eventArgs); } + private void DriverOnLocalStatusChanged(object sender, LocalStatusChangedEventArgs eventArgs) + { + LocalStatusChanged?.Invoke(this, eventArgs); + } + private async Task SaveCurrentConfiguration(ExtensionHost extension) { try @@ -439,6 +447,7 @@ private void UnloadExtension(ExtensionHost extension) extension.Driver.AccessCredentialReceived -= DriverOnAccessCredentialReceived; extension.Driver.StateChanged -= DriverOnStateChanged; extension.Driver.OnlineStatusChanged -= DriverOnOnlineStatusChanged; + extension.Driver.LocalStatusChanged -= DriverOnLocalStatusChanged; extension.Host.Unload(); extension.Loaded = false; diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index e13828e..11c45af 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -1386,6 +1386,97 @@ public void SendAccessEvent(OsdpReaderConfig config, bool isGranted, BigInteger? WriteMessage(message); } + /// + /// Sends a TAMPER or TAMPER_NORMAL event to Z9. + /// + public void SendTamperEvent(OsdpReaderConfig config, bool isTamper) + { + if (config == null) + { + _logger.LogWarning("Cannot send tamper event: config is null"); + return; + } + + var evtCode = isTamper ? EvtCode.Tamper : EvtCode.TamperNormal; + var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); + + var evt = new Evt + { + EvtCode = evtCode, + HwTime = new DateTimeData { Millis = nowMillis }, + DbTime = new DateTimeData { Millis = nowMillis }, + Consumed = false, + Priority = 0, + EvtDevRef = new EvtDevRef + { + Unid = config.Unid, + Name = config.Name, + DevType = DevType.CredReader + } + }; + + _z9EvtRepository.Insert(evt).GetAwaiter().GetResult(); + + if (!IsConnected) + { + _logger.LogWarning("Cannot send tamper event: not connected"); + return; + } + + var message = new SpCoreMessage { Type = SpCoreMessage.Types.Type.Evt }; + message.Evt.Add(evt); + + _logger.LogInformation("Sending {EvtCode} event for reader {Name} (unid={Unid})", + evtCode, config.Name, config.Unid); + + WriteMessage(message); + } + + /// + /// Sends a CRED_READER_POWER_CYCLE event to Z9. + /// + public void SendCredReaderPowerCycleEvent(OsdpReaderConfig config) + { + if (config == null) + { + _logger.LogWarning("Cannot send power cycle event: config is null"); + return; + } + + var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); + + var evt = new Evt + { + EvtCode = EvtCode.CredReaderPowerCycle, + HwTime = new DateTimeData { Millis = nowMillis }, + DbTime = new DateTimeData { Millis = nowMillis }, + Consumed = false, + Priority = 0, + EvtDevRef = new EvtDevRef + { + Unid = config.Unid, + Name = config.Name, + DevType = DevType.CredReader + } + }; + + _z9EvtRepository.Insert(evt).GetAwaiter().GetResult(); + + if (!IsConnected) + { + _logger.LogWarning("Cannot send power cycle event: not connected"); + return; + } + + var message = new SpCoreMessage { Type = SpCoreMessage.Types.Type.Evt }; + message.Evt.Add(evt); + + _logger.LogInformation("Sending CRED_READER_POWER_CYCLE event for reader {Name} (unid={Unid})", + config.Name, config.Unid); + + WriteMessage(message); + } + /// /// Sends a door state event (unlocked/locked/opened/closed) to Z9. /// diff --git a/src/Aporta.Extensions/Hardware/IHardwareDriver.cs b/src/Aporta.Extensions/Hardware/IHardwareDriver.cs index 3279f81..aa37e83 100644 --- a/src/Aporta.Extensions/Hardware/IHardwareDriver.cs +++ b/src/Aporta.Extensions/Hardware/IHardwareDriver.cs @@ -56,4 +56,6 @@ public interface IHardwareDriver : IExtension public event EventHandler StateChanged; public event EventHandler OnlineStatusChanged; + + public event EventHandler LocalStatusChanged; } \ No newline at end of file diff --git a/src/Aporta.Extensions/Hardware/LocalStatusChangedEventArgs.cs b/src/Aporta.Extensions/Hardware/LocalStatusChangedEventArgs.cs new file mode 100644 index 0000000..52123fc --- /dev/null +++ b/src/Aporta.Extensions/Hardware/LocalStatusChangedEventArgs.cs @@ -0,0 +1,18 @@ +using System; +using Aporta.Extensions.Endpoint; + +namespace Aporta.Extensions.Hardware; + +public class LocalStatusChangedEventArgs : EventArgs +{ + public IEndpoint Endpoint { get; } + public bool? TamperState { get; } + public bool PowerCycleDetected { get; } + + public LocalStatusChangedEventArgs(IEndpoint endpoint, bool? tamperState, bool powerCycleDetected) + { + Endpoint = endpoint; + TamperState = tamperState; + PowerCycleDetected = powerCycleDetected; + } +} diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index cf5f9f8..57dcb12 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 62a99e6..a656c69 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 76a5459..84a4408 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -126,6 +126,9 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) // Subscribe to device online status changes to forward via community protocol _extensionService.OnlineStatusChanged += OnOnlineStatusChanged; + // Subscribe to local status changes (tamper, power cycle) from OSDP readers + _extensionService.LocalStatusChanged += OnLocalStatusChanged; + // Subscribe to access decisions to forward via community protocol _accessService.AccessDecisionMade += OnAccessDecisionMade; @@ -165,6 +168,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) _accessService.AccessDecisionMade -= OnAccessDecisionMade; _extensionService.StateChanged -= OnStateChanged; _z9OpenCommunityProtocolService.DevActionRequested -= OnDevActionRequested; + _extensionService.LocalStatusChanged -= OnLocalStatusChanged; _extensionService.OnlineStatusChanged -= OnOnlineStatusChanged; _z9OpenCommunityProtocolService.OsdpConfigurationReceived -= OnOsdpConfigurationReceived; _z9OpenCommunityProtocolService.Stop(); @@ -310,6 +314,9 @@ private async Task ConfigurePrimaryMode(string configPath) // Subscribe to online status changes for auto Door creation _extensionService.OnlineStatusChanged += OnOnlineStatusChanged; + // Subscribe to local status changes (tamper, power cycle) from OSDP readers + _extensionService.LocalStatusChanged += OnLocalStatusChanged; + // Subscribe to state changes for door contact/REX/strike tracking _extensionService.StateChanged += OnStateChanged; @@ -466,6 +473,35 @@ private void OnOnlineStatusChanged(object sender, OnlineStatusChangedEventArgs e s => s.CommState = e.IsOnline ? CommState.Online : CommState.Offline); } + private void OnLocalStatusChanged(object sender, LocalStatusChangedEventArgs e) + { + var endpointId = e.Endpoint?.Id; + if (string.IsNullOrEmpty(endpointId) || !IsReaderEndpoint(endpointId)) + return; + + var config = _z9OpenCommunityProtocolService.GetConfigForEndpoint(endpointId); + if (config == null) + { + _logger.LogDebug("No Z9 config found for endpoint {EndpointId}, skipping local status event", endpointId); + return; + } + + if (e.TamperState != null) + { + _logger.LogInformation("Reader {Name} tamper state: {TamperState}", + config.Name, e.TamperState.Value ? "TAMPER" : "NORMAL"); + _z9OpenCommunityProtocolService.SendTamperEvent(config, e.TamperState.Value); + _devStateService.UpdateAspect(config.Unid, DevAspect.Primary, + s => s.TamperState = e.TamperState.Value ? TamperState.Tamper : TamperState.Normal); + } + + if (e.PowerCycleDetected) + { + _logger.LogInformation("Reader {Name} power cycle detected", config.Name); + _z9OpenCommunityProtocolService.SendCredReaderPowerCycleEvent(config); + } + } + /// /// Checks if an OSDP endpoint ID represents a reader (vs output, input, etc.). /// Reader endpoint IDs end with ":R{number}" (e.g., "localhost:9843:0:R0"). diff --git a/src/Drivers/Aporta.Drivers.IonoPi/IonoPiDriver.cs b/src/Drivers/Aporta.Drivers.IonoPi/IonoPiDriver.cs index 84c7891..f74191d 100644 --- a/src/Drivers/Aporta.Drivers.IonoPi/IonoPiDriver.cs +++ b/src/Drivers/Aporta.Drivers.IonoPi/IonoPiDriver.cs @@ -85,6 +85,7 @@ public async Task PerformAction(string action, string parameters) public event EventHandler AccessCredentialReceived; public event EventHandler StateChanged; public event EventHandler OnlineStatusChanged; + public event EventHandler LocalStatusChanged; protected virtual void OnUpdatedEndpoints() { diff --git a/src/Drivers/Aporta.Drivers.IonoPiMax/IonoPiMaxDriver.cs b/src/Drivers/Aporta.Drivers.IonoPiMax/IonoPiMaxDriver.cs index 162eede..45140b5 100644 --- a/src/Drivers/Aporta.Drivers.IonoPiMax/IonoPiMaxDriver.cs +++ b/src/Drivers/Aporta.Drivers.IonoPiMax/IonoPiMaxDriver.cs @@ -182,9 +182,12 @@ protected virtual void OnStateChanged(IEndpoint endpoint, bool state) /// public event EventHandler? OnlineStatusChanged; - + protected virtual void OnOnlineStatusChanged(OnlineStatusChangedEventArgs eventArgs) { OnlineStatusChanged?.Invoke(this, eventArgs); } + + /// + public event EventHandler? LocalStatusChanged; } \ No newline at end of file diff --git a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs index e7004f6..1b82efa 100644 --- a/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs +++ b/src/Drivers/Aporta.Drivers.OSDP/OSDPDriver.cs @@ -37,6 +37,7 @@ public class OSDPDriver : IHardwareDriver private readonly ConcurrentDictionary _pkocDevices = new(); private readonly ConcurrentDictionary _connections = new(); private readonly ConcurrentDictionary<(Guid connectionId, byte address), (string pin, CancellationTokenSource cts)> _pendingPins = new(); + private readonly ConcurrentDictionary<(Guid connectionId, byte address), (bool tamper, bool power)> _lastLocalStatus = new(); private const int PinBufferTimeoutMs = 5000; private ControlPanel _panel; @@ -64,7 +65,8 @@ public void Load(string configuration, IDataEncryption dataEncryption, ILoggerFa _panel.InputStatusReportReplyReceived += PanelOnInputStatusReportReplyReceived; _panel.OutputStatusReportReplyReceived += PanelOnOutputStatusReportReplyReceived; _panel.NakReplyReceived += PanelOnNakReplyReceived; - + _panel.LocalStatusReportReplyReceived += PanelOnLocalStatusReportReplyReceived; + _pkocPanel.CardPresented += PkocPanelOnCardPresented; ExtractConfiguration(configuration); @@ -168,6 +170,9 @@ private void PanelOnConnectionStatusChanged(object sender, ControlPanel.Connecti } _logger.LogInformation("ProcessDeviceCapabilities succeeded"); + // Query initial local status (tamper / power cycle) + await QueryInitialLocalStatus(eventArgs.ConnectionId, eventArgs.Address, matchingBus.PortName); + matchingDevice.IsConnected = true; // Notify that all endpoints on this device are now online @@ -645,7 +650,8 @@ public void Unload() _panel.InputStatusReportReplyReceived -= PanelOnInputStatusReportReplyReceived; _panel.OutputStatusReportReplyReceived -= PanelOnOutputStatusReportReplyReceived; _panel.NakReplyReceived -= PanelOnNakReplyReceived; - + _panel.LocalStatusReportReplyReceived -= PanelOnLocalStatusReportReplyReceived; + _pkocPanel.CardPresented -= PkocPanelOnCardPresented; } @@ -693,6 +699,7 @@ public async Task PerformAction(string action, string parameters) public event EventHandler AccessCredentialReceived; public event EventHandler StateChanged; public event EventHandler OnlineStatusChanged; + public event EventHandler LocalStatusChanged; private string AddBus(string parameters) { @@ -952,4 +959,93 @@ private void NotifyEndpointOnlineStatus(string portName, byte address, bool isOn OnOnlineStatusChanged(new OnlineStatusChangedEventArgs(endpoint, isOnline)); } } + + private void PanelOnLocalStatusReportReplyReceived(object sender, + ControlPanel.LocalStatusReportReplyEventArgs eventArgs) + { + Task.Run(() => + { + try + { + var key = (eventArgs.ConnectionId, eventArgs.Address); + var currentTamper = eventArgs.LocalStatus.Tamper; + var currentPower = eventArgs.LocalStatus.PowerFailure; + + var previous = _lastLocalStatus.TryGetValue(key, out var prev) ? prev : (tamper: false, power: false); + + var tamperChanged = previous.tamper != currentTamper; + var powerCycleDetected = !previous.power && currentPower; + + _lastLocalStatus[key] = (currentTamper, currentPower); + + if (!tamperChanged && !powerCycleDetected) return; + + var readerEndpoint = FindReaderEndpoint(eventArgs.ConnectionId, eventArgs.Address); + if (readerEndpoint == null) + { + _logger.LogDebug("No reader endpoint found for LocalStatus at address {Address}", eventArgs.Address); + return; + } + + _logger.LogInformation( + "LocalStatus change on {EndpointName}: tamperChanged={TamperChanged} (tamper={Tamper}), powerCycleDetected={PowerCycleDetected}", + readerEndpoint.Name, tamperChanged, currentTamper, powerCycleDetected); + + LocalStatusChanged?.Invoke(this, new LocalStatusChangedEventArgs( + readerEndpoint, + tamperChanged ? currentTamper : null, + powerCycleDetected)); + } + catch (Exception ex) + { + _logger.LogError(ex, "Error in PanelOnLocalStatusReportReplyReceived"); + } + }); + } + + private async Task QueryInitialLocalStatus(Guid connectionId, byte address, string portName) + { + try + { + var localStatus = await _panel.LocalStatus(connectionId, address).ConfigureAwait(false); + if (localStatus == null) return; + + var key = (connectionId, address); + _lastLocalStatus[key] = (localStatus.Tamper, localStatus.PowerFailure); + + var tamperActive = localStatus.Tamper; + // Power flag is expected to be true on first connect (reader just started) + var powerCycleDetected = localStatus.PowerFailure; + + if (!tamperActive && !powerCycleDetected) return; + + var readerEndpoint = FindReaderEndpoint(connectionId, address); + if (readerEndpoint == null) return; + + _logger.LogInformation( + "Initial LocalStatus for {EndpointName}: tamper={Tamper}, powerCycle={PowerCycle}", + readerEndpoint.Name, tamperActive, powerCycleDetected); + + LocalStatusChanged?.Invoke(this, new LocalStatusChangedEventArgs( + readerEndpoint, + tamperActive ? true : null, + powerCycleDetected)); + } + catch (Exception ex) + { + _logger.LogWarning(ex, "Unable to query initial local status for address {Address}", address); + } + } + + private IEndpoint FindReaderEndpoint(Guid connectionId, byte address) + { + return _endpoints.FirstOrDefault(e => + { + var (portName, addr) = ParseEndpointId(e.Id); + return _portMapping.TryGetValue(portName, out var connId) && + connId == connectionId && + addr == address.ToString() && + e.Id.EndsWith($":R0"); + }); + } } \ No newline at end of file diff --git a/src/Drivers/Aporta.Drivers.Virtual/VirtualDriver.cs b/src/Drivers/Aporta.Drivers.Virtual/VirtualDriver.cs index 71ad8c8..f570931 100644 --- a/src/Drivers/Aporta.Drivers.Virtual/VirtualDriver.cs +++ b/src/Drivers/Aporta.Drivers.Virtual/VirtualDriver.cs @@ -340,6 +340,9 @@ protected virtual void OnOnlineStatusChanged(OnlineStatusChangedEventArgs eventA OnlineStatusChanged?.Invoke(this, eventArgs); } + /// + public event EventHandler? LocalStatusChanged; + private class VirtualCredentialReceivedHandler(string cardData) : ICredentialReceivedHandler { public bool IsValid() diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 9579cd0..a862396 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index eb2b3fc..6ec1d0e 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Drivers/TestDriver/TestDriver.cs b/test/Drivers/TestDriver/TestDriver.cs index 43c7451..352d540 100644 --- a/test/Drivers/TestDriver/TestDriver.cs +++ b/test/Drivers/TestDriver/TestDriver.cs @@ -119,6 +119,8 @@ public Task PerformAction(string action, string parameters) public event EventHandler OnlineStatusChanged; + public event EventHandler LocalStatusChanged; + protected virtual void OnUpdatedEndpoints() { UpdatedEndpoints?.Invoke(this, EventArgs.Empty); From b726d88829a1cee545a3eea6f50a1d405df436d3 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Mon, 9 Feb 2026 23:40:50 -0500 Subject: [PATCH 70/86] Add SCHED_ACTIVE / SCHED_INACTIVE events with per-minute schedule evaluation Evaluates all schedules once per minute (aligned to minute boundary) using SchedEvaluator.InSched, tracks active/inactive state, and reports transitions as SCHED_ACTIVE (127) / SCHED_INACTIVE (128) events. Events are persisted to z9_evt and sent over the wire when connected. Co-Authored-By: Claude Opus 4.6 --- README.md | 4 +- .../Z9OpenCommunityProtocolService.cs | 120 ++++++++++++++++++ src/Aporta/Workers/StartupWorker.cs | 2 + 3 files changed, 124 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3bff184..ceadce5 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,8 @@ Aporta supports the Z9/Flex Community Profile as a JSON/REST API, intended for u - MOMENTARY_UNLOCK audit trail when host initiates a momentary unlock action - TAMPER / TAMPER_NORMAL events with dev state tracking when OSDP reader reports tamper - CRED_READER_POWER_CYCLE event when OSDP reader reports power cycle + - RAW_CRED_READ event in primary mode for credential enrollment + - SCHED_ACTIVE / SCHED_INACTIVE events with per-minute schedule evaluation ## API Architecture ## @@ -99,8 +101,6 @@ The web UI communicates with the server through the Z9/Flex Community Profile AP - DbChange: Handle device deletions (devDelete, devDeleteAll) — currently silently ignored, causing stale devices to accumulate - EvtControl: Implement event flow control (StartContinuous, ConsumeUpTo) for generic delivery of events persisted while offline - Events: CONTROLLER_ONLINE / CONTROLLER_OFFLINE — distinguish controller restart from connection drop -- Events: RAW_CRED_READ — audit trail of all card swipes regardless of access decision -- Events: SCHED_ACTIVE / SCHED_INACTIVE — requires schedule evaluation engine on the controller - Events: Power/battery (POWER_PRIMARY/OFF_PRIMARY/NONE, BATTERY_OK/LOW/FAIL/CRITICAL) — requires power monitoring hardware ## Installation ## diff --git a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs index 11c45af..679a3e3 100644 --- a/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs +++ b/src/Aporta.Core/Services/Z9OpenCommunityProtocolService.cs @@ -89,6 +89,10 @@ public class OsdpReaderConfig private readonly DevStateService _devStateService; private volatile bool _continuousDevStateRecord; + // Schedule evaluation state + private readonly Dictionary _schedActiveState = new(); // unid -> was active + private Timer _schedTimer; + private Thread _thread; private volatile bool _stopping; private TcpClient _client; @@ -139,10 +143,13 @@ public void Start(string host, int port, string id = null) _thread = new Thread(() => Run(host, port)) { IsBackground = true, Name = "Z9OpenCommunityProtocolService" }; _thread.Start(); + + StartScheduleEvaluation(); } public void Stop() { + StopScheduleEvaluation(); _stopping = true; _client?.Close(); _thread?.Join(TimeSpan.FromSeconds(5)); @@ -152,6 +159,7 @@ public void Stop() public void Dispose() { + StopScheduleEvaluation(); Stop(); } @@ -1543,6 +1551,118 @@ public void SendDoorStateEvent(OsdpReaderConfig config, EvtCode evtCode) WriteMessage(message); } + /// + /// Sends a SCHED_ACTIVE or SCHED_INACTIVE event. + /// + private void SendSchedEvent(Sched sched, bool isActive) + { + var evtCode = isActive ? EvtCode.SchedActive : EvtCode.SchedInactive; + var nowMillis = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); + + var evt = new Evt + { + EvtCode = evtCode, + HwTime = new DateTimeData { Millis = nowMillis }, + DbTime = new DateTimeData { Millis = nowMillis }, + Consumed = false, + Priority = 0, + EvtSchedRef = new EvtSchedRef + { + Unid = sched.Unid, + Name = sched.Name ?? $"Schedule {sched.Unid}", + Invert = false + } + }; + + _z9EvtRepository.Insert(evt).GetAwaiter().GetResult(); + + if (!IsConnected) + { + _logger.LogDebug("Schedule event persisted but not sent (not connected): {EvtCode} for schedule {Name} (unid={Unid})", + evtCode, sched.Name, sched.Unid); + return; + } + + var message = new SpCoreMessage { Type = SpCoreMessage.Types.Type.Evt }; + message.Evt.Add(evt); + + _logger.LogInformation("Sending {EvtCode} event for schedule {Name} (unid={Unid})", + evtCode, sched.Name, sched.Unid); + + WriteMessage(message); + } + + /// + /// Starts the per-minute schedule evaluation timer, aligned to the top of the next minute. + /// + public void StartScheduleEvaluation() + { + if (_schedTimer != null) + return; + + var now = DateTime.Now; + var nextMinute = new DateTime(now.Year, now.Month, now.Day, now.Hour, now.Minute, 0).AddMinutes(1); + var delayMs = (long)(nextMinute - now).TotalMilliseconds; + if (delayMs < 0) + delayMs = 0; + + _logger.LogInformation("Starting schedule evaluation timer (first tick in {DelayMs}ms)", delayMs); + + _schedTimer = new Timer(_ => EvaluateSchedules(), null, delayMs, 60_000); + } + + /// + /// Stops the schedule evaluation timer. + /// + public void StopScheduleEvaluation() + { + var timer = _schedTimer; + if (timer != null) + { + _schedTimer = null; + timer.Dispose(); + _logger.LogInformation("Schedule evaluation timer stopped"); + } + } + + private void EvaluateSchedules() + { + try + { + var schedules = _schedRepository.GetAll().GetAwaiter().GetResult(); + var holidays = _holRepository.GetAll().GetAwaiter().GetResult(); + var now = DateTime.Now; + + foreach (var sched in schedules) + { + var isActive = SchedEvaluator.InSched(now, sched, holidays); + + if (_schedActiveState.TryGetValue(sched.Unid, out var wasActive)) + { + // State exists — only fire on transition + if (isActive != wasActive) + { + _schedActiveState[sched.Unid] = isActive; + SendSchedEvent(sched, isActive); + } + } + else + { + // First evaluation — store state, fire only if active + _schedActiveState[sched.Unid] = isActive; + if (isActive) + { + SendSchedEvent(sched, true); + } + } + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Error evaluating schedules"); + } + } + private void WriteMessage(SpCoreMessage message) { lock (_writeLock) diff --git a/src/Aporta/Workers/StartupWorker.cs b/src/Aporta/Workers/StartupWorker.cs index 84a4408..eb4576b 100644 --- a/src/Aporta/Workers/StartupWorker.cs +++ b/src/Aporta/Workers/StartupWorker.cs @@ -150,6 +150,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) if (isPrimaryConfigMode) { await ConfigurePrimaryMode(primaryConfigPath); + _z9OpenCommunityProtocolService.StartScheduleEvaluation(); } } } @@ -165,6 +166,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) { _logger.LogWarning("Application is shutting down"); CancelAllDoorHeldTimers(); + _z9OpenCommunityProtocolService.StopScheduleEvaluation(); _accessService.AccessDecisionMade -= OnAccessDecisionMade; _extensionService.StateChanged -= OnStateChanged; _z9OpenCommunityProtocolService.DevActionRequested -= OnDevActionRequested; From 8ea07416ece43a99008453e66431087936ecf2a2 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Mon, 9 Feb 2026 23:50:54 -0500 Subject: [PATCH 71/86] Clarify CONTROLLER_ONLINE/OFFLINE TODO as subcontroller-scoped Co-Authored-By: Claude Opus 4.6 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ceadce5..ebdeacb 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ The web UI communicates with the server through the Z9/Flex Community Profile AP ### Z9/Open Community Profile - DbChange: Handle device deletions (devDelete, devDeleteAll) — currently silently ignored, causing stale devices to accumulate - EvtControl: Implement event flow control (StartContinuous, ConsumeUpTo) for generic delivery of events persisted while offline -- Events: CONTROLLER_ONLINE / CONTROLLER_OFFLINE — distinguish controller restart from connection drop +- Events: CONTROLLER_ONLINE / CONTROLLER_OFFLINE — for IO_CONTROLLER_SUB subcontrollers (requires subcontroller device model first) - Events: Power/battery (POWER_PRIMARY/OFF_PRIMARY/NONE, BATTERY_OK/LOW/FAIL/CRITICAL) — requires power monitoring hardware ## Installation ## From a9e27d4a3458fa383f8e0b0e3dc90b7f7ff50288 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Tue, 10 Feb 2026 09:48:18 -0500 Subject: [PATCH 72/86] Update TODO: clarify power/battery event prerequisite Co-Authored-By: Claude Opus 4.6 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ebdeacb..09d259d 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ The web UI communicates with the server through the Z9/Flex Community Profile AP - DbChange: Handle device deletions (devDelete, devDeleteAll) — currently silently ignored, causing stale devices to accumulate - EvtControl: Implement event flow control (StartContinuous, ConsumeUpTo) for generic delivery of events persisted while offline - Events: CONTROLLER_ONLINE / CONTROLLER_OFFLINE — for IO_CONTROLLER_SUB subcontrollers (requires subcontroller device model first) -- Events: Power/battery (POWER_PRIMARY/OFF_PRIMARY/NONE, BATTERY_OK/LOW/FAIL/CRITICAL) — requires power monitoring hardware +- Events: Power/battery (POWER_PRIMARY/OFF_PRIMARY/NONE, BATTERY_OK/LOW/FAIL/CRITICAL) — needs a way of expressing that an input/sensor is used for this purpose ## Installation ## From d34b8524efbee3ed5e06b5b7081676c0c23c76fc Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Tue, 10 Feb 2026 13:49:11 -0500 Subject: [PATCH 73/86] Populate event refs, add Card Read label, and enroll from raw reads - Populate EvtDevRef and EvtCredRef in InsertAccessEvt so monitoring page shows device and credential columns for access events - Add EvtCode 17 "Card Read" to FlexEvtCodeHelper - Revert auto-credential creation on badge swipe; swipes now only produce RAW_CRED_READ events - Add enroll-from-read flow: raw reads API endpoint, enroll-from-read controller endpoint, and updated Credentials.razor enrollment UI to select from raw card reads instead of unassigned credentials - Update Selenium tests to verify new enrollment dropdown and monitoring page device/credential assertions Co-Authored-By: Claude Opus 4.6 --- .gitignore | 3 + .../Repositories/Z9EvtRepository.cs | 43 ++ src/Aporta.Core/Services/AccessService.cs | 22 +- src/Aporta.Shared/Calls/FlexApiService.cs | 10 + .../Models/Flex/FlexEvtCodeHelper.cs | 1 + .../Pages/configuration/Credentials.razor | 28 +- src/Aporta.sln | 11 + .../Controllers/Flex/FlexCredController.cs | 56 ++ .../Controllers/Flex/FlexEvtController.cs | 14 + .../AccessGrantedTest.cs | 628 ++++++++++++++++++ .../Aporta.Selenium.Tests.csproj | 17 + .../HomePageSmokeTest.cs | 168 +++++ 12 files changed, 984 insertions(+), 17 deletions(-) create mode 100644 test/Aporta.Selenium.Tests/AccessGrantedTest.cs create mode 100644 test/Aporta.Selenium.Tests/Aporta.Selenium.Tests.csproj create mode 100644 test/Aporta.Selenium.Tests/HomePageSmokeTest.cs diff --git a/.gitignore b/.gitignore index f5b4c14..e37d81f 100644 --- a/.gitignore +++ b/.gitignore @@ -350,3 +350,6 @@ MigrationBackup/ .ionide/ .idea/ + +# Selenium screenshots +screenshots/ diff --git a/src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs b/src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs index fc79b9c..22b58d4 100644 --- a/src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/Z9EvtRepository.cs @@ -81,4 +81,47 @@ public async Task> GetAll(int pageNumber, int pageSize) TotalItems = await connection.ExecuteScalarAsync("SELECT COUNT(*) FROM z9_evt") }; } + + /// + /// Returns unconsumed RAW_CRED_READ events, most recent first. + /// + public async Task> GetUnconsumedRawReads() + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var results = await connection.QueryAsync<(int id, string data)>( + @"SELECT id, data FROM z9_evt + WHERE json_extract(data, '$.evtCode') = @evtCode + AND (json_extract(data, '$.consumed') IS NULL + OR json_extract(data, '$.consumed') = false) + ORDER BY id DESC", + new { evtCode = "EvtCode_RAW_CRED_READ" }); + + return results.Select(row => + { + var evt = Parser.Parse(row.data); + evt.Unid = row.id; + return evt; + }); + } + + /// + /// Marks an event as consumed by updating the proto JSON. + /// + public async Task MarkConsumed(int id) + { + var evt = await Get(id); + if (evt == null) return; + + evt.Consumed = true; + + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + var json = Formatter.Format(evt); + await connection.ExecuteAsync( + "UPDATE z9_evt SET data = @data WHERE id = @id", + new { id, data = json }); + } } diff --git a/src/Aporta.Core/Services/AccessService.cs b/src/Aporta.Core/Services/AccessService.cs index 3bced53..98855c5 100644 --- a/src/Aporta.Core/Services/AccessService.cs +++ b/src/Aporta.Core/Services/AccessService.cs @@ -2,6 +2,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; +using System.Numerics; using System.Text.Json; using System.Threading.Tasks; using Aporta.Core.DataAccess; @@ -309,8 +310,6 @@ private async Task ProcessAccessRequest(AccessCredentialReceivedEventArgs eventA if (assignedCredential == null) { - // Insert RAW_CRED_READ event with raw bits — credential will be created - // later from this event during enrollment await InsertRawCredReadEvt(matchingCardData, accessPoint.DriverEndpointId); } @@ -601,6 +600,25 @@ private async Task InsertAccessEvt(EventType eventType, EventReason reason, evt.EvtSubCode = evtSubCode.Value; } + if (eventData.Endpoint?.Id > 0) + { + evt.EvtDevRef = new EvtDevRef + { + Unid = eventData.Endpoint.Id, + Name = eventData.Endpoint.Name, + DevType = DevType.CredReader + }; + } + + if (eventData.Person != null) + { + evt.EvtCredRef = new EvtCredRef + { + Unid = eventData.Person.Id, + Name = $"{eventData.Person.LastName}, {eventData.Person.FirstName}" + }; + } + return await _z9EvtRepository.Insert(evt); } diff --git a/src/Aporta.Shared/Calls/FlexApiService.cs b/src/Aporta.Shared/Calls/FlexApiService.cs index b83d0c7..a60a9b0 100644 --- a/src/Aporta.Shared/Calls/FlexApiService.cs +++ b/src/Aporta.Shared/Calls/FlexApiService.cs @@ -66,6 +66,16 @@ public async Task EnrollCredAsync(int credentialId, int personId) return await FlexPostAsync($"cred/{credentialId}/enroll/{personId}"); } + public async Task> GetRawReadsAsync() + { + return await FlexGetAsync>("evt/raw-reads"); + } + + public async Task EnrollCredFromReadAsync(int personId, int evtId) + { + return await FlexPostAsync($"cred/{personId}/enroll-from-read/{evtId}"); + } + public async Task> GetDoorListAsync(int offset, int max) { return await FlexGetAsync>($"door/list?offset={offset}&max={max}"); diff --git a/src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs b/src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs index 31c2e4f..bcaacb2 100644 --- a/src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs +++ b/src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs @@ -11,6 +11,7 @@ public static string GetEvtCodeText(int? evtCode) 11 => "Controller Offline", 15 => "Credential Reader Online", 16 => "Credential Reader Offline", + 17 => "Card Read", 48 => "Access Granted", 49 => "Access Denied", 52 => "Door Forced", diff --git a/src/Aporta.WebClient/Pages/configuration/Credentials.razor b/src/Aporta.WebClient/Pages/configuration/Credentials.razor index 8af69c3..3a9772e 100644 --- a/src/Aporta.WebClient/Pages/configuration/Credentials.razor +++ b/src/Aporta.WebClient/Pages/configuration/Credentials.razor @@ -164,12 +164,12 @@ else - Select a credential to enroll + Select a card read to enroll - + @foreach (var rawRead in _availableRawReadsForEnrollment) { - Badge @availableCredential.CardPin?.CredNum + Badge @rawRead.Data (@(rawRead.EvtDevRef?.Name ?? "Unknown Reader")) } @@ -274,9 +274,9 @@ else private bool _addEnabled = true; private FlexCred _enrollCred; private FlexCred _detailsCred; - private int _enrollCredentialId; + private int _enrollRawReadId; - private List _availableCredentialsForEnrollment = new(); + private List _availableRawReadsForEnrollment = new(); private HubConnection _hubConnection; @@ -388,21 +388,19 @@ else { _enrollCred = cred; - var unassigned = _credentials.InstanceList - .Where(c => string.IsNullOrEmpty(c.Name) && !string.IsNullOrEmpty(c.CardPin?.CredNum)) - .OrderByDescending(c => c.Unid) - .ToList(); + var rawReadsResponse = await FlexApi.GetRawReadsAsync(); + var rawReads = rawReadsResponse?.InstanceList ?? new List(); - if (unassigned.Count == 0) + if (rawReads.Count == 0) { - _snackbarMessage = "No unassigned credentials are available. Swipe an unassigned card at a reader."; + _snackbarMessage = "No card reads available. Swipe an unassigned card at a reader."; _snackbarColor = SnackbarColor.Warning; await _snackbar.Show(); return; } - _availableCredentialsForEnrollment = unassigned; - _enrollCredentialId = _availableCredentialsForEnrollment.First().Unid ?? 0; + _availableRawReadsForEnrollment = rawReads; + _enrollRawReadId = (int)(_availableRawReadsForEnrollment.First().Unid ?? 0); await _enrollModal.Show(); } @@ -413,7 +411,7 @@ else try { - await FlexApi.EnrollCredAsync(_enrollCredentialId, _enrollCred.Unid.Value); + await FlexApi.EnrollCredFromReadAsync(_enrollCred.Unid.Value, _enrollRawReadId); _snackbarMessage = "Successfully enrolled person"; _snackbarColor = SnackbarColor.Success; } diff --git a/src/Aporta.sln b/src/Aporta.sln index 32330d7..cad18fe 100644 --- a/src/Aporta.sln +++ b/src/Aporta.sln @@ -104,6 +104,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aporta.Migration.Tests", ". EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aporta.FlexClient.Integration.Tests", "..\test\Aporta.FlexClient.Integration.Tests\Aporta.FlexClient.Integration.Tests.csproj", "{D13BE6EB-6B5F-455F-8300-5F0A2B76115C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aporta.Selenium.Tests", "..\test\Aporta.Selenium.Tests\Aporta.Selenium.Tests.csproj", "{04CC6030-B7E0-4453-B9BE-59FE530AD134}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -302,6 +304,14 @@ Global {D13BE6EB-6B5F-455F-8300-5F0A2B76115C}.Release|Any CPU.Build.0 = Release|Any CPU {D13BE6EB-6B5F-455F-8300-5F0A2B76115C}.Release|x86.ActiveCfg = Release|Any CPU {D13BE6EB-6B5F-455F-8300-5F0A2B76115C}.Release|x86.Build.0 = Release|Any CPU + {04CC6030-B7E0-4453-B9BE-59FE530AD134}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04CC6030-B7E0-4453-B9BE-59FE530AD134}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04CC6030-B7E0-4453-B9BE-59FE530AD134}.Debug|x86.ActiveCfg = Debug|Any CPU + {04CC6030-B7E0-4453-B9BE-59FE530AD134}.Debug|x86.Build.0 = Debug|Any CPU + {04CC6030-B7E0-4453-B9BE-59FE530AD134}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04CC6030-B7E0-4453-B9BE-59FE530AD134}.Release|Any CPU.Build.0 = Release|Any CPU + {04CC6030-B7E0-4453-B9BE-59FE530AD134}.Release|x86.ActiveCfg = Release|Any CPU + {04CC6030-B7E0-4453-B9BE-59FE530AD134}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -333,6 +343,7 @@ Global {FD09709D-A3DC-487B-AD25-26E5452DC811} = {72A10DAD-4C7D-4F7B-A8B2-BCE3D391F4A2} {1E07F94D-F040-4C9F-8236-39A679556D59} = {72A10DAD-4C7D-4F7B-A8B2-BCE3D391F4A2} {D13BE6EB-6B5F-455F-8300-5F0A2B76115C} = {2DFBFA3A-B289-4723-A630-C5240C7ADE85} + {04CC6030-B7E0-4453-B9BE-59FE530AD134} = {2DFBFA3A-B289-4723-A630-C5240C7ADE85} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {65C2BC8A-D61C-4643-BD0F-2670F6AA9D01} diff --git a/src/Aporta/Controllers/Flex/FlexCredController.cs b/src/Aporta/Controllers/Flex/FlexCredController.cs index e0e886e..e3836b1 100644 --- a/src/Aporta/Controllers/Flex/FlexCredController.cs +++ b/src/Aporta/Controllers/Flex/FlexCredController.cs @@ -1,3 +1,4 @@ +using System.Numerics; using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; @@ -18,12 +19,16 @@ public class FlexCredController : FlexCrudControllerBase { private readonly Z9CredRepository _repository; private readonly CredTemplateRepository _credTemplateRepository; + private readonly Z9EvtRepository _evtRepository; + private readonly Z9DevRepository _devRepository; private readonly IHubContext _hubContext; public FlexCredController(IDataAccess dataAccess, IHubContext hubContext) { _repository = new Z9CredRepository(dataAccess); _credTemplateRepository = new CredTemplateRepository(dataAccess); + _evtRepository = new Z9EvtRepository(dataAccess); + _devRepository = new Z9DevRepository(dataAccess); _hubContext = hubContext; } @@ -86,6 +91,57 @@ public async Task Enroll(int credentialId, int personId) return Ok(new FlexVoid()); } + [HttpPost("{personId:int}/enroll-from-read/{evtId:int}")] + public async Task EnrollFromRead(int personId, int evtId) + { + var personZ9Cred = await _repository.Get(personId); + if (personZ9Cred == null) + return NotFound("Person credential not found"); + + var evt = await _evtRepository.Get(evtId); + if (evt == null || evt.EvtCode != EvtCode.RawCredRead) + return NotFound("Raw read event not found"); + + var cardData = evt.Data; + if (string.IsNullOrEmpty(cardData)) + return BadRequest("Raw read event has no card data"); + + personZ9Cred.CardPin = new CardPin + { + CredNum = SpCoreProtoUtil.ToBigIntegerData(BigInteger.Parse(cardData)) + }; + + if (evt.EvtDevRef?.UnidCase == EvtDevRef.UnidOneofCase.Unid) + { + var readerDev = await _devRepository.Get(evt.EvtDevRef.Unid); + if (readerDev?.LogicalParentUnidCase == Dev.LogicalParentUnidOneofCase.LogicalParentUnid) + { + var doorDevUnid = readerDev.LogicalParentUnid; + var parentDev = await _devRepository.Get(doorDevUnid); + if (parentDev?.LogicalParentUnidCase == Dev.LogicalParentUnidOneofCase.LogicalParentUnid) + { + var grandparent = await _devRepository.Get(parentDev.LogicalParentUnid); + if (grandparent?.DevType == DevType.Door) + doorDevUnid = grandparent.Unid; + } + + personZ9Cred.PrivBindings.Add(new CredPrivBinding + { + DevAsDoorAccessPrivUnid = doorDevUnid + }); + } + } + + SpCoreProtoUtil.InitRequired(personZ9Cred); + await _repository.Upsert(personZ9Cred); + + await _evtRepository.MarkConsumed(evtId); + + await _hubContext.Clients.All.SendAsync(Methods.PersonUpdated, personId); + + return Ok(new FlexVoid()); + } + private async Task EnsureDefaultCredTemplate() { var existing = await _credTemplateRepository.Get(1); diff --git a/src/Aporta/Controllers/Flex/FlexEvtController.cs b/src/Aporta/Controllers/Flex/FlexEvtController.cs index 05a1c7f..488ed2f 100644 --- a/src/Aporta/Controllers/Flex/FlexEvtController.cs +++ b/src/Aporta/Controllers/Flex/FlexEvtController.cs @@ -36,6 +36,20 @@ public async Task List([FromQuery] int offset = 0, [FromQuery] in }); } + [HttpGet("raw-reads")] + public async Task RawReads() + { + var rawReads = await _repository.GetUnconsumedRawReads(); + + return Ok(new FlexListResponse + { + Offset = 0, + Max = 100, + Count = rawReads.Count(), + InstanceList = rawReads.Select(FlexMapper.ToFlex).ToList(), + }); + } + [HttpGet("show/{id}")] public async Task Show(string id) { diff --git a/test/Aporta.Selenium.Tests/AccessGrantedTest.cs b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs new file mode 100644 index 0000000..b5b8824 --- /dev/null +++ b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs @@ -0,0 +1,628 @@ +using System.Diagnostics; +using System.Net; +using NUnit.Framework; +using OpenQA.Selenium; +using OpenQA.Selenium.Chrome; +using OpenQA.Selenium.Support.UI; + +namespace Aporta.Selenium.Tests; + +[TestFixture] +public class AccessGrantedTest +{ + private const string BaseUrl = "https://localhost:5001"; + private const int AportaStartupTimeoutSeconds = 60; + private const string VirtualDriverGuid = "6667E442-53B2-4240-A10D-25F5E4400D83"; + + private static readonly string AportaPath = + Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "git", "Aporta"); + + private static readonly string ScreenshotDir = + Path.Combine(AportaPath, "test", "Aporta.Selenium.Tests", "screenshots"); + + private Process? _aportaProcess; + private ChromeDriver? _driver; + private readonly List<(string FilePath, string Description)> _screenshotEntries = new(); + + private static string FindDotnet() + { + var candidates = new[] + { + "/opt/homebrew/opt/dotnet@8/bin/dotnet", + "/usr/local/share/dotnet/dotnet", + Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".dotnet", "dotnet"), + "dotnet" + }; + return candidates.FirstOrDefault(File.Exists) ?? "dotnet"; + } + + [OneTimeSetUp] + public async Task OneTimeSetUp() + { + var dotnetPath = FindDotnet(); + var aportaProjectPath = Path.Combine(AportaPath, "src", "Aporta"); + + Assert.That(Directory.Exists(aportaProjectPath), Is.True, + $"Aporta project not found at {aportaProjectPath}"); + + var psi = new ProcessStartInfo(dotnetPath, + $"run --project \"{aportaProjectPath}\" -- --cleanDatabase true") + { + WorkingDirectory = AportaPath, + RedirectStandardOutput = true, + RedirectStandardError = true, + UseShellExecute = false + }; + + _aportaProcess = Process.Start(psi); + Assert.That(_aportaProcess, Is.Not.Null, "Failed to start Aporta process"); + + _aportaProcess!.BeginOutputReadLine(); + _aportaProcess.BeginErrorReadLine(); + _aportaProcess.OutputDataReceived += (_, e) => + { + if (e.Data != null) TestContext.Progress.WriteLine($"[APORTA] {e.Data}"); + }; + _aportaProcess.ErrorDataReceived += (_, e) => + { + if (e.Data != null) TestContext.Progress.WriteLine($"[APORTA-ERR] {e.Data}"); + }; + + using var handler = new HttpClientHandler + { + ServerCertificateCustomValidationCallback = (_, _, _, _) => true + }; + using var pollClient = new HttpClient(handler) { Timeout = TimeSpan.FromSeconds(5) }; + var deadline = DateTime.UtcNow.AddSeconds(AportaStartupTimeoutSeconds); + var ready = false; + while (DateTime.UtcNow < deadline) + { + try + { + var response = await pollClient.GetAsync($"{BaseUrl}/door/list"); + if (response.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.OK) + { + ready = true; + break; + } + } + catch + { + // Not ready yet + } + + await Task.Delay(1000); + } + + Assert.That(ready, Is.True, "Aporta did not become ready within the timeout"); + + var options = new ChromeOptions(); + options.AddArgument("--headless=new"); + options.AddArgument("--window-size=1920,1080"); + options.AddArgument("--no-sandbox"); + options.AddArgument("--disable-dev-shm-usage"); + options.AcceptInsecureCertificates = true; + + _driver = new ChromeDriver(options); + _driver.Manage().Timeouts().PageLoad = TimeSpan.FromSeconds(30); + + // Warm up Blazor WASM — first page load downloads and compiles the runtime + _driver.Navigate().GoToUrl(BaseUrl); + var warmupWait = new WebDriverWait(_driver, TimeSpan.FromSeconds(60)); + warmupWait.Until(d => + { + try + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Welcome to Aporta"); + } + catch (NoSuchElementException) + { + return false; + } + }); + } + + [OneTimeTearDown] + public void OneTimeTearDown() + { + WriteScreenshotMarkdown(); + + _driver?.Quit(); + _driver?.Dispose(); + + if (_aportaProcess is { HasExited: false }) + { + _aportaProcess.Kill(entireProcessTree: true); + _aportaProcess.WaitForExit(5000); + } + + _aportaProcess?.Dispose(); + } + + [Test, Order(1)] + public void EnableVirtualDriver() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/drivers"); + + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(30)); + + // Wait for the drivers page to render with the Virtual driver visible + WaitForBodyText("Virtual"); + + // Find the Virtual driver row by finding the with "Virtual" text + // then navigating to its parent + var virtualRow = FindTableRowContaining("Virtual"); + var actionToggle = virtualRow.FindElement(By.CssSelector("button.dropdown-toggle")); + actionToggle.Click(); + + // Wait for dropdown and click Enable — Blazorise renders DropdownItem as tags + WaitForVisibleDropdown(); + ClickDropdownItem("Enable"); + + // Wait for the driver to be loaded — indicated by green color in the status column + var longWait = new WebDriverWait(_driver, TimeSpan.FromSeconds(60)); + longWait.Until(d => + { + try + { + var row = FindTableRowContaining("Virtual"); + var greenElements = row.FindElements(By.CssSelector("[style*='green']")); + return greenElements.Count > 0; + } + catch + { + return false; + } + }); + + TakeScreenshot("01_virtual_driver_enabled", "Enable the Virtual driver — green check confirms it is loaded and running"); + TestContext.Progress.WriteLine("Virtual driver enabled successfully"); + } + + [Test, Order(2)] + public void AddVirtualReaderAndOutput() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/driver/{VirtualDriverGuid}"); + + // Wait for Virtual Driver Configuration page to load + WaitForBodyText("Add Virtual Reader"); + + // --- Add Virtual Reader --- + ClickButtonContaining("Add Virtual Reader"); + WaitForModal(); + + var nameInput = _driver.FindElement(By.Id("NameTextEdit")); + nameInput.Clear(); + nameInput.SendKeys("Test Reader"); + nameInput.SendKeys(Keys.Tab); + + ClickModalButton("Add"); + WaitForModalClose(); + WaitForBodyText("Test Reader"); + + // --- Add Virtual Output --- + ClickButtonContaining("Add Virtual Output"); + WaitForModal(); + + nameInput = _driver.FindElement(By.Id("NameTextEdit")); + nameInput.Clear(); + nameInput.SendKeys("Test Output"); + nameInput.SendKeys(Keys.Tab); + + ClickModalButton("Add"); + WaitForModalClose(); + WaitForBodyText("Test Output"); + + TakeScreenshot("02_reader_and_output_added", "Add a Virtual Reader and Virtual Output to the driver configuration"); + TestContext.Progress.WriteLine("Virtual reader and output added successfully"); + } + + [Test, Order(3)] + public void AddDoor() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/doors"); + + // Wait for the Add Door button to appear + WaitForBodyText("Add Door"); + + ClickButtonContaining("Add Door"); + WaitForModal(); + + var modal = _driver.FindElement(By.CssSelector("div.modal.show")); + var nameInput = modal.FindElement(By.CssSelector("input")); + nameInput.Clear(); + nameInput.SendKeys("Test Door"); + nameInput.SendKeys(Keys.Tab); + + // Select "Test Reader" for Access Reader In and "Test Actuator" for Door Strike + var selects = modal.FindElements(By.CssSelector("select")); + Assert.That(selects.Count, Is.GreaterThanOrEqualTo(3), "Expected at least 3 select elements in Add Door modal"); + + var accessReaderInSelect = new SelectElement(selects[0]); + SelectOptionContainingText(accessReaderInSelect, "Test Reader"); + + var doorStrikeSelect = new SelectElement(selects[2]); + SelectOptionContainingText(doorStrikeSelect, "Test Output"); + + ClickModalButton("Add"); + WaitForModalClose(); + WaitForBodyText("Test Door"); + + TakeScreenshot("04_door_added", "Create a door with the Test Reader as access reader and Test Output as door strike relay"); + TestContext.Progress.WriteLine("Door added successfully"); + } + + [Test, Order(4)] + public void AddPerson() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/credentials"); + + WaitForBodyText("Add Person"); + + ClickButtonContaining("Add Person"); + WaitForModal(); + + var modal = _driver.FindElement(By.CssSelector("div.modal.show")); + var inputs = modal.FindElements(By.CssSelector("input[type='text'],input:not([type])")); + Assert.That(inputs.Count, Is.GreaterThanOrEqualTo(2), "Expected at least 2 text inputs in Add Person modal"); + + inputs[0].Clear(); + inputs[0].SendKeys("Test"); + inputs[0].SendKeys(Keys.Tab); + + inputs[1].Clear(); + inputs[1].SendKeys("Person"); + inputs[1].SendKeys(Keys.Tab); + + ClickModalButton("Add"); + WaitForModalClose(); + + // Wait for the person to appear + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(30)); + wait.Until(d => + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Test") && body.Text.Contains("Person"); + }); + + TakeScreenshot("05_person_added", "Add a person (Test Person) on the credentials page"); + TestContext.Progress.WriteLine("Person added successfully"); + } + + [Test, Order(5)] + public void SwipeBadgeFirstTime() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/driver/{VirtualDriverGuid}"); + + // Wait for the reader row to appear (uses ElementId set in Configuration.razor) + WaitForBodyText("Test Reader"); + var readerRow = _driver.FindElement(By.Id("Reader:Test Reader")); + + var actionToggle = readerRow.FindElement(By.CssSelector("button.dropdown-toggle")); + actionToggle.Click(); + + WaitForVisibleDropdown(); + ClickDropdownItem("Swipe Badge"); + + WaitForModal(); + + var badgeInput = _driver.FindElement(By.Id("SwipeBadgeTextEdit")); + badgeInput.Clear(); + badgeInput.SendKeys("12345"); + badgeInput.SendKeys(Keys.Tab); + + ClickModalButton("Swipe the badge"); + WaitForModalClose(); + + // Pause for server to process the badge swipe and create the raw read event + Thread.Sleep(2000); + + TakeScreenshot("06_badge_swiped", "Swipe badge 12345 on the Test Reader — creates a raw read event for enrollment"); + TestContext.Progress.WriteLine("Badge swiped successfully (first time - creates raw read event)"); + } + + [Test, Order(6)] + public void EnrollPersonWithBadge() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/credentials"); + + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(30)); + + // Wait for the person row to appear + wait.Until(d => + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Test") && body.Text.Contains("Person"); + }); + + // Find the person row and click Action dropdown + var personRow = FindTableRowContaining("Person"); + var actionToggle = personRow.FindElement(By.CssSelector("button.dropdown-toggle")); + actionToggle.Click(); + + WaitForVisibleDropdown(); + ClickDropdownItem("Enroll"); + + WaitForModal(); + + // Verify the badge is available in the enrollment dropdown (raw reads show "Badge 12345 (Test Reader)") + var modal = _driver.FindElement(By.CssSelector("div.modal.show")); + var selectElement = modal.FindElement(By.CssSelector("select")); + Assert.That(selectElement.Text, Does.Contain("12345"), "Badge 12345 should be available in enrollment dropdown"); + Assert.That(selectElement.Text, Does.Contain("Test Reader"), "Reader name should appear in enrollment dropdown"); + + ClickModalButton("Enroll"); + WaitForModalClose(); + + // Wait for the "Successfully enrolled person" snackbar — this confirms the enrollment + // API call completed (the modal closes before the API call, so modal close alone + // is not sufficient). + wait.Until(d => + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Successfully enrolled person"); + }); + + // Reload to verify enrollment persisted (person row should show badge number) + _driver.Navigate().GoToUrl($"{BaseUrl}/configuration/credentials"); + wait.Until(d => + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Test") && body.Text.Contains("Person"); + }); + + // Verify the person row specifically has the badge number + var enrolledRow = FindTableRowContaining("Person"); + Assert.That(enrolledRow.Text, Does.Contain("12345"), + "Person row should contain badge number 12345 after enrollment"); + + TakeScreenshot("07_person_enrolled", "Enroll Test Person with badge 12345 — badge number now appears in their row"); + TestContext.Progress.WriteLine("Person enrolled with badge 12345 successfully"); + } + + [Test, Order(7)] + public void SwipeBadgeSecondTime() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/driver/{VirtualDriverGuid}"); + + WaitForBodyText("Test Reader"); + var readerRow = _driver.FindElement(By.Id("Reader:Test Reader")); + + var actionToggle = readerRow.FindElement(By.CssSelector("button.dropdown-toggle")); + actionToggle.Click(); + + WaitForVisibleDropdown(); + ClickDropdownItem("Swipe Badge"); + + WaitForModal(); + + var badgeInput = _driver.FindElement(By.Id("SwipeBadgeTextEdit")); + badgeInput.Clear(); + badgeInput.SendKeys("12345"); + badgeInput.SendKeys(Keys.Tab); + + ClickModalButton("Swipe the badge"); + WaitForModalClose(); + + // Wait for server to process + Thread.Sleep(2000); + + TakeScreenshot("08_badge_swiped_again", "Swipe badge 12345 again — this time the credential is enrolled, triggering access decision"); + TestContext.Progress.WriteLine("Badge swiped second time (should trigger Access Granted)"); + } + + [Test, Order(8)] + public void VerifyAccessGrantedOnMonitoringPage() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/monitoring"); + + // Wait for the events table and Access Granted event to appear + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(30)); + wait.Until(d => + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Access Granted"); + }); + + var body = _driver.FindElement(By.TagName("body")); + Assert.That(body.Text, Does.Contain("Access Granted"), + "Expected 'Access Granted' event on the monitoring page"); + + // Verify the Access Granted row shows Device and Credential info + var accessGrantedRow = FindTableRowContaining("Access Granted"); + Assert.That(accessGrantedRow.Text, Does.Contain("Test Reader"), + "Access Granted event should show device name 'Test Reader'"); + Assert.That(accessGrantedRow.Text, Does.Contain("Person, Test"), + "Access Granted event should show credential name 'Person, Test'"); + + TakeScreenshot("09_access_granted_verified", "Monitoring page shows Access Granted event with device and credential info — end-to-end flow complete"); + TestContext.Progress.WriteLine("Access Granted event verified on monitoring page!"); + } + + // --- Helper Methods --- + + /// + /// Wait for the body text to contain the specified string. + /// This is the most reliable wait strategy for Blazor WASM pages. + /// + private void WaitForBodyText(string text, int timeoutSeconds = 30) + { + var wait = new WebDriverWait(_driver!, TimeSpan.FromSeconds(timeoutSeconds)); + wait.Until(d => + { + try + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains(text); + } + catch + { + return false; + } + }); + } + + /// + /// Find a table row containing the specified text by iterating elements. + /// Avoids XPath contains() which has issues with implicit waits. + /// + private IWebElement FindTableRowContaining(string text) + { + var rows = _driver!.FindElements(By.CssSelector("tbody tr")); + foreach (var row in rows) + { + if (row.Text.Contains(text)) + return row; + } + + Assert.Fail($"Could not find table row containing '{text}'"); + return null!; // unreachable + } + + /// + /// Click a button whose visible text contains the given string. + /// Uses JavaScript querySelectorAll to find all buttons, then filters by text. + /// + private void ClickButtonContaining(string text) + { + var buttons = _driver!.FindElements(By.TagName("button")); + foreach (var button in buttons) + { + if (button.Displayed && button.Text.Contains(text)) + { + button.Click(); + return; + } + } + + Assert.Fail($"Could not find visible button containing '{text}'"); + } + + private void WaitForModal() + { + var wait = new WebDriverWait(_driver!, TimeSpan.FromSeconds(10)); + wait.Until(d => d.FindElements(By.CssSelector("div.modal.show")).Count > 0); + } + + private void WaitForModalClose() + { + var wait = new WebDriverWait(_driver!, TimeSpan.FromSeconds(10)); + wait.Until(d => d.FindElements(By.CssSelector("div.modal.show")).Count == 0); + } + + private void WaitForVisibleDropdown() + { + var wait = new WebDriverWait(_driver!, TimeSpan.FromSeconds(10)); + wait.Until(d => d.FindElements(By.CssSelector("div.dropdown-menu.show")).Count > 0); + } + + /// + /// Click a dropdown item (rendered as by Blazorise) within the open dropdown menu. + /// + private void ClickDropdownItem(string text) + { + var menu = _driver!.FindElement(By.CssSelector("div.dropdown-menu.show")); + var items = menu.FindElements(By.CssSelector("a.dropdown-item")); + foreach (var item in items) + { + if (item.Text.Contains(text)) + { + item.Click(); + return; + } + } + + Assert.Fail($"Could not find dropdown item containing '{text}'"); + } + + private void ClickModalButton(string buttonText) + { + var wait = new WebDriverWait(_driver!, TimeSpan.FromSeconds(10)); + wait.Until(d => + { + var modal = d.FindElement(By.CssSelector("div.modal.show")); + var footer = modal.FindElement(By.CssSelector(".modal-footer")); + var buttons = footer.FindElements(By.TagName("button")); + foreach (var button in buttons) + { + if (button.Text.Contains(buttonText)) + { + button.Click(); + return true; + } + } + + return false; + }); + } + + private static void SelectOptionContainingText(SelectElement select, string text) + { + foreach (var option in select.Options) + { + if (option.Text.Contains(text)) + { + select.SelectByText(option.Text); + return; + } + } + + Assert.Fail($"Could not find option containing '{text}' in select"); + } + + private void TakeScreenshot(string name, string description = "") + { + if (_driver == null) return; + + Directory.CreateDirectory(ScreenshotDir); + var timestamp = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + var fileName = $"{name}_{timestamp}.png"; + var filePath = Path.Combine(ScreenshotDir, fileName); + var screenshot = _driver.GetScreenshot(); + screenshot.SaveAsFile(filePath); + TestContext.Progress.WriteLine($"Screenshot saved: {filePath}"); + + _screenshotEntries.Add((fileName, description)); + } + + private void WriteScreenshotMarkdown() + { + if (_screenshotEntries.Count == 0) return; + + var mdPath = Path.Combine(ScreenshotDir, "AccessGrantedTest.md"); + using var writer = new StreamWriter(mdPath); + writer.WriteLine("# Access Granted End-to-End Test"); + writer.WriteLine(); + writer.WriteLine($"*Generated: {DateTime.Now:yyyy-MM-dd HH:mm:ss}*"); + writer.WriteLine(); + + foreach (var (filePath, description) in _screenshotEntries) + { + if (!string.IsNullOrEmpty(description)) + { + writer.WriteLine($"## {description}"); + writer.WriteLine(); + } + + writer.WriteLine($"![{description}]({filePath})"); + writer.WriteLine(); + } + } +} diff --git a/test/Aporta.Selenium.Tests/Aporta.Selenium.Tests.csproj b/test/Aporta.Selenium.Tests/Aporta.Selenium.Tests.csproj new file mode 100644 index 0000000..c7b114a --- /dev/null +++ b/test/Aporta.Selenium.Tests/Aporta.Selenium.Tests.csproj @@ -0,0 +1,17 @@ + + + + false + enable + enable + + + + + + + + + + + diff --git a/test/Aporta.Selenium.Tests/HomePageSmokeTest.cs b/test/Aporta.Selenium.Tests/HomePageSmokeTest.cs new file mode 100644 index 0000000..7da3caa --- /dev/null +++ b/test/Aporta.Selenium.Tests/HomePageSmokeTest.cs @@ -0,0 +1,168 @@ +using System.Diagnostics; +using System.Net; +using NUnit.Framework; +using OpenQA.Selenium; +using OpenQA.Selenium.Chrome; +using OpenQA.Selenium.Support.UI; +namespace Aporta.Selenium.Tests; + +[TestFixture] +public class HomePageSmokeTest +{ + private const string BaseUrl = "https://localhost:5001"; + private const int AportaStartupTimeoutSeconds = 60; + + private static readonly string AportaPath = + Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "git", "Aporta"); + + private static readonly string ScreenshotDir = + Path.Combine(AportaPath, "test", "Aporta.Selenium.Tests", "screenshots"); + + private Process? _aportaProcess; + private ChromeDriver? _driver; + + private static string FindDotnet() + { + var candidates = new[] + { + "/opt/homebrew/opt/dotnet@8/bin/dotnet", + "/usr/local/share/dotnet/dotnet", + Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".dotnet", "dotnet"), + "dotnet" + }; + return candidates.FirstOrDefault(File.Exists) ?? "dotnet"; + } + + [OneTimeSetUp] + public async Task OneTimeSetUp() + { + // Start Aporta + var dotnetPath = FindDotnet(); + var aportaProjectPath = Path.Combine(AportaPath, "src", "Aporta"); + + Assert.That(Directory.Exists(aportaProjectPath), Is.True, + $"Aporta project not found at {aportaProjectPath}"); + + var psi = new ProcessStartInfo(dotnetPath, + $"run --project \"{aportaProjectPath}\" -- --cleanDatabase true") + { + WorkingDirectory = AportaPath, + RedirectStandardOutput = true, + RedirectStandardError = true, + UseShellExecute = false + }; + + _aportaProcess = Process.Start(psi); + Assert.That(_aportaProcess, Is.Not.Null, "Failed to start Aporta process"); + + _aportaProcess!.BeginOutputReadLine(); + _aportaProcess.BeginErrorReadLine(); + _aportaProcess.OutputDataReceived += (_, e) => + { + if (e.Data != null) TestContext.Progress.WriteLine($"[APORTA] {e.Data}"); + }; + _aportaProcess.ErrorDataReceived += (_, e) => + { + if (e.Data != null) TestContext.Progress.WriteLine($"[APORTA-ERR] {e.Data}"); + }; + + // Poll until Aporta responds + using var handler = new HttpClientHandler + { + ServerCertificateCustomValidationCallback = (_, _, _, _) => true + }; + using var pollClient = new HttpClient(handler) { Timeout = TimeSpan.FromSeconds(5) }; + var deadline = DateTime.UtcNow.AddSeconds(AportaStartupTimeoutSeconds); + var ready = false; + while (DateTime.UtcNow < deadline) + { + try + { + var response = await pollClient.GetAsync($"{BaseUrl}/door/list"); + if (response.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.OK) + { + ready = true; + break; + } + } + catch + { + // Not ready yet + } + + await Task.Delay(1000); + } + + Assert.That(ready, Is.True, "Aporta did not become ready within the timeout"); + + // Set up ChromeDriver (Selenium Manager auto-downloads matching driver) + var options = new ChromeOptions(); + options.AddArgument("--headless=new"); + options.AddArgument("--window-size=1920,1080"); + options.AddArgument("--no-sandbox"); + options.AddArgument("--disable-dev-shm-usage"); + options.AcceptInsecureCertificates = true; + + _driver = new ChromeDriver(options); + _driver.Manage().Timeouts().PageLoad = TimeSpan.FromSeconds(30); + _driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(10); + } + + [OneTimeTearDown] + public void OneTimeTearDown() + { + _driver?.Quit(); + _driver?.Dispose(); + + if (_aportaProcess is { HasExited: false }) + { + _aportaProcess.Kill(entireProcessTree: true); + _aportaProcess.WaitForExit(5000); + } + + _aportaProcess?.Dispose(); + } + + [Test] + public void HomePageLoads() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl(BaseUrl); + + // Wait for Blazor WASM to fully load and render + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(30)); + wait.Until(d => + { + try + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Welcome to Aporta"); + } + catch (NoSuchElementException) + { + return false; + } + }); + + Assert.That(_driver.Title, Is.EqualTo("Aporta")); + + var body = _driver.FindElement(By.TagName("body")); + Assert.That(body.Text, Does.Contain("Welcome to Aporta")); + + TakeScreenshot("home_page"); + TestContext.Progress.WriteLine("Home page loaded successfully with Blazor WASM content"); + } + + private void TakeScreenshot(string name) + { + if (_driver == null) return; + + Directory.CreateDirectory(ScreenshotDir); + var timestamp = DateTime.Now.ToString("yyyyMMdd_HHmmss"); + var filePath = Path.Combine(ScreenshotDir, $"{name}_{timestamp}.png"); + var screenshot = _driver.GetScreenshot(); + screenshot.SaveAsFile(filePath); + TestContext.Progress.WriteLine($"Screenshot saved: {filePath}"); + } +} From b822b4e1750a7c6c093cdc907e876f89882c465f Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Tue, 10 Feb 2026 14:10:30 -0500 Subject: [PATCH 74/86] Use Messages from Z9.Protobuf.Community for event display strings Replace hand-maintained FlexEvtCodeHelper with Messages.GetEvtCodeText() and Messages.GetEvtSubCodeText() from Z9.Protobuf.Community 1.0.13. Display strings now match the commercial Z9 product. FlexMapper populates EvtCodeText/EvtSubCodeText on FlexEvt during conversion. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- src/Aporta.Core/Services/FlexMapper.cs | 2 + src/Aporta.Migration/Aporta.Migration.csproj | 2 +- src/Aporta.Shared/Models/Flex/FlexEvt.cs | 6 ++ .../Models/Flex/FlexEvtCodeHelper.cs | 73 ------------------- src/Aporta.WebClient/Pages/Monitoring.razor | 4 +- src/Aporta/Aporta.csproj | 2 +- .../Aporta.Core.Tests.csproj | 2 +- .../Aporta.Migration.Tests.csproj | 2 +- 9 files changed, 15 insertions(+), 80 deletions(-) delete mode 100644 src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 0939531..dcf633e 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Core/Services/FlexMapper.cs b/src/Aporta.Core/Services/FlexMapper.cs index 66c2ae7..14578d4 100644 --- a/src/Aporta.Core/Services/FlexMapper.cs +++ b/src/Aporta.Core/Services/FlexMapper.cs @@ -314,9 +314,11 @@ public static FlexEvt ToFlex(Evt proto) DbTime = DateTimeDataToIso(proto.DbTime), HwTimeZone = proto.HwTimeZone, EvtCode = (int)proto.EvtCode, + EvtCodeText = Messages.GetEvtCodeText(proto.EvtCode), ExternalEvtCodeText = string.IsNullOrEmpty(proto.ExternalEvtCodeText) ? null : proto.ExternalEvtCodeText, ExternalEvtCodeId = string.IsNullOrEmpty(proto.ExternalEvtCodeId) ? null : proto.ExternalEvtCodeId, EvtSubCode = proto.EvtSubCodeCase == Evt.EvtSubCodeOneofCase.EvtSubCode ? (int)proto.EvtSubCode : null, + EvtSubCodeText = proto.EvtSubCodeCase == Evt.EvtSubCodeOneofCase.EvtSubCode ? Messages.GetEvtSubCodeText(proto.EvtSubCode) : null, ExternalSubCodeText = string.IsNullOrEmpty(proto.ExternalSubCodeText) ? null : proto.ExternalSubCodeText, ExternalSubCodeId = string.IsNullOrEmpty(proto.ExternalSubCodeId) ? null : proto.ExternalSubCodeId, Priority = proto.Priority, diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index 57dcb12..1d3df29 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Aporta.Shared/Models/Flex/FlexEvt.cs b/src/Aporta.Shared/Models/Flex/FlexEvt.cs index 1ecf81e..751ca75 100644 --- a/src/Aporta.Shared/Models/Flex/FlexEvt.cs +++ b/src/Aporta.Shared/Models/Flex/FlexEvt.cs @@ -19,6 +19,9 @@ public class FlexEvt [JsonPropertyName("evtCode")] public int? EvtCode { get; set; } + [JsonPropertyName("evtCodeText")] + public string EvtCodeText { get; set; } + [JsonPropertyName("externalEvtCodeText")] public string ExternalEvtCodeText { get; set; } @@ -28,6 +31,9 @@ public class FlexEvt [JsonPropertyName("evtSubCode")] public int? EvtSubCode { get; set; } + [JsonPropertyName("evtSubCodeText")] + public string EvtSubCodeText { get; set; } + [JsonPropertyName("externalSubCodeText")] public string ExternalSubCodeText { get; set; } diff --git a/src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs b/src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs deleted file mode 100644 index bcaacb2..0000000 --- a/src/Aporta.Shared/Models/Flex/FlexEvtCodeHelper.cs +++ /dev/null @@ -1,73 +0,0 @@ -namespace Aporta.Shared.Models.Flex; - -public static class FlexEvtCodeHelper -{ - public static string GetEvtCodeText(int? evtCode) - { - return evtCode switch - { - 9 => "Controller Startup", - 10 => "Controller Online", - 11 => "Controller Offline", - 15 => "Credential Reader Online", - 16 => "Credential Reader Offline", - 17 => "Card Read", - 48 => "Access Granted", - 49 => "Access Denied", - 52 => "Door Forced", - 53 => "Door Not Forced", - 54 => "Door Held", - 55 => "Door Not Held", - 56 => "Door Opened", - 57 => "Door Closed", - 58 => "Door Locked", - 59 => "Door Unlocked", - 60 => "Door Mode: Unlocked", - 61 => "Door Mode: No Access", - 62 => "Door Mode: Card Only", - 63 => "Door Mode: Card and PIN", - 64 => "Door Mode: PIN Only", - 65 => "Door Mode: Card or PIN", - 86 => "Exit Requested", - 87 => "Momentary Unlock", - 113 => "On Primary Power", - 114 => "Off Primary Power", - 115 => "No Power", - 116 => "Battery OK", - 117 => "Battery Low", - 118 => "Battery Fail", - 125 => "Tamper Normal", - 126 => "Tamper", - 127 => "Schedule Active", - 128 => "Schedule Inactive", - 153 => "External", - 244 => "Battery Critical", - 259 => "Credential Reader Power Cycle", - _ => $"Unknown ({evtCode})" - }; - } - - public static string GetEvtSubCodeText(int? evtSubCode) - { - return evtSubCode switch - { - null => "", - 0 => "Inactive", - 6 => "Not Yet Effective", - 7 => "Expired", - 10 => "No Privileges", - 11 => "Outside Schedule", - 14 => "Unknown Card Number", - 15 => "Unknown Card Format", - 17 => "Unknown Unique PIN", - 20 => "Incorrect Facility Code", - 22 => "Door Mode: Static Locked", - 23 => "Door Mode: No Card", - 24 => "Door Mode: No Unique PIN", - 25 => "No Confirming PIN", - 27 => "Incorrect Confirming PIN", - 104 => "External", - _ => $"Unknown ({evtSubCode})" - }; - } -} diff --git a/src/Aporta.WebClient/Pages/Monitoring.razor b/src/Aporta.WebClient/Pages/Monitoring.razor index 96f8236..3cf373e 100644 --- a/src/Aporta.WebClient/Pages/Monitoring.razor +++ b/src/Aporta.WebClient/Pages/Monitoring.razor @@ -40,10 +40,10 @@ else @(ParseFlexTime(evt.HwTime)) - @(FlexEvtCodeHelper.GetEvtCodeText(evt.EvtCode)) + @evt.EvtCodeText - @(FlexEvtCodeHelper.GetEvtSubCodeText(evt.EvtSubCode)) + @evt.EvtSubCodeText @evt.EvtDevRef?.Name diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index a656c69..c950d47 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index a862396..dd38e21 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index 6ec1d0e..f94ba06 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,7 +10,7 @@ - + From 1af335e785e08056805725886ebca5635281ba28 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Tue, 10 Feb 2026 14:49:07 -0500 Subject: [PATCH 75/86] Remove timestamps from screenshot filenames and update markdown title Co-Authored-By: Claude Opus 4.6 --- test/Aporta.Selenium.Tests/AccessGrantedTest.cs | 5 ++--- test/Aporta.Selenium.Tests/HomePageSmokeTest.cs | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/Aporta.Selenium.Tests/AccessGrantedTest.cs b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs index b5b8824..e967e8a 100644 --- a/test/Aporta.Selenium.Tests/AccessGrantedTest.cs +++ b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs @@ -592,8 +592,7 @@ private void TakeScreenshot(string name, string description = "") if (_driver == null) return; Directory.CreateDirectory(ScreenshotDir); - var timestamp = DateTime.Now.ToString("yyyyMMdd_HHmmss"); - var fileName = $"{name}_{timestamp}.png"; + var fileName = $"{name}.png"; var filePath = Path.Combine(ScreenshotDir, fileName); var screenshot = _driver.GetScreenshot(); screenshot.SaveAsFile(filePath); @@ -608,7 +607,7 @@ private void WriteScreenshotMarkdown() var mdPath = Path.Combine(ScreenshotDir, "AccessGrantedTest.md"); using var writer = new StreamWriter(mdPath); - writer.WriteLine("# Access Granted End-to-End Test"); + writer.WriteLine("# Aporta Access Granted End-to-End UI Test"); writer.WriteLine(); writer.WriteLine($"*Generated: {DateTime.Now:yyyy-MM-dd HH:mm:ss}*"); writer.WriteLine(); diff --git a/test/Aporta.Selenium.Tests/HomePageSmokeTest.cs b/test/Aporta.Selenium.Tests/HomePageSmokeTest.cs index 7da3caa..d028c0a 100644 --- a/test/Aporta.Selenium.Tests/HomePageSmokeTest.cs +++ b/test/Aporta.Selenium.Tests/HomePageSmokeTest.cs @@ -159,8 +159,7 @@ private void TakeScreenshot(string name) if (_driver == null) return; Directory.CreateDirectory(ScreenshotDir); - var timestamp = DateTime.Now.ToString("yyyyMMdd_HHmmss"); - var filePath = Path.Combine(ScreenshotDir, $"{name}_{timestamp}.png"); + var filePath = Path.Combine(ScreenshotDir, $"{name}.png"); var screenshot = _driver.GetScreenshot(); screenshot.SaveAsFile(filePath); TestContext.Progress.WriteLine($"Screenshot saved: {filePath}"); From 089de52980ae04a62533455def8ca3ef3ffeac3f Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Tue, 10 Feb 2026 18:38:34 -0500 Subject: [PATCH 76/86] Add login screen to Aporta web UI Replace silent auto-authentication with a visible login form. FlexApiService gains LoginAsync/Logout/IsAuthenticated; App.razor gates on auth state and restores sessions from sessionStorage across page reloads. Selenium tests log in through the UI and capture a login screen screenshot. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Shared/Calls/FlexApiService.cs | 30 ++++++++- src/Aporta.WebClient/App.razor | 53 ++++++++++++--- src/Aporta.WebClient/Shared/Login.razor | 64 +++++++++++++++++++ .../AccessGrantedTest.cs | 23 +++++++ .../HomePageSmokeTest.cs | 33 +++++++++- 5 files changed, 190 insertions(+), 13 deletions(-) create mode 100644 src/Aporta.WebClient/Shared/Login.razor diff --git a/src/Aporta.Shared/Calls/FlexApiService.cs b/src/Aporta.Shared/Calls/FlexApiService.cs index a60a9b0..6ba9e47 100644 --- a/src/Aporta.Shared/Calls/FlexApiService.cs +++ b/src/Aporta.Shared/Calls/FlexApiService.cs @@ -13,12 +13,38 @@ public class FlexApiService { private readonly HttpClient _httpClient; private string _sessionToken; + private string _username; + private string _password; public FlexApiService(HttpClient httpClient) { _httpClient = httpClient; } + public bool IsAuthenticated => !string.IsNullOrEmpty(_sessionToken); + + public async Task LoginAsync(string username, string password) + { + var request = new FlexAuthenticateRequest { Username = username, Password = password }; + var response = await _httpClient.PostAsJsonAsync("authenticate", request); + response.EnsureSuccessStatusCode(); + var result = await response.Content.ReadFromJsonAsync(); + if (result?.Authenticated == true) + { + _sessionToken = result.SessionToken; + _username = username; + _password = password; + } + return result; + } + + public void Logout() + { + _sessionToken = null; + _username = null; + _password = null; + } + public async Task> GetEvtListAsync(int offset, int max) { return await FlexGetAsync>($"evt/list?offset={offset}&max={max}"); @@ -43,8 +69,10 @@ private async Task EnsureAuthenticated() { if (!string.IsNullOrEmpty(_sessionToken)) return; + if (string.IsNullOrEmpty(_username)) + throw new InvalidOperationException("Not authenticated"); - var request = new FlexAuthenticateRequest { Username = "admin", Password = "pass" }; + var request = new FlexAuthenticateRequest { Username = _username, Password = _password }; var response = await _httpClient.PostAsJsonAsync("authenticate", request); response.EnsureSuccessStatusCode(); var result = await response.Content.ReadFromJsonAsync(); diff --git a/src/Aporta.WebClient/App.razor b/src/Aporta.WebClient/App.razor index 4d637a8..d00974c 100644 --- a/src/Aporta.WebClient/App.razor +++ b/src/Aporta.WebClient/App.razor @@ -1,10 +1,43 @@ - - - - - - -

Sorry, there's nothing at this address.

- - - \ No newline at end of file +@using Aporta.Shared.Calls +@inject FlexApiService FlexApi +@inject IJSRuntime JS + +@if (FlexApi.IsAuthenticated) +{ + + + + + + +

Sorry, there's nothing at this address.

+ + + +} +else if (_initialized) +{ + +} + +@code { + private bool _initialized; + + protected override async Task OnInitializedAsync() + { + try + { + var username = await JS.InvokeAsync("sessionStorage.getItem", "aporta_username"); + var password = await JS.InvokeAsync("sessionStorage.getItem", "aporta_password"); + if (!string.IsNullOrEmpty(username) && !string.IsNullOrEmpty(password)) + { + await FlexApi.LoginAsync(username, password); + } + } + catch + { + // Server not ready or credentials invalid — show login form + } + _initialized = true; + } +} diff --git a/src/Aporta.WebClient/Shared/Login.razor b/src/Aporta.WebClient/Shared/Login.razor new file mode 100644 index 0000000..8ded0e1 --- /dev/null +++ b/src/Aporta.WebClient/Shared/Login.razor @@ -0,0 +1,64 @@ +@using Aporta.Shared.Calls +@inject IJSRuntime JS + +
+ + + Aporta Login + + + + Username + + + + Password + + + @if (!string.IsNullOrEmpty(_errorMessage)) + { + @_errorMessage + } + + + +
+ +@code { + [Inject] private FlexApiService FlexApi { get; set; } + [Parameter] public EventCallback OnLoginSuccess { get; set; } + + private string _username = ""; + private string _password = ""; + private string _errorMessage; + private bool _loading; + + private async Task OnKeyDown(KeyboardEventArgs e) + { + if (e.Key == "Enter") await DoLogin(); + } + + private async Task DoLogin() + { + _errorMessage = null; + _loading = true; + try + { + var result = await FlexApi.LoginAsync(_username, _password); + if (result?.Authenticated == true) + { + await JS.InvokeVoidAsync("sessionStorage.setItem", "aporta_username", _username); + await JS.InvokeVoidAsync("sessionStorage.setItem", "aporta_password", _password); + await OnLoginSuccess.InvokeAsync(); + } + else + _errorMessage = "Invalid username or password"; + } + catch + { + _errorMessage = "Unable to connect to server"; + } + _loading = false; + } +} diff --git a/test/Aporta.Selenium.Tests/AccessGrantedTest.cs b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs index e967e8a..72174a1 100644 --- a/test/Aporta.Selenium.Tests/AccessGrantedTest.cs +++ b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs @@ -109,6 +109,27 @@ public async Task OneTimeSetUp() // Warm up Blazor WASM — first page load downloads and compiles the runtime _driver.Navigate().GoToUrl(BaseUrl); var warmupWait = new WebDriverWait(_driver, TimeSpan.FromSeconds(60)); + warmupWait.Until(d => + { + try + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Aporta Login"); + } + catch (NoSuchElementException) + { + return false; + } + }); + + TakeScreenshot("00_login_screen", "Login screen presented before authentication"); + + // Log in through the UI + var inputs = _driver.FindElements(By.CssSelector("input")); + inputs[0].SendKeys("admin"); + inputs[1].SendKeys("pass"); + ClickButtonContaining("Login"); + warmupWait.Until(d => { try @@ -121,6 +142,8 @@ public async Task OneTimeSetUp() return false; } }); + + TakeScreenshot("00_logged_in", "Home page loads after successful authentication"); } [OneTimeTearDown] diff --git a/test/Aporta.Selenium.Tests/HomePageSmokeTest.cs b/test/Aporta.Selenium.Tests/HomePageSmokeTest.cs index d028c0a..62e5d67 100644 --- a/test/Aporta.Selenium.Tests/HomePageSmokeTest.cs +++ b/test/Aporta.Selenium.Tests/HomePageSmokeTest.cs @@ -130,8 +130,37 @@ public void HomePageLoads() _driver!.Navigate().GoToUrl(BaseUrl); - // Wait for Blazor WASM to fully load and render - var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(30)); + // Wait for Blazor WASM to fully load and render the login screen + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(60)); + wait.Until(d => + { + try + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Aporta Login"); + } + catch (NoSuchElementException) + { + return false; + } + }); + + // Log in through the UI + var inputs = _driver.FindElements(By.CssSelector("input")); + inputs[0].SendKeys("admin"); + inputs[1].SendKeys("pass"); + + var buttons = _driver.FindElements(By.TagName("button")); + foreach (var button in buttons) + { + if (button.Displayed && button.Text.Contains("Login")) + { + button.Click(); + break; + } + } + + // Wait for home page to load after login wait.Until(d => { try From 224a114e6be5e94f3cbd8d828dc7c5d62bae1469 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Wed, 11 Feb 2026 07:28:40 -0500 Subject: [PATCH 77/86] Add door access management UI with schedule restrictions and server-side Unid assignment Credentials page: rename Person to Credential labels, add Door Access column showing assigned doors with schedule names, add Edit Access modal for managing door access privileges with schedule selection. Add Schedules page for creating/editing schedules with time intervals and day-of-week selection. Fix server-side Unid auto-assignment in FlexCrudControllerBase so new records created via web UI get unique IDs (previously defaulted to 0, causing database collisions). Selenium tests cover the full flow: create schedule, edit credential access to use it, verify Access Denied when schedule is not active. Co-Authored-By: Claude Opus 4.6 --- README.md | 8 +- .../Repositories/ProtoJsonRepository.cs | 12 + .../Repositories/Z9CredRepository.cs | 12 - src/Aporta.Shared/Calls/FlexApiService.cs | 15 + .../Pages/configuration/Credentials.razor | 227 ++++++++++- .../Pages/configuration/Schedules.razor | 362 ++++++++++++++++++ src/Aporta.WebClient/Shared/MainLayout.razor | 3 +- .../Flex/FlexBasicDataLayoutController.cs | 1 + .../Flex/FlexBinaryFormatController.cs | 1 + .../Controllers/Flex/FlexCredController.cs | 2 + .../Flex/FlexCredTemplateController.cs | 1 + .../Flex/FlexCrudControllerBase.cs | 4 + .../Flex/FlexDataFormatController.cs | 1 + .../Flex/FlexDataLayoutController.cs | 1 + .../Controllers/Flex/FlexDevController.cs | 2 + .../Flex/FlexDoorAccessPrivController.cs | 1 + .../Flex/FlexEncryptionKeyController.cs | 1 + .../Controllers/Flex/FlexHolCalController.cs | 1 + .../Controllers/Flex/FlexHolController.cs | 1 + .../Controllers/Flex/FlexHolTypeController.cs | 1 + .../Controllers/Flex/FlexSchedController.cs | 1 + .../Repositories/CredentialRepositoryTests.cs | 114 ++++++ .../AccessGrantedTest.cs | 281 +++++++++++++- 23 files changed, 1017 insertions(+), 36 deletions(-) create mode 100644 src/Aporta.WebClient/Pages/configuration/Schedules.razor diff --git a/README.md b/README.md index 09d259d..29a66f2 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,8 @@ Aporta supports the Z9/Flex Community Profile as a JSON/REST API, intended for u - Enroll new credential - Read entire card data for card number - Log access events + - Door access privilege management from Credentials page (assign/remove doors, set schedule restrictions) + - Door Access column on Credentials page showing assigned doors with schedule names ### Z9/Open Community Profile - Connection & Protocol @@ -91,11 +93,11 @@ The web UI communicates with the server through the Z9/Flex Community Profile AP ### Aporta - Self hosted web management - - A master password to gain access + - Configurable user accounts (currently uses default credentials) - OSDP Driver - Notify when input is tripped - Access Control - - Standalone UI for managing Z9/Open Community Profile data model objects including card formats, access levels, schedules, and holidays (Z9/Open handles backend privilege management) + - Standalone UI for managing card formats and holidays (schedules and door access privileges are now managed from the web UI) ### Z9/Open Community Profile - DbChange: Handle device deletions (devDelete, devDeleteAll) — currently silently ignored, causing stale devices to accumulate @@ -139,7 +141,7 @@ The log files will be placed in the standard Linux logging directory ### Quick Start -After installing Aporta, browse to the local web url ```https://localhost:8443``` to get started. A [Quick Start Guide](https://github.com/bytedreamer/Aporta/wiki/Quick-start-guide) can be found in the Wiki section. +After installing Aporta, browse to the local web url ```https://localhost:8443``` to get started. You will be presented with a login screen. The default credentials are username ```admin``` and password ```pass```. A [Quick Start Guide](https://github.com/bytedreamer/Aporta/wiki/Quick-start-guide) can be found in the Wiki section. ### Configuration ### diff --git a/src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs b/src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs index 62de4ff..2962ba5 100644 --- a/src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/ProtoJsonRepository.cs @@ -82,4 +82,16 @@ public async Task Count() return await connection.ExecuteScalarAsync($"SELECT COUNT(*) FROM {TableName}"); } + + /// + /// Returns the next available ID (MAX(id) + 1, or 1 if empty). + /// + public async Task NextId() + { + using var connection = DataAccess.CreateDbConnection(); + connection.Open(); + + return await connection.ExecuteScalarAsync( + $"SELECT COALESCE(MAX(id), 0) + 1 FROM {TableName}"); + } } diff --git a/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs b/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs index b3a986f..dc44deb 100644 --- a/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs +++ b/src/Aporta.Core/DataAccess/Repositories/Z9CredRepository.cs @@ -49,16 +49,4 @@ public static string ExtractCredNum(Cred cred) return SpCoreProtoUtil.ToBigInteger(cred.CardPin.CredNum).ToString(); } - /// - /// Returns the next available ID (MAX(id) + 1, or 1 if empty). - /// Used by FlexCredController for person creation. - /// - public async Task NextId() - { - using var connection = DataAccess.CreateDbConnection(); - connection.Open(); - - return await connection.ExecuteScalarAsync( - "SELECT COALESCE(MAX(id), 0) + 1 FROM z9_cred"); - } } diff --git a/src/Aporta.Shared/Calls/FlexApiService.cs b/src/Aporta.Shared/Calls/FlexApiService.cs index 6ba9e47..f1eec17 100644 --- a/src/Aporta.Shared/Calls/FlexApiService.cs +++ b/src/Aporta.Shared/Calls/FlexApiService.cs @@ -55,6 +55,21 @@ public async Task> GetCredListAsync(int offset, int m return await FlexGetAsync>($"cred/list?offset={offset}&max={max}"); } + public async Task> GetSchedListAsync(int offset, int max) + { + return await FlexGetAsync>($"sched/list?offset={offset}&max={max}"); + } + + public async Task> SaveSchedAsync(FlexSched sched) + { + return await FlexPostAsync>("sched/save", sched); + } + + public async Task DeleteSchedAsync(int unid) + { + return await FlexPostAsync($"sched/delete/{unid}"); + } + public async Task> GetSensorListAsync(int offset, int max) { return await FlexGetAsync>($"sensor/list?offset={offset}&max={max}"); diff --git a/src/Aporta.WebClient/Pages/configuration/Credentials.razor b/src/Aporta.WebClient/Pages/configuration/Credentials.razor index 3a9772e..767fe4c 100644 --- a/src/Aporta.WebClient/Pages/configuration/Credentials.razor +++ b/src/Aporta.WebClient/Pages/configuration/Credentials.razor @@ -22,7 +22,7 @@ else { - + @@ -36,6 +36,7 @@ else First Name Last Name Badge Number + Door Access @@ -72,6 +73,9 @@ else @(cred.CardPin?.CredNum) + + @FormatDoorAccess(cred) + @if (!string.IsNullOrEmpty(cred.Name)) { @@ -83,9 +87,9 @@ else @if (!IsEnrolled(cred)) { Enroll - } - + Edit Access + Delete @@ -104,7 +108,7 @@ else - Add Person + Add Credential @@ -253,6 +257,69 @@ else + + + + + + Edit Door Access — @(_editAccessCred?.Name) + + + + + @if (_editAccessEntries.Count > 0) + { + + + + Door + Schedule + + + + + @for (var i = 0; i < _editAccessEntries.Count; i++) + { + var entry = _editAccessEntries[i]; + + + + + + + + + + + + } + +
+ } + else + { + No door access configured. + } + + + + + + + + } @@ -269,6 +336,10 @@ else IMessageService MessageService { get; set; } private FlexListResponse _credentials; + private List _doorList = new(); + private List _schedList = new(); + private Dictionary _doorNames = new(); + private Dictionary _schedNames = new(); private string _addFirstName; private string _addLastName; private bool _addEnabled = true; @@ -287,13 +358,17 @@ else private Modal _personDetailsModal; + private Modal _editAccessModal; + private FlexCred _editAccessCred; + private List _editAccessEntries = new(); + private Snackbar _snackbar; private SnackbarColor _snackbarColor; private string _snackbarMessage = string.Empty; protected override async Task OnInitializedAsync() { - _credentials = await FlexApi.GetCredListAsync(0, 1000); + await LoadAllData(); _hubConnection = new HubConnectionBuilder() .WithUrl(NavigationManager.ToAbsoluteUri(Locations.DataChangeNotification)) @@ -301,17 +376,17 @@ else .Build(); _hubConnection.On(Methods.PersonInserted, async _ => { - _credentials = await FlexApi.GetCredListAsync(0, 1000); + await LoadAllData(); StateHasChanged(); }); _hubConnection.On(Methods.PersonUpdated, async _ => { - _credentials = await FlexApi.GetCredListAsync(0, 1000); + await LoadAllData(); StateHasChanged(); }); _hubConnection.On(Methods.PersonDeleted, async _ => { - _credentials = await FlexApi.GetCredListAsync(0, 1000); + await LoadAllData(); StateHasChanged(); }); @@ -335,12 +410,12 @@ else try { await FlexApi.SaveCredAsync(cred); - _snackbarMessage = "Successfully added person"; + _snackbarMessage = "Successfully added credential"; _snackbarColor = SnackbarColor.Success; } catch { - _snackbarMessage = "Unable to add person"; + _snackbarMessage = "Unable to add credential"; _snackbarColor = SnackbarColor.Danger; } @@ -355,7 +430,7 @@ else { var firstName = ParseFirstName(cred.Name); var lastName = ParseLastName(cred.Name); - if (!await MessageService.Confirm($"Are you sure you want to delete person '{firstName} {lastName}'?", "Delete Person", options => + if (!await MessageService.Confirm($"Are you sure you want to delete credential '{firstName} {lastName}'?", "Delete Credential", options => { options.ShowMessageIcon = false; options.ConfirmButtonColor = Color.Danger; @@ -367,12 +442,12 @@ else try { await FlexApi.DeleteCredAsync(cred.Unid.Value); - _snackbarMessage = "Successfully removed person"; + _snackbarMessage = "Successfully removed credential"; _snackbarColor = SnackbarColor.Success; } catch { - _snackbarMessage = "Unable to remove person"; + _snackbarMessage = "Unable to remove credential"; _snackbarColor = SnackbarColor.Danger; } await _snackbar.Show(); @@ -412,17 +487,57 @@ else try { await FlexApi.EnrollCredFromReadAsync(_enrollCred.Unid.Value, _enrollRawReadId); - _snackbarMessage = "Successfully enrolled person"; + _snackbarMessage = "Successfully enrolled credential"; _snackbarColor = SnackbarColor.Success; } catch { - _snackbarMessage = "Unable to enroll person"; + _snackbarMessage = "Unable to enroll credential"; _snackbarColor = SnackbarColor.Danger; } await _snackbar.Show(); } + private async Task LoadAllData() + { + _credentials = await FlexApi.GetCredListAsync(0, 1000); + var doors = await FlexApi.GetDoorListAsync(0, 1000); + var schedules = await FlexApi.GetSchedListAsync(0, 1000); + _doorList = doors.InstanceList; + _schedList = schedules.InstanceList; + _doorNames = _doorList.ToDictionary(d => d.Unid ?? 0, d => d.Name ?? ""); + _schedNames = _schedList.ToDictionary(s => s.Unid ?? 0, s => s.Name ?? ""); + } + + private string FormatDoorAccess(FlexCred cred) + { + if (cred.PrivBindings == null || cred.PrivBindings.Count == 0) + return ""; + + var entries = new List(); + foreach (var binding in cred.PrivBindings) + { + if (binding.DevAsDoorAccessPriv == null) + continue; + + var doorUnid = binding.DevAsDoorAccessPriv.Unid ?? 0; + var doorName = _doorNames.TryGetValue(doorUnid, out var name) ? name : $"Door {doorUnid}"; + + if (binding.SchedRestriction?.Sched?.Unid != null) + { + var schedUnid = binding.SchedRestriction.Sched.Unid.Value; + var schedName = _schedNames.TryGetValue(schedUnid, out var sName) ? sName : $"Schedule {schedUnid}"; + entries.Add($"{doorName} ({schedName})"); + } + else + { + entries.Add($"{doorName} (Always)"); + } + } + + return string.Join(", ", entries); + } + private static bool IsEnrolled(FlexCred cred) { return !string.IsNullOrEmpty(cred?.CardPin?.CredNum); @@ -443,4 +558,86 @@ else if (commaIndex < 0) return ""; return name.Substring(0, commaIndex).Trim(); } + + private async Task ShowEditAccess(FlexCred cred) + { + _editAccessCred = cred; + _editAccessEntries = (cred.PrivBindings ?? new List()) + .Where(b => b.DevAsDoorAccessPriv != null) + .Select(b => new DoorAccessEntry + { + OriginalBinding = b, + DoorUnid = b.DevAsDoorAccessPriv.Unid ?? 0, + SchedUnid = b.SchedRestriction?.Sched?.Unid ?? 0 + }) + .ToList(); + await _editAccessModal.Show(); + } + + private void AddAccessEntry() + { + _editAccessEntries.Add(new DoorAccessEntry()); + } + + private void RemoveAccessEntry(DoorAccessEntry entry) + { + _editAccessEntries.Remove(entry); + } + + private async Task SaveEditAccess() + { + await _editAccessModal.Hide(); + + // Preserve any non-door-access bindings (e.g., Priv-based) + var nonDoorBindings = (_editAccessCred.PrivBindings ?? new List()) + .Where(b => b.DevAsDoorAccessPriv == null) + .ToList(); + + var doorBindings = _editAccessEntries + .Where(e => e.DoorUnid > 0) + .Select(e => + { + // Reuse original binding to preserve all FlexObjRef fields + var binding = e.OriginalBinding ?? new FlexCredPrivBinding + { + DevAsDoorAccessPriv = new FlexObjRef { Unid = e.DoorUnid } + }; + + // Update door ref only if changed or new + if (e.OriginalBinding == null || (binding.DevAsDoorAccessPriv?.Unid ?? 0) != e.DoorUnid) + { + binding.DevAsDoorAccessPriv = new FlexObjRef { Unid = e.DoorUnid }; + } + + // Update schedule restriction + binding.SchedRestriction = e.SchedUnid > 0 + ? new FlexSchedRestriction { Sched = new FlexObjRef { Unid = e.SchedUnid } } + : null; + + return binding; + }) + .ToList(); + + _editAccessCred.PrivBindings = nonDoorBindings.Concat(doorBindings).ToList(); + + try + { + await FlexApi.SaveCredAsync(_editAccessCred); + _snackbarMessage = "Successfully updated door access"; + _snackbarColor = SnackbarColor.Success; + } + catch + { + _snackbarMessage = "Unable to update door access"; + _snackbarColor = SnackbarColor.Danger; + } + await _snackbar.Show(); + } + + private class DoorAccessEntry + { + public FlexCredPrivBinding OriginalBinding { get; set; } + public int DoorUnid { get; set; } + public int SchedUnid { get; set; } + } } diff --git a/src/Aporta.WebClient/Pages/configuration/Schedules.razor b/src/Aporta.WebClient/Pages/configuration/Schedules.razor new file mode 100644 index 0000000..b69f605 --- /dev/null +++ b/src/Aporta.WebClient/Pages/configuration/Schedules.razor @@ -0,0 +1,362 @@ +@page "/configuration/schedules" + +@using System.Linq +@using Aporta.Shared.Calls +@using Aporta.Shared.Models.Flex + +@inject FlexApiService FlexApi + +Schedules + + +@if (_schedules == null) +{ + +} +else +{ + + + + + + + + + + + + + Name + Time Intervals + + + + + @foreach (var sched in _schedules.InstanceList.OrderBy(s => s.Name ?? "")) + { + + + @sched.Name + + + @FormatScheduleSummary(sched) + + + + + + + } + +
+ + + + + + + + + + @(_isEditing ? "Edit Schedule" : "Add Schedule") + + + + + + + + Name + + + + + Please enter a name for the schedule + + + + + + + + + + Time Intervals + + @for (var i = 0; i < _editElements.Count; i++) + { + var index = i; + var element = _editElements[index]; + + + + + + Days + + @for (var d = 0; d < 7; d++) + { + var dayIndex = d; + @DayNames[dayIndex] + } + + + + + + + + Start Time + + + + + + + + Stop Time + + + + + + + + + + + + } + + + + + + + + + +} + + + + @_snackbarMessage + + + + + +@code { + [Inject] + IMessageService MessageService { get; set; } + + private static readonly string[] DayNames = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" }; + + private FlexListResponse _schedules; + + private FlexSched _editSched = new(); + private List _editElements = new(); + private bool _isEditing; + + private Modal _editModal; + private Validations _editValidations; + +#pragma warning disable 649 + private Snackbar _snackbar; +#pragma warning restore 649 + private SnackbarColor _snackbarColor; + private string _snackbarMessage = string.Empty; + + protected override async Task OnInitializedAsync() + { + await LoadSchedules(); + } + + private async Task LoadSchedules() + { + _schedules = await FlexApi.GetSchedListAsync(0, 1000); + } + + private async Task ShowAddModal() + { + _isEditing = false; + _editSched = new FlexSched(); + _editElements = new List(); + await _editModal.Show(); + } + + private async Task ShowEditModal(FlexSched sched) + { + _isEditing = true; + _editSched = new FlexSched + { + Unid = sched.Unid, + Name = sched.Name, + Version = sched.Version, + Tag = sched.Tag, + Uuid = sched.Uuid, + ExternalId = sched.ExternalId + }; + _editElements = (sched.Elements ?? new List()) + .Select(e => new ElementViewModel + { + Unid = e.Unid, + Days = Enumerable.Range(0, 7).Select(d => e.SchedDays?.Contains(d) == true).ToArray(), + Start = StripSeconds(e.Start), + Stop = StripSeconds(e.Stop) + }).ToList(); + await _editModal.Show(); + } + + private async Task SaveSchedule() + { + if (!await _editValidations.ValidateAll()) + { + return; + } + await _editModal.Hide(); + + _editSched.Elements = _editElements.Select(e => new FlexSchedElement + { + Unid = e.Unid, + SchedDays = Enumerable.Range(0, 7).Where(d => e.Days[d]).ToList(), + Start = AppendSeconds(e.Start), + Stop = AppendSeconds(e.Stop), + Holidays = false, + PlusDays = 0, + HolTypes = new List() + }).ToList(); + + try + { + await FlexApi.SaveSchedAsync(_editSched); + _snackbarMessage = _isEditing ? "Successfully updated schedule" : "Successfully added schedule"; + _snackbarColor = SnackbarColor.Success; + } + catch + { + _snackbarMessage = _isEditing ? "Unable to update schedule" : "Unable to add schedule"; + _snackbarColor = SnackbarColor.Danger; + } + + await LoadSchedules(); + await _snackbar.Show(); + } + + private async Task RemoveSchedule(FlexSched sched) + { + if (!await MessageService.Confirm($"Are you sure you want to delete schedule '{sched.Name}'?", "Delete Schedule", options => + { + options.ShowMessageIcon = false; + options.ConfirmButtonColor = Color.Danger; + })) + { + return; + } + + try + { + await FlexApi.DeleteSchedAsync(sched.Unid.Value); + _snackbarMessage = "Successfully deleted schedule"; + _snackbarColor = SnackbarColor.Success; + } + catch + { + _snackbarMessage = "Unable to delete schedule"; + _snackbarColor = SnackbarColor.Danger; + } + + await LoadSchedules(); + await _snackbar.Show(); + } + + private void AddElement() + { + _editElements.Add(new ElementViewModel + { + Days = new bool[7] + }); + } + + private static string FormatScheduleSummary(FlexSched sched) + { + if (sched.Elements == null || sched.Elements.Count == 0) + return ""; + + return string.Join("; ", sched.Elements.Select(FormatElement)); + } + + private static string FormatElement(FlexSchedElement element) + { + var days = FormatDays(element.SchedDays ?? new List()); + var start = StripSeconds(element.Start); + var stop = StripSeconds(element.Stop); + return $"{days} {start}-{stop}"; + } + + private static string FormatDays(List schedDays) + { + if (schedDays.Count == 0) return ""; + + var sorted = schedDays.OrderBy(d => d).ToList(); + var ranges = new List(); + var rangeStart = sorted[0]; + var rangeEnd = sorted[0]; + + for (var i = 1; i < sorted.Count; i++) + { + if (sorted[i] == rangeEnd + 1) + { + rangeEnd = sorted[i]; + } + else + { + ranges.Add(FormatDayRange(rangeStart, rangeEnd)); + rangeStart = sorted[i]; + rangeEnd = sorted[i]; + } + } + ranges.Add(FormatDayRange(rangeStart, rangeEnd)); + + return string.Join(",", ranges); + } + + private static string FormatDayRange(int start, int end) + { + if (start == end) return DayNames[start]; + return $"{DayNames[start]}-{DayNames[end]}"; + } + + private static string StripSeconds(string time) + { + if (string.IsNullOrEmpty(time)) return ""; + var parts = time.Split(':'); + if (parts.Length >= 2) return $"{parts[0]}:{parts[1]}"; + return time; + } + + private static string AppendSeconds(string time) + { + if (string.IsNullOrEmpty(time)) return "00:00:00"; + var parts = time.Split(':'); + if (parts.Length == 2) return $"{time}:00"; + return time; + } + + private class ElementViewModel + { + public int? Unid { get; set; } + public bool[] Days { get; set; } = new bool[7]; + public string Start { get; set; } = ""; + public string Stop { get; set; } = ""; + } +} diff --git a/src/Aporta.WebClient/Shared/MainLayout.razor b/src/Aporta.WebClient/Shared/MainLayout.razor index 829bdf0..ac30019 100644 --- a/src/Aporta.WebClient/Shared/MainLayout.razor +++ b/src/Aporta.WebClient/Shared/MainLayout.razor @@ -42,7 +42,8 @@ Access - Credentials + Credentials + Schedules diff --git a/src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs b/src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs index d38fbd8..72a9b73 100644 --- a/src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs +++ b/src/Aporta/Controllers/Flex/FlexBasicDataLayoutController.cs @@ -24,6 +24,7 @@ public FlexBasicDataLayoutController(IDataAccess dataAccess) protected override FlexDataLayout ToFlex(DataLayout proto) => FlexMapper.ToFlex(proto); protected override DataLayout ToProto(FlexDataLayout flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexDataLayout flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexDataLayout flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(DataLayout proto) => proto.Uuid; [HttpGet("list")] diff --git a/src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs b/src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs index a344d08..a92fd4f 100644 --- a/src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs +++ b/src/Aporta/Controllers/Flex/FlexBinaryFormatController.cs @@ -28,6 +28,7 @@ public FlexBinaryFormatController(IDataAccess dataAccess) protected override FlexDataFormat ToFlex(DataFormat proto) => FlexMapper.ToFlex(proto); protected override DataFormat ToProto(FlexDataFormat flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexDataFormat flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexDataFormat flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(DataFormat proto) => proto.Uuid; [HttpGet("list")] diff --git a/src/Aporta/Controllers/Flex/FlexCredController.cs b/src/Aporta/Controllers/Flex/FlexCredController.cs index e3836b1..84e42b4 100644 --- a/src/Aporta/Controllers/Flex/FlexCredController.cs +++ b/src/Aporta/Controllers/Flex/FlexCredController.cs @@ -1,4 +1,5 @@ using System.Numerics; +using System.Text.Json; using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; @@ -36,6 +37,7 @@ public FlexCredController(IDataAccess dataAccess, IHubContext FlexMapper.ToFlex(proto); protected override Cred ToProto(FlexCred flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexCred flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexCred flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(Cred proto) => proto.Uuid; public override async Task Save([FromBody] FlexCred body) diff --git a/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs b/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs index b54196d..2945609 100644 --- a/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs +++ b/src/Aporta/Controllers/Flex/FlexCredTemplateController.cs @@ -22,5 +22,6 @@ public FlexCredTemplateController(IDataAccess dataAccess) protected override FlexCredTemplate ToFlex(CredTemplate proto) => FlexMapper.ToFlex(proto); protected override CredTemplate ToProto(FlexCredTemplate flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexCredTemplate flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexCredTemplate flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(CredTemplate proto) => proto.Uuid; } diff --git a/src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs b/src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs index 1883ce4..1059ba9 100644 --- a/src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs +++ b/src/Aporta/Controllers/Flex/FlexCrudControllerBase.cs @@ -16,6 +16,7 @@ public abstract class FlexCrudControllerBase : ControllerBase protected abstract TFlex ToFlex(TProto proto); protected abstract TProto ToProto(TFlex flex); protected abstract int GetUnid(TFlex flex); + protected abstract void SetUnid(TFlex flex, int unid); protected virtual async Task FindByIdString(string id) { @@ -58,6 +59,9 @@ public virtual async Task Show(string id) [HttpPost("save")] public virtual async Task Save([FromBody] TFlex body) { + if (GetUnid(body) == 0) + SetUnid(body, await Repository.NextId()); + var proto = ToProto(body); await Repository.Upsert(proto); return Ok(new FlexInstanceResponse { Instance = ToFlex(proto) }); diff --git a/src/Aporta/Controllers/Flex/FlexDataFormatController.cs b/src/Aporta/Controllers/Flex/FlexDataFormatController.cs index 37bcad2..1296686 100644 --- a/src/Aporta/Controllers/Flex/FlexDataFormatController.cs +++ b/src/Aporta/Controllers/Flex/FlexDataFormatController.cs @@ -22,5 +22,6 @@ public FlexDataFormatController(IDataAccess dataAccess) protected override FlexDataFormat ToFlex(DataFormat proto) => FlexMapper.ToFlex(proto); protected override DataFormat ToProto(FlexDataFormat flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexDataFormat flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexDataFormat flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(DataFormat proto) => proto.Uuid; } diff --git a/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs b/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs index 4ed679f..b500b5a 100644 --- a/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs +++ b/src/Aporta/Controllers/Flex/FlexDataLayoutController.cs @@ -22,5 +22,6 @@ public FlexDataLayoutController(IDataAccess dataAccess) protected override FlexDataLayout ToFlex(DataLayout proto) => FlexMapper.ToFlex(proto); protected override DataLayout ToProto(FlexDataLayout flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexDataLayout flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexDataLayout flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(DataLayout proto) => proto.Uuid; } diff --git a/src/Aporta/Controllers/Flex/FlexDevController.cs b/src/Aporta/Controllers/Flex/FlexDevController.cs index 64b27a6..fd2ae16 100644 --- a/src/Aporta/Controllers/Flex/FlexDevController.cs +++ b/src/Aporta/Controllers/Flex/FlexDevController.cs @@ -28,6 +28,7 @@ public FlexDevController(IDataAccess dataAccess) protected override FlexDev ToFlex(Dev proto) => FlexMapper.ToFlex(proto); protected override Dev ToProto(FlexDev flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexDev flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexDev flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(Dev proto) => proto.Uuid; } @@ -49,6 +50,7 @@ protected FlexDevTypeControllerBase(IDataAccess dataAccess) protected override FlexDev ToFlex(Dev proto) => FlexMapper.ToFlex(proto); protected override Dev ToProto(FlexDev flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexDev flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexDev flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(Dev proto) => proto.Uuid; [HttpGet("list")] diff --git a/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs b/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs index 3384d91..4cf4ecb 100644 --- a/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs +++ b/src/Aporta/Controllers/Flex/FlexDoorAccessPrivController.cs @@ -22,5 +22,6 @@ public FlexDoorAccessPrivController(IDataAccess dataAccess) protected override FlexPriv ToFlex(Priv proto) => FlexMapper.ToFlex(proto); protected override Priv ToProto(FlexPriv flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexPriv flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexPriv flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(Priv proto) => proto.Uuid; } diff --git a/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs b/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs index 82b44a8..ab69e1e 100644 --- a/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs +++ b/src/Aporta/Controllers/Flex/FlexEncryptionKeyController.cs @@ -22,5 +22,6 @@ public FlexEncryptionKeyController(IDataAccess dataAccess) protected override FlexEncryptionKey ToFlex(EncryptionKey proto) => FlexMapper.ToFlex(proto); protected override EncryptionKey ToProto(FlexEncryptionKey flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexEncryptionKey flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexEncryptionKey flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(EncryptionKey proto) => proto.Uuid; } diff --git a/src/Aporta/Controllers/Flex/FlexHolCalController.cs b/src/Aporta/Controllers/Flex/FlexHolCalController.cs index 39e7166..3efa791 100644 --- a/src/Aporta/Controllers/Flex/FlexHolCalController.cs +++ b/src/Aporta/Controllers/Flex/FlexHolCalController.cs @@ -22,5 +22,6 @@ public FlexHolCalController(IDataAccess dataAccess) protected override FlexHolCal ToFlex(HolCal proto) => FlexMapper.ToFlex(proto); protected override HolCal ToProto(FlexHolCal flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexHolCal flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexHolCal flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(HolCal proto) => proto.Uuid; } diff --git a/src/Aporta/Controllers/Flex/FlexHolController.cs b/src/Aporta/Controllers/Flex/FlexHolController.cs index 0f5fdcd..ddd238f 100644 --- a/src/Aporta/Controllers/Flex/FlexHolController.cs +++ b/src/Aporta/Controllers/Flex/FlexHolController.cs @@ -22,5 +22,6 @@ public FlexHolController(IDataAccess dataAccess) protected override FlexHol ToFlex(Hol proto) => FlexMapper.ToFlex(proto); protected override Hol ToProto(FlexHol flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexHol flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexHol flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(Hol proto) => proto.Uuid; } diff --git a/src/Aporta/Controllers/Flex/FlexHolTypeController.cs b/src/Aporta/Controllers/Flex/FlexHolTypeController.cs index 828517f..9726038 100644 --- a/src/Aporta/Controllers/Flex/FlexHolTypeController.cs +++ b/src/Aporta/Controllers/Flex/FlexHolTypeController.cs @@ -22,5 +22,6 @@ public FlexHolTypeController(IDataAccess dataAccess) protected override FlexHolType ToFlex(HolType proto) => FlexMapper.ToFlex(proto); protected override HolType ToProto(FlexHolType flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexHolType flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexHolType flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(HolType proto) => proto.Uuid; } diff --git a/src/Aporta/Controllers/Flex/FlexSchedController.cs b/src/Aporta/Controllers/Flex/FlexSchedController.cs index eb42071..8d3af47 100644 --- a/src/Aporta/Controllers/Flex/FlexSchedController.cs +++ b/src/Aporta/Controllers/Flex/FlexSchedController.cs @@ -22,5 +22,6 @@ public FlexSchedController(IDataAccess dataAccess) protected override FlexSched ToFlex(Sched proto) => FlexMapper.ToFlex(proto); protected override Sched ToProto(FlexSched flex) => FlexMapper.ToProto(flex); protected override int GetUnid(FlexSched flex) => flex.Unid ?? 0; + protected override void SetUnid(FlexSched flex, int unid) => flex.Unid = unid; protected override string GetUuidFromProto(Sched proto) => proto.Uuid; } diff --git a/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs b/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs index a96cadb..aeabea8 100644 --- a/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs +++ b/test/Aporta.Core.Tests/DataAccess/Repositories/CredentialRepositoryTests.cs @@ -2,11 +2,13 @@ using System.Data; using System.Linq; using System.Numerics; +using System.Text.Json; using System.Threading.Tasks; using Aporta.Core.DataAccess; using Aporta.Core.DataAccess.Repositories; using Aporta.Core.Models; using Aporta.Shared.Models; +using Aporta.Shared.Models.Flex; using Microsoft.Data.Sqlite; using NUnit.Framework; using Z9.Protobuf; @@ -291,4 +293,116 @@ public void ParsePersonFromName_WithoutComma() Assert.That(person.LastName, Is.Null); Assert.That(person.Enabled, Is.False); } + + [Test] + public async Task CredWithSchedRestriction_SurvivesRoundTrip() + { + // Arrange + var z9CredRepository = new Z9CredRepository(_dataAccess); + + var cred = CreateZ9Cred(1, "Smith, John", true, new BigInteger(12345)); + cred.PrivBindings.Add(new CredPrivBinding + { + DevAsDoorAccessPrivUnid = 42, + SchedRestriction = new SchedRestriction + { + SchedUnid = 7, + Invert = false + } + }); + SpCoreProtoUtil.InitRequired(cred); + + // Act + await z9CredRepository.Upsert(cred); + var retrieved = await z9CredRepository.Get(1); + + // Assert - proto round-trip + Assert.That(retrieved.PrivBindings, Has.Count.EqualTo(1)); + Assert.That(retrieved.PrivBindings[0].DevAsDoorAccessPrivUnid, Is.EqualTo(42)); + Assert.That(retrieved.PrivBindings[0].SchedRestriction, Is.Not.Null, + "SchedRestriction should survive proto JSON round-trip"); + Assert.That(retrieved.PrivBindings[0].SchedRestriction.SchedUnid, Is.EqualTo(7)); + + // Also verify the FlexMapper round-trip + var flex = Aporta.Core.Services.FlexMapper.ToFlex(retrieved); + Assert.That(flex.PrivBindings, Has.Count.EqualTo(1)); + Assert.That(flex.PrivBindings[0].SchedRestriction, Is.Not.Null, + "SchedRestriction should survive FlexMapper.ToFlex"); + Assert.That(flex.PrivBindings[0].SchedRestriction.Sched, Is.Not.Null); + Assert.That(flex.PrivBindings[0].SchedRestriction.Sched.Unid, Is.EqualTo(7)); + + // And the full round-trip back through ToProto + var protoAgain = Aporta.Core.Services.FlexMapper.ToProto(flex); + Assert.That(protoAgain.PrivBindings, Has.Count.EqualTo(1)); + Assert.That(protoAgain.PrivBindings[0].SchedRestriction, Is.Not.Null, + "SchedRestriction should survive FlexMapper.ToProto"); + Assert.That(protoAgain.PrivBindings[0].SchedRestriction.SchedUnid, Is.EqualTo(7)); + } + + [Test] + public async Task CredWithSchedRestriction_SurvivesFullHttpStyleRoundTrip() + { + // This test simulates the full HTTP round-trip: + // Client FlexCred → System.Text.Json serialize → System.Text.Json deserialize (server) → + // FlexMapper.ToProto → DB (proto JSON) → DB read → FlexMapper.ToFlex → + // System.Text.Json serialize (response) → System.Text.Json deserialize (client) + + var z9CredRepository = new Z9CredRepository(_dataAccess); + + // Step 1: Create a FlexCred like the client would (mimics SaveEditAccess) + var clientFlexCred = new FlexCred + { + Unid = 1, + Name = "Smith, John", + Enabled = true, + CredTemplate = new FlexObjRef { Unid = 1 }, + CardPin = new FlexCardPin { CredNum = "12345" }, + PrivBindings = new System.Collections.Generic.List + { + new FlexCredPrivBinding + { + DevAsDoorAccessPriv = new FlexObjRef { Unid = 42, Type = "dev" }, + SchedRestriction = new FlexSchedRestriction + { + Sched = new FlexObjRef { Unid = 7 } + } + } + } + }; + + // Step 2: Simulate HTTP transport (System.Text.Json round-trip) + var clientJson = JsonSerializer.Serialize(clientFlexCred); + TestContext.Progress.WriteLine($"Client JSON: {clientJson}"); + var serverFlexCred = JsonSerializer.Deserialize(clientJson); + + // Verify SchedRestriction survives System.Text.Json round-trip + Assert.That(serverFlexCred.PrivBindings[0].SchedRestriction, Is.Not.Null, + "SchedRestriction should survive System.Text.Json round-trip (simulated HTTP)"); + Assert.That(serverFlexCred.PrivBindings[0].SchedRestriction.Sched.Unid, Is.EqualTo(7)); + + // Step 3: Server-side: ToProto + InitRequired + Upsert (same as FlexCredController.Save) + var proto = Aporta.Core.Services.FlexMapper.ToProto(serverFlexCred); + SpCoreProtoUtil.InitRequired(proto); + await z9CredRepository.Upsert(proto); + + // Step 4: Server-side: GetAll + ToFlex (same as FlexCrudControllerBase.List) + var allProtos = (await z9CredRepository.GetAll()).ToList(); + var responseFlex = Aporta.Core.Services.FlexMapper.ToFlex(allProtos[0]); + + // Step 5: Simulate HTTP response (System.Text.Json serialize + deserialize) + var responseJson = JsonSerializer.Serialize(responseFlex); + TestContext.Progress.WriteLine($"Response JSON: {responseJson}"); + var clientReceivedFlex = JsonSerializer.Deserialize(responseJson); + + // Assert - full round-trip + Assert.That(clientReceivedFlex.PrivBindings, Has.Count.EqualTo(1)); + Assert.That(clientReceivedFlex.PrivBindings[0].DevAsDoorAccessPriv, Is.Not.Null); + Assert.That(clientReceivedFlex.PrivBindings[0].DevAsDoorAccessPriv.Unid, Is.EqualTo(42)); + Assert.That(clientReceivedFlex.PrivBindings[0].SchedRestriction, Is.Not.Null, + "SchedRestriction should survive the full HTTP-style round-trip"); + Assert.That(clientReceivedFlex.PrivBindings[0].SchedRestriction.Sched, Is.Not.Null, + "SchedRestriction.Sched should survive the full round-trip"); + Assert.That(clientReceivedFlex.PrivBindings[0].SchedRestriction.Sched.Unid, Is.EqualTo(7), + "SchedRestriction.Sched.Unid should be preserved"); + } } diff --git a/test/Aporta.Selenium.Tests/AccessGrantedTest.cs b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs index 72174a1..9b9da40 100644 --- a/test/Aporta.Selenium.Tests/AccessGrantedTest.cs +++ b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs @@ -289,14 +289,14 @@ public void AddPerson() _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/credentials"); - WaitForBodyText("Add Person"); + WaitForBodyText("Add Credential"); - ClickButtonContaining("Add Person"); + ClickButtonContaining("Add Credential"); WaitForModal(); var modal = _driver.FindElement(By.CssSelector("div.modal.show")); var inputs = modal.FindElements(By.CssSelector("input[type='text'],input:not([type])")); - Assert.That(inputs.Count, Is.GreaterThanOrEqualTo(2), "Expected at least 2 text inputs in Add Person modal"); + Assert.That(inputs.Count, Is.GreaterThanOrEqualTo(2), "Expected at least 2 text inputs in Add Credential modal"); inputs[0].Clear(); inputs[0].SendKeys("Test"); @@ -396,7 +396,7 @@ public void EnrollPersonWithBadge() wait.Until(d => { var body = d.FindElement(By.TagName("body")); - return body.Text.Contains("Successfully enrolled person"); + return body.Text.Contains("Successfully enrolled credential"); }); // Reload to verify enrollment persisted (person row should show badge number) @@ -412,7 +412,11 @@ public void EnrollPersonWithBadge() Assert.That(enrolledRow.Text, Does.Contain("12345"), "Person row should contain badge number 12345 after enrollment"); - TakeScreenshot("07_person_enrolled", "Enroll Test Person with badge 12345 — badge number now appears in their row"); + // Verify Door Access column shows the door with Always schedule + Assert.That(enrolledRow.Text, Does.Contain("Test Door (Always)"), + "Person row should show 'Test Door (Always)' in the Door Access column after enrollment"); + + TakeScreenshot("07_person_enrolled", "Enroll Test Person with badge 12345 — badge number and door access now appear in their row"); TestContext.Progress.WriteLine("Person enrolled with badge 12345 successfully"); } @@ -479,6 +483,273 @@ public void VerifyAccessGrantedOnMonitoringPage() TestContext.Progress.WriteLine("Access Granted event verified on monitoring page!"); } + [Test, Order(9)] + public void AddSchedule() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/schedules"); + + WaitForBodyText("Add Schedule"); + + TakeScreenshot("10_schedules_page_empty", "Schedules page before any schedules have been created"); + + ClickButtonContaining("Add Schedule"); + WaitForModal(); + + // Enter schedule name + var modal = _driver.FindElement(By.CssSelector("div.modal.show")); + var nameInput = modal.FindElement(By.CssSelector("input")); + nameInput.Clear(); + nameInput.SendKeys("Business Hours"); + nameInput.SendKeys(Keys.Tab); + + // Add a time interval + var addIntervalButton = modal.FindElements(By.TagName("button")) + .First(b => b.Displayed && b.Text.Contains("Add Time Interval")); + addIntervalButton.Click(); + + // Wait for the interval card to appear + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(10)); + wait.Until(d => + { + var m = d.FindElement(By.CssSelector("div.modal.show")); + return m.FindElements(By.CssSelector(".card .card-body")).Count > 0; + }); + + // Find the interval card within the modal + var intervalCard = modal.FindElement(By.CssSelector(".card .card-body")); + + // Check Mon through Fri — Blazorise renders Check as hidden input + visible label, + // so click the labels (custom-control-label) instead of the inputs + var checkboxLabels = intervalCard.FindElements(By.CssSelector("label.custom-control-label")); + Assert.That(checkboxLabels.Count, Is.EqualTo(7), "Expected 7 day-of-week checkbox labels"); + for (var i = 0; i < 5; i++) + { + checkboxLabels[i].Click(); + } + + // Enter start and stop times + var timeInputs = intervalCard.FindElements(By.CssSelector("input[type='text']")); + Assert.That(timeInputs.Count, Is.GreaterThanOrEqualTo(2), "Expected at least 2 time inputs"); + timeInputs[0].Clear(); + timeInputs[0].SendKeys("08:00"); + timeInputs[1].Clear(); + timeInputs[1].SendKeys("17:00"); + + TakeScreenshot("11_schedule_modal_filled", "Add Schedule modal with Business Hours — Mon through Fri, 08:00 to 17:00"); + + ClickModalButton("Save"); + WaitForModalClose(); + + // Wait for the schedule to appear in the table + WaitForBodyText("Business Hours"); + + // Verify the summary shows the expected time interval + var scheduleRow = FindTableRowContaining("Business Hours"); + Assert.That(scheduleRow.Text, Does.Contain("Mon"), + "Schedule row should show day abbreviations"); + Assert.That(scheduleRow.Text, Does.Contain("08:00"), + "Schedule row should show start time"); + Assert.That(scheduleRow.Text, Does.Contain("17:00"), + "Schedule row should show stop time"); + + TakeScreenshot("12_schedule_created", "Business Hours schedule created — Mon-Fri 08:00-17:00 visible in the schedules table"); + TestContext.Progress.WriteLine("Schedule 'Business Hours' added successfully"); + } + + [Test, Order(10)] + public void CreateNotTodaySchedule() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/schedules"); + + WaitForBodyText("Add Schedule"); + + ClickButtonContaining("Add Schedule"); + WaitForModal(); + + var modal = _driver.FindElement(By.CssSelector("div.modal.show")); + var nameInput = modal.FindElement(By.CssSelector("input")); + nameInput.Clear(); + nameInput.SendKeys("Not Today"); + nameInput.SendKeys(Keys.Tab); + + // Add a time interval + var addIntervalButton = modal.FindElements(By.TagName("button")) + .First(b => b.Displayed && b.Text.Contains("Add Time Interval")); + addIntervalButton.Click(); + + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(10)); + wait.Until(d => + { + var m = d.FindElement(By.CssSelector("div.modal.show")); + return m.FindElements(By.CssSelector(".card .card-body")).Count > 0; + }); + + var intervalCard = modal.FindElement(By.CssSelector(".card .card-body")); + + // Check only a day that is NOT today + // Checkbox indices: Mon=0, Tue=1, Wed=2, Thu=3, Fri=4, Sat=5, Sun=6 + var today = DateTime.Now.DayOfWeek; + var todayIndex = today == DayOfWeek.Sunday ? 6 : (int)today - 1; + var notTodayIndex = (todayIndex + 1) % 7; + + var checkboxLabels = intervalCard.FindElements(By.CssSelector("label.custom-control-label")); + Assert.That(checkboxLabels.Count, Is.EqualTo(7), "Expected 7 day-of-week checkbox labels"); + checkboxLabels[notTodayIndex].Click(); + + // Enter all-day time range + var timeInputs = intervalCard.FindElements(By.CssSelector("input[type='text']")); + Assert.That(timeInputs.Count, Is.GreaterThanOrEqualTo(2), "Expected at least 2 time inputs"); + timeInputs[0].Clear(); + timeInputs[0].SendKeys("00:00"); + timeInputs[1].Clear(); + timeInputs[1].SendKeys("23:59"); + + TakeScreenshot("13_not_today_schedule_modal", "Add 'Not Today' schedule — active only on a day that is not today"); + + ClickModalButton("Save"); + WaitForModalClose(); + + WaitForBodyText("Not Today"); + + TakeScreenshot("14_not_today_schedule_created", "'Not Today' schedule created — will cause Access Denied when assigned"); + TestContext.Progress.WriteLine("Schedule 'Not Today' added successfully"); + } + + [Test, Order(11)] + public void EditCredentialAccessToNotToday() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/credentials"); + + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(30)); + wait.Until(d => + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Test") && body.Text.Contains("Person"); + }); + + // Find the person row and click Action dropdown + var personRow = FindTableRowContaining("Person"); + var actionToggle = personRow.FindElement(By.CssSelector("button.dropdown-toggle")); + actionToggle.Click(); + + WaitForVisibleDropdown(); + ClickDropdownItem("Edit Access"); + + WaitForModal(); + + // The modal should show the existing "Test Door (Always)" binding + var modal = _driver.FindElement(By.CssSelector("div.modal.show")); + var selects = modal.FindElements(By.CssSelector("select")); + Assert.That(selects.Count, Is.GreaterThanOrEqualTo(2), + "Expected at least 2 selects (door + schedule) in Edit Access modal"); + + // Change the schedule dropdown (second select) from "Always" to "Not Today" + var schedSelect = new SelectElement(selects[1]); + SelectOptionContainingText(schedSelect, "Not Today"); + + TakeScreenshot("15_edit_access_not_today", "Edit Access modal — changing schedule from Always to Not Today"); + + ClickModalButton("Save"); + WaitForModalClose(); + + // Wait for the snackbar confirmation + wait.Until(d => + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Successfully updated door access"); + }); + + // Reload and verify the Door Access column shows "Not Today" schedule + _driver.Navigate().GoToUrl($"{BaseUrl}/configuration/credentials"); + wait.Until(d => + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Test") && body.Text.Contains("Person"); + }); + + // Wait for door/schedule lookups to resolve and render in the Door Access column + wait.Until(d => + { + var row = FindTableRowContaining("Person"); + return row.Text.Contains("Test Door"); + }); + + var updatedRow = FindTableRowContaining("Person"); + Assert.That(updatedRow.Text, Does.Contain("Test Door (Not Today)"), + "Person row should show 'Test Door (Not Today)' after editing access"); + + TakeScreenshot("16_credential_access_updated", "Credentials page — door access now shows 'Test Door (Not Today)'"); + TestContext.Progress.WriteLine("Credential access updated to 'Not Today' schedule"); + } + + [Test, Order(12)] + public void SwipeBadgeThirdTime() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/driver/{VirtualDriverGuid}"); + + WaitForBodyText("Test Reader"); + var readerRow = _driver.FindElement(By.Id("Reader:Test Reader")); + + var actionToggle = readerRow.FindElement(By.CssSelector("button.dropdown-toggle")); + actionToggle.Click(); + + WaitForVisibleDropdown(); + ClickDropdownItem("Swipe Badge"); + + WaitForModal(); + + var badgeInput = _driver.FindElement(By.Id("SwipeBadgeTextEdit")); + badgeInput.Clear(); + badgeInput.SendKeys("12345"); + badgeInput.SendKeys(Keys.Tab); + + ClickModalButton("Swipe the badge"); + WaitForModalClose(); + + // Wait for server to process + Thread.Sleep(2000); + + TakeScreenshot("17_badge_swiped_third", "Swipe badge 12345 again — schedule is not active today, should trigger Access Denied"); + TestContext.Progress.WriteLine("Badge swiped third time (should trigger Access Denied)"); + } + + [Test, Order(13)] + public void VerifyAccessDeniedOnMonitoringPage() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/monitoring"); + + // Wait for the Access Denied event from the third swipe (schedule restriction). + // The monitoring page shows newest events first. The first Access Denied row should + // be from swipe 3 — it will include the credential name "Person, Test" because the + // credential was recognized. (The earlier Access Denied from swipe 1 would NOT have + // a credential name since it was an unknown badge.) + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(30)); + wait.Until(d => + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Access Denied"); + }); + + var accessDeniedRow = FindTableRowContaining("Access Denied"); + Assert.That(accessDeniedRow.Text, Does.Contain("Test Reader"), + "Access Denied event should show device name 'Test Reader'"); + Assert.That(accessDeniedRow.Text, Does.Contain("Person, Test"), + "Access Denied event should show credential name 'Person, Test' (proves it's from the schedule-restricted swipe, not the unknown-badge swipe)"); + + TakeScreenshot("18_access_denied_verified", "Monitoring page shows Access Denied — credential's schedule is not active today"); + TestContext.Progress.WriteLine("Access Denied event verified on monitoring page!"); + } + // --- Helper Methods --- /// From 55e542db4948537c362c2206e77479d3e831b285 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Wed, 11 Feb 2026 09:36:10 -0500 Subject: [PATCH 78/86] Add card format management page to web UI Create, edit, and delete binary card formats (DataFormat + DataLayout) from a new Card Formats page under Configuration > Access. Each format defines min/max bits and a list of binary elements (static, parity, or field). Selenium test validates creating a Standard 26-Bit format. Co-Authored-By: Claude Opus 4.6 --- README.md | 3 +- src/Aporta.Shared/Calls/FlexApiService.cs | 30 ++ .../Pages/configuration/CardFormats.razor | 484 ++++++++++++++++++ src/Aporta.WebClient/Shared/MainLayout.razor | 1 + .../AccessGrantedTest.cs | 181 +++++++ 5 files changed, 698 insertions(+), 1 deletion(-) create mode 100644 src/Aporta.WebClient/Pages/configuration/CardFormats.razor diff --git a/README.md b/README.md index 29a66f2..444b27a 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ Aporta supports the Z9/Flex Community Profile as a JSON/REST API, intended for u - Log access events - Door access privilege management from Credentials page (assign/remove doors, set schedule restrictions) - Door Access column on Credentials page showing assigned doors with schedule names + - Card format management (create, edit, delete binary card formats with parity, field, and static elements) ### Z9/Open Community Profile - Connection & Protocol @@ -97,7 +98,7 @@ The web UI communicates with the server through the Z9/Flex Community Profile AP - OSDP Driver - Notify when input is tripped - Access Control - - Standalone UI for managing card formats and holidays (schedules and door access privileges are now managed from the web UI) + - Standalone UI for managing holidays (schedules, card formats, and door access privileges are now managed from the web UI) ### Z9/Open Community Profile - DbChange: Handle device deletions (devDelete, devDeleteAll) — currently silently ignored, causing stale devices to accumulate diff --git a/src/Aporta.Shared/Calls/FlexApiService.cs b/src/Aporta.Shared/Calls/FlexApiService.cs index f1eec17..00dbcfe 100644 --- a/src/Aporta.Shared/Calls/FlexApiService.cs +++ b/src/Aporta.Shared/Calls/FlexApiService.cs @@ -70,6 +70,36 @@ public async Task DeleteSchedAsync(int unid) return await FlexPostAsync($"sched/delete/{unid}"); } + public async Task> GetBinaryFormatListAsync(int offset, int max) + { + return await FlexGetAsync>($"binaryFormat/list?offset={offset}&max={max}"); + } + + public async Task> SaveDataFormatAsync(FlexDataFormat dataFormat) + { + return await FlexPostAsync>("dataFormat/save", dataFormat); + } + + public async Task DeleteDataFormatAsync(int unid) + { + return await FlexPostAsync($"dataFormat/delete/{unid}"); + } + + public async Task> GetBasicDataLayoutListAsync(int offset, int max) + { + return await FlexGetAsync>($"basicDataLayout/list?offset={offset}&max={max}"); + } + + public async Task> SaveDataLayoutAsync(FlexDataLayout dataLayout) + { + return await FlexPostAsync>("dataLayout/save", dataLayout); + } + + public async Task DeleteDataLayoutAsync(int unid) + { + return await FlexPostAsync($"dataLayout/delete/{unid}"); + } + public async Task> GetSensorListAsync(int offset, int max) { return await FlexGetAsync>($"sensor/list?offset={offset}&max={max}"); diff --git a/src/Aporta.WebClient/Pages/configuration/CardFormats.razor b/src/Aporta.WebClient/Pages/configuration/CardFormats.razor new file mode 100644 index 0000000..04843d2 --- /dev/null +++ b/src/Aporta.WebClient/Pages/configuration/CardFormats.razor @@ -0,0 +1,484 @@ +@page "/configuration/cardformats" + +@using System.Linq +@using Aporta.Shared.Calls +@using Aporta.Shared.Models.Flex + +@inject FlexApiService FlexApi + +Card Formats + + +@if (_layouts == null) +{ + +} +else +{ + + + + + + + + + + + + + Name + Bits + Elements + Priority + + + + + @foreach (var dl in _layouts.InstanceList.OrderBy(l => l.Name ?? "")) + { + var dataLayout = dl; + var format = GetFormatForLayout(dataLayout); + + + @dataLayout.Name + + + @FormatBitsRange(format) + + + @(format?.Elements?.Count ?? 0) + + + @dataLayout.Priority + + + + + + + } + +
+ + + + + + + + + + @(_isEditing ? "Edit Card Format" : "Add Card Format") + + + + + + + + Name + + + + + Please enter a name for the card format + + + + + + + + + + + + Min Bits + + + + + + + + Max Bits + + + + + + + + Priority + + + + + + + + + Enabled + + + + Binary Elements + + @for (var i = 0; i < _editElements.Count; i++) + { + var index = i; + var element = _editElements[index]; + + + + + + Type + + + + + + + + Start Bit + + + + + + + + Length + + + + + + + + @if (element.Type == 2) + { + + + + Field + + + + + + + } + else if (element.Type == 1) + { + + + + Odd Parity + + + + + Src Start + + + + + + + + Src Length + + + + + + + } + else if (element.Type == 0) + { + + + + Value + + + + + + + } + + + + + + + + + } + + + + + + + + + +} + + + + @_snackbarMessage + + + + + +@code { + [Inject] + IMessageService MessageService { get; set; } + + private FlexListResponse _layouts; + private Dictionary _formatsByUnid = new(); + + private FlexDataLayout _editLayout = new(); + private FlexDataFormat _editFormat = new(); + private List _editElements = new(); + private bool _isEditing; + + private Modal _editModal; + private Validations _editValidations; + +#pragma warning disable 649 + private Snackbar _snackbar; +#pragma warning restore 649 + private SnackbarColor _snackbarColor; + private string _snackbarMessage = string.Empty; + + protected override async Task OnInitializedAsync() + { + await LoadCardFormats(); + } + + private async Task LoadCardFormats() + { + _layouts = await FlexApi.GetBasicDataLayoutListAsync(0, 1000); + var formats = await FlexApi.GetBinaryFormatListAsync(0, 1000); + _formatsByUnid = new Dictionary(); + foreach (var f in formats.InstanceList) + { + if (f.Unid.HasValue) + _formatsByUnid[f.Unid.Value] = f; + } + } + + private FlexDataFormat GetFormatForLayout(FlexDataLayout layout) + { + if (layout.DataFormat?.Unid != null && _formatsByUnid.TryGetValue(layout.DataFormat.Unid.Value, out var format)) + return format; + return null; + } + + private static string FormatBitsRange(FlexDataFormat format) + { + if (format == null) return ""; + if (format.MinBits == format.MaxBits) return format.MinBits?.ToString() ?? ""; + return $"{format.MinBits}–{format.MaxBits}"; + } + + private async Task ShowAddModal() + { + _isEditing = false; + _editLayout = new FlexDataLayout { Enabled = true }; + _editFormat = new FlexDataFormat(); + _editElements = new List(); + await _editModal.Show(); + } + + private async Task ShowEditModal(FlexDataLayout layout) + { + _isEditing = true; + _editLayout = new FlexDataLayout + { + Unid = layout.Unid, + Name = layout.Name, + Version = layout.Version, + Tag = layout.Tag, + Uuid = layout.Uuid, + LayoutType = layout.LayoutType, + Priority = layout.Priority, + Enabled = layout.Enabled, + DataFormat = layout.DataFormat + }; + + var format = GetFormatForLayout(layout); + if (format != null) + { + _editFormat = new FlexDataFormat + { + Unid = format.Unid, + Name = format.Name, + Version = format.Version, + Tag = format.Tag, + Uuid = format.Uuid, + DataFormatType = format.DataFormatType, + MinBits = format.MinBits, + MaxBits = format.MaxBits, + SupportReverseRead = format.SupportReverseRead + }; + _editElements = (format.Elements ?? new List()) + .OrderBy(e => e.Num) + .Select(e => new BinaryElementViewModel + { + Unid = e.Unid, + Type = e.Type ?? 0, + Start = e.Start, + Len = e.Len, + Field = e.Field, + Odd = e.Odd, + SrcStart = e.SrcStart, + SrcLen = e.SrcLen, + Value = e.Value + }).ToList(); + } + else + { + _editFormat = new FlexDataFormat(); + _editElements = new List(); + } + + await _editModal.Show(); + } + + private async Task SaveCardFormat() + { + if (!await _editValidations.ValidateAll()) + { + return; + } + await _editModal.Hide(); + + _editFormat.Name = _editLayout.Name; + _editFormat.DataFormatType = 1; // Binary + + _editFormat.Elements = _editElements.Select((e, i) => + { + var elem = new FlexBinaryElement + { + Unid = e.Unid, + Num = i + 1, + Type = e.Type, + Start = e.Start, + Len = e.Len + }; + + switch (e.Type) + { + case 0: // Static + elem.Value = e.Value; + break; + case 1: // Parity + elem.Odd = e.Odd; + elem.SrcStart = e.SrcStart; + elem.SrcLen = e.SrcLen; + break; + case 2: // Field + elem.Field = e.Field; + break; + } + + return elem; + }).ToList(); + + try + { + var formatResult = await FlexApi.SaveDataFormatAsync(_editFormat); + var savedFormatUnid = formatResult.Instance?.Unid; + + _editLayout.DataFormat = new FlexObjRef { Unid = savedFormatUnid }; + _editLayout.LayoutType = 0; // Basic + + await FlexApi.SaveDataLayoutAsync(_editLayout); + + _snackbarMessage = _isEditing ? "Successfully updated card format" : "Successfully added card format"; + _snackbarColor = SnackbarColor.Success; + } + catch + { + _snackbarMessage = _isEditing ? "Unable to update card format" : "Unable to add card format"; + _snackbarColor = SnackbarColor.Danger; + } + + await LoadCardFormats(); + await _snackbar.Show(); + } + + private async Task RemoveCardFormat(FlexDataLayout layout) + { + if (!await MessageService.Confirm($"Are you sure you want to delete card format '{layout.Name}'?", "Delete Card Format", options => + { + options.ShowMessageIcon = false; + options.ConfirmButtonColor = Color.Danger; + })) + { + return; + } + + try + { + await FlexApi.DeleteDataLayoutAsync(layout.Unid.Value); + var format = GetFormatForLayout(layout); + if (format?.Unid != null) + { + await FlexApi.DeleteDataFormatAsync(format.Unid.Value); + } + _snackbarMessage = "Successfully deleted card format"; + _snackbarColor = SnackbarColor.Success; + } + catch + { + _snackbarMessage = "Unable to delete card format"; + _snackbarColor = SnackbarColor.Danger; + } + + await LoadCardFormats(); + await _snackbar.Show(); + } + + private void AddElement() + { + _editElements.Add(new BinaryElementViewModel()); + } + + private class BinaryElementViewModel + { + public int? Unid { get; set; } + public int Type { get; set; } // 0=Static, 1=Parity, 2=Field + public int? Start { get; set; } + public int? Len { get; set; } + public int? Field { get; set; } // 0=CRED_NUM, 1=FACILITY_CODE (type=2) + public bool? Odd { get; set; } // type=1 + public int? SrcStart { get; set; } // type=1 + public int? SrcLen { get; set; } // type=1 + public string Value { get; set; } // type=0 + } +} diff --git a/src/Aporta.WebClient/Shared/MainLayout.razor b/src/Aporta.WebClient/Shared/MainLayout.razor index ac30019..e997d53 100644 --- a/src/Aporta.WebClient/Shared/MainLayout.razor +++ b/src/Aporta.WebClient/Shared/MainLayout.razor @@ -44,6 +44,7 @@ Credentials Schedules + Card Formats diff --git a/test/Aporta.Selenium.Tests/AccessGrantedTest.cs b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs index 9b9da40..86e5eb2 100644 --- a/test/Aporta.Selenium.Tests/AccessGrantedTest.cs +++ b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs @@ -750,6 +750,187 @@ public void VerifyAccessDeniedOnMonitoringPage() TestContext.Progress.WriteLine("Access Denied event verified on monitoring page!"); } + [Test, Order(14)] + public void AddCardFormat() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/cardformats"); + + WaitForBodyText("Add Card Format"); + + TakeScreenshot("20_card_formats_page_empty", "Card Formats page before any card formats have been created"); + + ClickButtonContaining("Add Card Format"); + WaitForModal(); + + var modal = _driver.FindElement(By.CssSelector("div.modal.show")); + + // Enter card format name + var nameInput = modal.FindElement(By.CssSelector("input")); + nameInput.Clear(); + nameInput.SendKeys("Standard 26-Bit"); + nameInput.SendKeys(Keys.Tab); + + // Set Min Bits and Max Bits (numeric inputs) + var numericInputs = modal.FindElements(By.CssSelector("input[type='number']")); + Assert.That(numericInputs.Count, Is.GreaterThanOrEqualTo(2), "Expected at least 2 numeric inputs for Min/Max bits"); + + // Min Bits + numericInputs[0].Clear(); + numericInputs[0].SendKeys("26"); + numericInputs[0].SendKeys(Keys.Tab); + + // Max Bits + numericInputs[1].Clear(); + numericInputs[1].SendKeys("26"); + numericInputs[1].SendKeys(Keys.Tab); + + // Add Element 1: Even Parity (type=1) + ClickModalBodyButton("Add Element"); + WaitForElementCards(1); + + var elementCards = GetElementCards(); + SetElementType(elementCards[0], "Parity"); + SetElementNumericFields(elementCards[0], start: 0, length: 1); + // Even parity: leave Odd unchecked, set src start/length + SetParityFields(elementCards[0], srcStart: 1, srcLength: 12); + + // Add Element 2: Facility Code (type=2) + ClickModalBodyButton("Add Element"); + WaitForElementCards(2); + + elementCards = GetElementCards(); + SetElementType(elementCards[1], "Field"); + SetElementNumericFields(elementCards[1], start: 1, length: 8); + SetFieldType(elementCards[1], "Facility Code"); + + // Add Element 3: Card Number (type=2) + ClickModalBodyButton("Add Element"); + WaitForElementCards(3); + + elementCards = GetElementCards(); + SetElementType(elementCards[2], "Field"); + SetElementNumericFields(elementCards[2], start: 9, length: 16); + // Card Number is default (value 0), no change needed + + // Add Element 4: Odd Parity (type=1) + ClickModalBodyButton("Add Element"); + WaitForElementCards(4); + + elementCards = GetElementCards(); + SetElementType(elementCards[3], "Parity"); + SetElementNumericFields(elementCards[3], start: 25, length: 1); + SetParityOdd(elementCards[3], true); + SetParityFields(elementCards[3], srcStart: 13, srcLength: 12); + + TakeScreenshot("21_card_format_modal_filled", "Add Card Format modal with Standard 26-Bit — 4 elements: Even Parity, Facility Code, Card Number, Odd Parity"); + + ClickModalButton("Save"); + WaitForModalClose(); + + // Wait for the card format to appear in the table + WaitForBodyText("Standard 26-Bit"); + + var formatRow = FindTableRowContaining("Standard 26-Bit"); + Assert.That(formatRow.Text, Does.Contain("26"), + "Card format row should show bit count"); + Assert.That(formatRow.Text, Does.Contain("4"), + "Card format row should show 4 elements"); + + TakeScreenshot("22_card_format_created", "Standard 26-Bit card format created — 26 bits, 4 elements visible in the table"); + TestContext.Progress.WriteLine("Card format 'Standard 26-Bit' added successfully"); + } + + // --- Card Format Test Helpers --- + + private void ClickModalBodyButton(string text) + { + var modal = _driver!.FindElement(By.CssSelector("div.modal.show")); + var body = modal.FindElement(By.CssSelector(".modal-body")); + var buttons = body.FindElements(By.TagName("button")); + foreach (var button in buttons) + { + if (button.Displayed && button.Text.Contains(text)) + { + button.Click(); + return; + } + } + Assert.Fail($"Could not find modal body button containing '{text}'"); + } + + private void WaitForElementCards(int expectedCount) + { + var wait = new WebDriverWait(_driver!, TimeSpan.FromSeconds(10)); + wait.Until(d => + { + var modal = d.FindElement(By.CssSelector("div.modal.show")); + var body = modal.FindElement(By.CssSelector(".modal-body")); + return body.FindElements(By.CssSelector(".card .card-body")).Count >= expectedCount; + }); + } + + private IReadOnlyList GetElementCards() + { + var modal = _driver!.FindElement(By.CssSelector("div.modal.show")); + var body = modal.FindElement(By.CssSelector(".modal-body")); + return body.FindElements(By.CssSelector(".card .card-body")); + } + + private void SetElementType(IWebElement card, string typeName) + { + var select = new SelectElement(card.FindElement(By.CssSelector("select"))); + select.SelectByText(typeName); + // Allow Blazor to re-render after type change + Thread.Sleep(500); + } + + private void SetElementNumericFields(IWebElement card, int start, int length) + { + var numInputs = card.FindElements(By.CssSelector("input[type='number']")); + Assert.That(numInputs.Count, Is.GreaterThanOrEqualTo(2), "Expected at least 2 numeric inputs in element card"); + numInputs[0].Clear(); + numInputs[0].SendKeys(start.ToString()); + numInputs[0].SendKeys(Keys.Tab); + numInputs[1].Clear(); + numInputs[1].SendKeys(length.ToString()); + numInputs[1].SendKeys(Keys.Tab); + } + + private void SetFieldType(IWebElement card, string fieldName) + { + // After type change, a second select appears for Field type + var selects = card.FindElements(By.CssSelector("select")); + Assert.That(selects.Count, Is.GreaterThanOrEqualTo(2), "Expected at least 2 selects for Field element"); + var fieldSelect = new SelectElement(selects[1]); + fieldSelect.SelectByText(fieldName); + } + + private void SetParityOdd(IWebElement card, bool odd) + { + if (!odd) return; + var checkboxLabels = card.FindElements(By.CssSelector("label.custom-control-label")); + if (checkboxLabels.Count > 0) + { + checkboxLabels[0].Click(); + } + } + + private void SetParityFields(IWebElement card, int srcStart, int srcLength) + { + // After type=Parity, additional numeric inputs appear for Src Start and Src Length + var numInputs = card.FindElements(By.CssSelector("input[type='number']")); + // First 2 are Start Bit and Length, next 2 are Src Start and Src Length + Assert.That(numInputs.Count, Is.GreaterThanOrEqualTo(4), "Expected at least 4 numeric inputs for Parity element"); + numInputs[2].Clear(); + numInputs[2].SendKeys(srcStart.ToString()); + numInputs[2].SendKeys(Keys.Tab); + numInputs[3].Clear(); + numInputs[3].SendKeys(srcLength.ToString()); + numInputs[3].SendKeys(Keys.Tab); + } + // --- Helper Methods --- /// From fa004123a08cbea5dd2eb674557793c928021633 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Wed, 11 Feb 2026 11:02:47 -0500 Subject: [PATCH 79/86] Add holiday management page and holidays toggle on schedule elements Adds the Holidays configuration page for creating, editing, and deleting holidays with repeat and schedule preservation options. Exposes the Holidays checkbox on schedule time intervals so they can match during holidays. Includes Selenium tests verifying the holiday-aware access control flow: schedule without holidays causes denial on a holiday day, enabling holidays on the schedule restores access. Co-Authored-By: Claude Opus 4.6 --- README.md | 3 +- src/Aporta.Shared/Calls/FlexApiService.cs | 25 ++ .../Pages/configuration/Holidays.razor | 287 ++++++++++++++ .../Pages/configuration/Schedules.razor | 13 +- src/Aporta.WebClient/Shared/MainLayout.razor | 1 + .../AccessGrantedTest.cs | 352 +++++++++++++++++- 6 files changed, 675 insertions(+), 6 deletions(-) create mode 100644 src/Aporta.WebClient/Pages/configuration/Holidays.razor diff --git a/README.md b/README.md index 444b27a..b1d0069 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ Aporta supports the Z9/Flex Community Profile as a JSON/REST API, intended for u - Door access privilege management from Credentials page (assign/remove doors, set schedule restrictions) - Door Access column on Credentials page showing assigned doors with schedule names - Card format management (create, edit, delete binary card formats with parity, field, and static elements) + - Holiday management (create, edit, delete holidays with repeat and schedule preservation options) ### Z9/Open Community Profile - Connection & Protocol @@ -97,8 +98,6 @@ The web UI communicates with the server through the Z9/Flex Community Profile AP - Configurable user accounts (currently uses default credentials) - OSDP Driver - Notify when input is tripped -- Access Control - - Standalone UI for managing holidays (schedules, card formats, and door access privileges are now managed from the web UI) ### Z9/Open Community Profile - DbChange: Handle device deletions (devDelete, devDeleteAll) — currently silently ignored, causing stale devices to accumulate diff --git a/src/Aporta.Shared/Calls/FlexApiService.cs b/src/Aporta.Shared/Calls/FlexApiService.cs index 00dbcfe..72af36d 100644 --- a/src/Aporta.Shared/Calls/FlexApiService.cs +++ b/src/Aporta.Shared/Calls/FlexApiService.cs @@ -204,6 +204,31 @@ public async Task DeleteActuatorAsync(int unid) return await FlexPostAsync($"actuator/delete/{unid}"); } + public async Task> GetHolListAsync(int offset, int max) + { + return await FlexGetAsync>($"hol/list?offset={offset}&max={max}"); + } + + public async Task> SaveHolAsync(FlexHol hol) + { + return await FlexPostAsync>("hol/save", hol); + } + + public async Task DeleteHolAsync(int unid) + { + return await FlexPostAsync($"hol/delete/{unid}"); + } + + public async Task> GetHolCalListAsync(int offset, int max) + { + return await FlexGetAsync>($"holCal/list?offset={offset}&max={max}"); + } + + public async Task> SaveHolCalAsync(FlexHolCal holCal) + { + return await FlexPostAsync>("holCal/save", holCal); + } + public async Task GetSensorStateAsync(int id) { var json = await FlexGetAsync($"sensor/state/{id}"); diff --git a/src/Aporta.WebClient/Pages/configuration/Holidays.razor b/src/Aporta.WebClient/Pages/configuration/Holidays.razor new file mode 100644 index 0000000..d41f511 --- /dev/null +++ b/src/Aporta.WebClient/Pages/configuration/Holidays.razor @@ -0,0 +1,287 @@ +@page "/configuration/holidays" + +@using System.Globalization +@using System.Linq +@using Aporta.Shared.Calls +@using Aporta.Shared.Models.Flex + +@inject FlexApiService FlexApi + +Holidays + + +@if (_holidays == null) +{ + +} +else +{ + + + + + + + + + + + + + Name + Date + Duration + Repeat + + + + + @foreach (var hol in _holidays.InstanceList.OrderBy(h => h.Date ?? "")) + { + + + @hol.Name + + + @FormatDate(hol.Date) + + + @FormatDuration(hol.NumDays) + + + @(hol.Repeat == true ? "Annually" : "One-time") + + + + + + + } + +
+ + + + + + + + + + @(_isEditing ? "Edit Holiday" : "Add Holiday") + + + + + + + + Name + + + + + Please enter a name for the holiday + + + + + + + + + + Date + + + + + + + Duration (Days) + + + + + + + Repeats Annually + + + + Preserve Normal Schedule + + + + + + + + +} + + + + @_snackbarMessage + + + + + +@code { + [Inject] + IMessageService MessageService { get; set; } + + private FlexListResponse _holidays; + private int? _holCalUnid; + + private FlexHol _editHol = new(); + private DateTime? _editDate; + private int? _editNumDays = 1; + private bool _isEditing; + + private Modal _editModal; + private Validations _editValidations; + +#pragma warning disable 649 + private Snackbar _snackbar; +#pragma warning restore 649 + private SnackbarColor _snackbarColor; + private string _snackbarMessage = string.Empty; + + protected override async Task OnInitializedAsync() + { + await EnsureHolCal(); + await LoadHolidays(); + } + + private async Task EnsureHolCal() + { + var holCals = await FlexApi.GetHolCalListAsync(0, 1000); + if (holCals.InstanceList.Count > 0) + { + _holCalUnid = holCals.InstanceList[0].Unid; + } + else + { + var result = await FlexApi.SaveHolCalAsync(new FlexHolCal { Name = "Default" }); + _holCalUnid = result.Instance?.Unid; + } + } + + private async Task LoadHolidays() + { + _holidays = await FlexApi.GetHolListAsync(0, 1000); + } + + private async Task ShowAddModal() + { + _isEditing = false; + _editHol = new FlexHol(); + _editDate = null; + _editNumDays = 1; + await _editModal.Show(); + } + + private async Task ShowEditModal(FlexHol hol) + { + _isEditing = true; + _editHol = new FlexHol + { + Unid = hol.Unid, + Name = hol.Name, + Version = hol.Version, + Tag = hol.Tag, + Uuid = hol.Uuid, + Repeat = hol.Repeat, + PreserveSchedDay = hol.PreserveSchedDay, + AllHolTypes = hol.AllHolTypes, + HolCal = hol.HolCal + }; + _editDate = ParseDate(hol.Date); + _editNumDays = hol.NumDays ?? 1; + await _editModal.Show(); + } + + private async Task SaveHoliday() + { + if (!await _editValidations.ValidateAll()) + { + return; + } + await _editModal.Hide(); + + _editHol.AllHolTypes = true; + _editHol.HolCal = new FlexObjRef { Unid = _holCalUnid }; + _editHol.Date = _editDate?.ToString("yyyy-MM-dd"); + _editHol.NumDays = _editNumDays ?? 1; + + try + { + await FlexApi.SaveHolAsync(_editHol); + _snackbarMessage = _isEditing ? "Successfully updated holiday" : "Successfully added holiday"; + _snackbarColor = SnackbarColor.Success; + } + catch + { + _snackbarMessage = _isEditing ? "Unable to update holiday" : "Unable to add holiday"; + _snackbarColor = SnackbarColor.Danger; + } + + await LoadHolidays(); + await _snackbar.Show(); + } + + private async Task RemoveHoliday(FlexHol hol) + { + if (!await MessageService.Confirm($"Are you sure you want to delete holiday '{hol.Name}'?", "Delete Holiday", options => + { + options.ShowMessageIcon = false; + options.ConfirmButtonColor = Color.Danger; + })) + { + return; + } + + try + { + await FlexApi.DeleteHolAsync(hol.Unid.Value); + _snackbarMessage = "Successfully deleted holiday"; + _snackbarColor = SnackbarColor.Success; + } + catch + { + _snackbarMessage = "Unable to delete holiday"; + _snackbarColor = SnackbarColor.Danger; + } + + await LoadHolidays(); + await _snackbar.Show(); + } + + private static string FormatDate(string isoDate) + { + if (string.IsNullOrEmpty(isoDate)) return ""; + if (DateTime.TryParse(isoDate, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt)) + return dt.ToString("MMM d, yyyy"); + return isoDate; + } + + private static string FormatDuration(int? numDays) + { + var days = numDays ?? 1; + return days == 1 ? "1 day" : $"{days} days"; + } + + private static DateTime? ParseDate(string isoDate) + { + if (string.IsNullOrEmpty(isoDate)) return null; + if (DateTime.TryParse(isoDate, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt)) + return dt; + return null; + } +} diff --git a/src/Aporta.WebClient/Pages/configuration/Schedules.razor b/src/Aporta.WebClient/Pages/configuration/Schedules.razor index b69f605..1789240 100644 --- a/src/Aporta.WebClient/Pages/configuration/Schedules.razor +++ b/src/Aporta.WebClient/Pages/configuration/Schedules.razor @@ -131,6 +131,13 @@ else + + + + Holidays + + + } @@ -212,7 +219,8 @@ else Unid = e.Unid, Days = Enumerable.Range(0, 7).Select(d => e.SchedDays?.Contains(d) == true).ToArray(), Start = StripSeconds(e.Start), - Stop = StripSeconds(e.Stop) + Stop = StripSeconds(e.Stop), + Holidays = e.Holidays == true }).ToList(); await _editModal.Show(); } @@ -231,7 +239,7 @@ else SchedDays = Enumerable.Range(0, 7).Where(d => e.Days[d]).ToList(), Start = AppendSeconds(e.Start), Stop = AppendSeconds(e.Stop), - Holidays = false, + Holidays = e.Holidays, PlusDays = 0, HolTypes = new List() }).ToList(); @@ -358,5 +366,6 @@ else public bool[] Days { get; set; } = new bool[7]; public string Start { get; set; } = ""; public string Stop { get; set; } = ""; + public bool Holidays { get; set; } } } diff --git a/src/Aporta.WebClient/Shared/MainLayout.razor b/src/Aporta.WebClient/Shared/MainLayout.razor index e997d53..4545785 100644 --- a/src/Aporta.WebClient/Shared/MainLayout.razor +++ b/src/Aporta.WebClient/Shared/MainLayout.razor @@ -45,6 +45,7 @@ Credentials Schedules Card Formats + Holidays diff --git a/test/Aporta.Selenium.Tests/AccessGrantedTest.cs b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs index 86e5eb2..4cce819 100644 --- a/test/Aporta.Selenium.Tests/AccessGrantedTest.cs +++ b/test/Aporta.Selenium.Tests/AccessGrantedTest.cs @@ -523,7 +523,7 @@ public void AddSchedule() // Check Mon through Fri — Blazorise renders Check as hidden input + visible label, // so click the labels (custom-control-label) instead of the inputs var checkboxLabels = intervalCard.FindElements(By.CssSelector("label.custom-control-label")); - Assert.That(checkboxLabels.Count, Is.EqualTo(7), "Expected 7 day-of-week checkbox labels"); + Assert.That(checkboxLabels.Count, Is.GreaterThanOrEqualTo(7), "Expected at least 7 day-of-week checkbox labels"); for (var i = 0; i < 5; i++) { checkboxLabels[i].Click(); @@ -597,7 +597,7 @@ public void CreateNotTodaySchedule() var notTodayIndex = (todayIndex + 1) % 7; var checkboxLabels = intervalCard.FindElements(By.CssSelector("label.custom-control-label")); - Assert.That(checkboxLabels.Count, Is.EqualTo(7), "Expected 7 day-of-week checkbox labels"); + Assert.That(checkboxLabels.Count, Is.GreaterThanOrEqualTo(7), "Expected at least 7 day-of-week checkbox labels"); checkboxLabels[notTodayIndex].Click(); // Enter all-day time range @@ -842,6 +842,354 @@ public void AddCardFormat() TestContext.Progress.WriteLine("Card format 'Standard 26-Bit' added successfully"); } + [Test, Order(15)] + public void AddHoliday() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/holidays"); + + WaitForBodyText("Add Holiday"); + + TakeScreenshot("30_holidays_page_empty", "Holidays page before any holidays have been created"); + + ClickButtonContaining("Add Holiday"); + WaitForModal(); + + var modal = _driver.FindElement(By.CssSelector("div.modal.show")); + + // Enter holiday name + var nameInput = modal.FindElement(By.CssSelector("input[type='text']")); + nameInput.Clear(); + nameInput.SendKeys("Christmas"); + nameInput.SendKeys(Keys.Tab); + + // Enter date — DateEdit renders as input[type='date'] + // Use JavaScript to set the value directly; SendKeys on date inputs is unreliable across browsers + var dateInput = modal.FindElement(By.CssSelector("input[type='date']")); + var christmasDate = $"{DateTime.Now.Year}-12-25"; + ((IJavaScriptExecutor)_driver).ExecuteScript( + "var el = arguments[0]; var nativeSetter = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, 'value').set; nativeSetter.call(el, arguments[1]); el.dispatchEvent(new Event('input', { bubbles: true })); el.dispatchEvent(new Event('change', { bubbles: true }));", + dateInput, christmasDate); + dateInput.SendKeys(Keys.Tab); + + // Check "Repeats Annually" — first checkbox label in the modal + var checkboxLabels = modal.FindElements(By.CssSelector("label.custom-control-label")); + Assert.That(checkboxLabels.Count, Is.GreaterThanOrEqualTo(1), "Expected at least 1 checkbox label"); + checkboxLabels[0].Click(); + + TakeScreenshot("31_holiday_modal_filled", "Add Holiday modal with Christmas — Dec 25, Repeats Annually"); + + ClickModalButton("Save"); + WaitForModalClose(); + + // Wait for the holiday to appear in the table + WaitForBodyText("Christmas"); + + var holidayRow = FindTableRowContaining("Christmas"); + Assert.That(holidayRow.Text, Does.Contain("Dec 25"), + "Holiday row should show formatted date"); + Assert.That(holidayRow.Text, Does.Contain("Annually"), + "Holiday row should show 'Annually' for repeating holiday"); + + TakeScreenshot("32_holiday_created", "Christmas holiday created — Dec 25, Annually visible in the holidays table"); + TestContext.Progress.WriteLine("Holiday 'Christmas' added successfully"); + } + + [Test, Order(16)] + public void CreateTodayScheduleAndReassign() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + // --- Create "Today All Day" schedule --- + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/schedules"); + WaitForBodyText("Add Schedule"); + + ClickButtonContaining("Add Schedule"); + WaitForModal(); + + var modal = _driver.FindElement(By.CssSelector("div.modal.show")); + var nameInput = modal.FindElement(By.CssSelector("input")); + nameInput.Clear(); + nameInput.SendKeys("Today All Day"); + nameInput.SendKeys(Keys.Tab); + + // Add a time interval + var addIntervalButton = modal.FindElements(By.TagName("button")) + .First(b => b.Displayed && b.Text.Contains("Add Time Interval")); + addIntervalButton.Click(); + + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(10)); + wait.Until(d => + { + var m = d.FindElement(By.CssSelector("div.modal.show")); + return m.FindElements(By.CssSelector(".card .card-body")).Count > 0; + }); + + var intervalCard = modal.FindElement(By.CssSelector(".card .card-body")); + + // Check only today's day-of-week + var today = DateTime.Now.DayOfWeek; + var todayIndex = today == DayOfWeek.Sunday ? 6 : (int)today - 1; + + var checkboxLabels = intervalCard.FindElements(By.CssSelector("label.custom-control-label")); + Assert.That(checkboxLabels.Count, Is.GreaterThanOrEqualTo(7), "Expected at least 7 checkbox labels (days + holidays)"); + checkboxLabels[todayIndex].Click(); + + // Enter all-day time range + var timeInputs = intervalCard.FindElements(By.CssSelector("input[type='text']")); + Assert.That(timeInputs.Count, Is.GreaterThanOrEqualTo(2), "Expected at least 2 time inputs"); + timeInputs[0].Clear(); + timeInputs[0].SendKeys("00:00"); + timeInputs[1].Clear(); + timeInputs[1].SendKeys("23:59"); + + // Holidays checkbox is NOT checked (default) + + TakeScreenshot("40_today_schedule_modal", "Add 'Today All Day' schedule — active today, holidays unchecked"); + + ClickModalButton("Save"); + WaitForModalClose(); + + WaitForBodyText("Today All Day"); + + TakeScreenshot("41_today_schedule_created", "'Today All Day' schedule created"); + + // --- Reassign credential from "Not Today" to "Today All Day" --- + _driver.Navigate().GoToUrl($"{BaseUrl}/configuration/credentials"); + + wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(30)); + wait.Until(d => + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Test") && body.Text.Contains("Person"); + }); + + var personRow = FindTableRowContaining("Person"); + var actionToggle = personRow.FindElement(By.CssSelector("button.dropdown-toggle")); + actionToggle.Click(); + + WaitForVisibleDropdown(); + ClickDropdownItem("Edit Access"); + + WaitForModal(); + + modal = _driver.FindElement(By.CssSelector("div.modal.show")); + var selects = modal.FindElements(By.CssSelector("select")); + Assert.That(selects.Count, Is.GreaterThanOrEqualTo(2), + "Expected at least 2 selects (door + schedule) in Edit Access modal"); + + var schedSelect = new SelectElement(selects[1]); + SelectOptionContainingText(schedSelect, "Today All Day"); + + TakeScreenshot("42_edit_access_today", "Edit Access modal — changing schedule to 'Today All Day'"); + + ClickModalButton("Save"); + WaitForModalClose(); + + wait.Until(d => + { + var body = d.FindElement(By.TagName("body")); + return body.Text.Contains("Successfully updated door access"); + }); + + // --- Swipe badge and verify Access Granted --- + _driver.Navigate().GoToUrl($"{BaseUrl}/configuration/driver/{VirtualDriverGuid}"); + + WaitForBodyText("Test Reader"); + var readerRow = _driver.FindElement(By.Id("Reader:Test Reader")); + + actionToggle = readerRow.FindElement(By.CssSelector("button.dropdown-toggle")); + actionToggle.Click(); + + WaitForVisibleDropdown(); + ClickDropdownItem("Swipe Badge"); + + WaitForModal(); + + var badgeInput = _driver.FindElement(By.Id("SwipeBadgeTextEdit")); + badgeInput.Clear(); + badgeInput.SendKeys("12345"); + badgeInput.SendKeys(Keys.Tab); + + ClickModalButton("Swipe the badge"); + WaitForModalClose(); + + Thread.Sleep(2000); + + // Verify Access Granted on monitoring page + _driver.Navigate().GoToUrl($"{BaseUrl}/monitoring"); + WaitForBodyText("Access Granted"); + + // Check the first row is Access Granted + var firstRow = _driver.FindElement(By.CssSelector("tbody tr")); + Assert.That(firstRow.Text, Does.Contain("Access Granted"), + "First monitoring row should show 'Access Granted' after swipe with 'Today All Day' schedule"); + + TakeScreenshot("43_access_granted_today_schedule", "Monitoring shows Access Granted — 'Today All Day' schedule is active"); + TestContext.Progress.WriteLine("'Today All Day' schedule created, credential reassigned, Access Granted verified"); + } + + [Test, Order(17)] + public void CreateTodayHolidayAndVerifyDenied() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + // --- Add a holiday for today --- + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/holidays"); + + WaitForBodyText("Add Holiday"); + + ClickButtonContaining("Add Holiday"); + WaitForModal(); + + var modal = _driver.FindElement(By.CssSelector("div.modal.show")); + + var nameInput = modal.FindElement(By.CssSelector("input[type='text']")); + nameInput.Clear(); + nameInput.SendKeys("Today Holiday"); + nameInput.SendKeys(Keys.Tab); + + // Set date to today + var dateInput = modal.FindElement(By.CssSelector("input[type='date']")); + var todayDate = DateTime.Now.ToString("yyyy-MM-dd"); + ((IJavaScriptExecutor)_driver).ExecuteScript( + "var el = arguments[0]; var nativeSetter = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, 'value').set; nativeSetter.call(el, arguments[1]); el.dispatchEvent(new Event('input', { bubbles: true })); el.dispatchEvent(new Event('change', { bubbles: true }));", + dateInput, todayDate); + dateInput.SendKeys(Keys.Tab); + + // Do NOT check "Repeats Annually" — leave it as a one-time holiday + + TakeScreenshot("44_today_holiday_modal", "Add 'Today Holiday' — date is today, no repeat"); + + ClickModalButton("Save"); + WaitForModalClose(); + + WaitForBodyText("Today Holiday"); + + TakeScreenshot("45_today_holiday_created", "'Today Holiday' created — today is now a holiday"); + + // --- Swipe badge and verify Access Denied --- + _driver.Navigate().GoToUrl($"{BaseUrl}/configuration/driver/{VirtualDriverGuid}"); + + WaitForBodyText("Test Reader"); + var readerRow = _driver.FindElement(By.Id("Reader:Test Reader")); + + var actionToggle = readerRow.FindElement(By.CssSelector("button.dropdown-toggle")); + actionToggle.Click(); + + WaitForVisibleDropdown(); + ClickDropdownItem("Swipe Badge"); + + WaitForModal(); + + var badgeInput = _driver.FindElement(By.Id("SwipeBadgeTextEdit")); + badgeInput.Clear(); + badgeInput.SendKeys("12345"); + badgeInput.SendKeys(Keys.Tab); + + ClickModalButton("Swipe the badge"); + WaitForModalClose(); + + Thread.Sleep(2000); + + // Verify Access Denied on monitoring page + _driver.Navigate().GoToUrl($"{BaseUrl}/monitoring"); + WaitForBodyText("Access Denied"); + + // Check the first row is Access Denied + var firstRow = _driver.FindElement(By.CssSelector("tbody tr")); + Assert.That(firstRow.Text, Does.Contain("Access Denied"), + "First monitoring row should show 'Access Denied' — today is a holiday and schedule doesn't include holidays"); + + TakeScreenshot("46_access_denied_holiday", "Monitoring shows Access Denied — today is a holiday, schedule has holidays=false"); + TestContext.Progress.WriteLine("Today Holiday created, Access Denied verified (schedule doesn't include holidays)"); + } + + [Test, Order(18)] + public void EnableHolidaysOnScheduleAndVerifyGranted() + { + Assert.That(_driver, Is.Not.Null, "ChromeDriver was not initialized"); + + // --- Enable Holidays on "Today All Day" schedule --- + _driver!.Navigate().GoToUrl($"{BaseUrl}/configuration/schedules"); + + WaitForBodyText("Today All Day"); + + // Find the "Today All Day" row and click Edit + var scheduleRow = FindTableRowContaining("Today All Day"); + var editButton = scheduleRow.FindElement(By.CssSelector("button")); + editButton.Click(); + + WaitForModal(); + + var modal = _driver.FindElement(By.CssSelector("div.modal.show")); + + // Find the interval card and check the Holidays checkbox + var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(10)); + wait.Until(d => + { + var m = d.FindElement(By.CssSelector("div.modal.show")); + return m.FindElements(By.CssSelector(".card .card-body")).Count > 0; + }); + + var intervalCard = modal.FindElement(By.CssSelector(".card .card-body")); + + // The Holidays checkbox is the last label.custom-control-label in the card (after the 7 day checkboxes) + var checkboxLabels = intervalCard.FindElements(By.CssSelector("label.custom-control-label")); + Assert.That(checkboxLabels.Count, Is.GreaterThanOrEqualTo(8), + "Expected at least 8 checkbox labels (7 days + Holidays)"); + var holidaysLabel = checkboxLabels.First(l => l.Text.Contains("Holiday")); + ((IJavaScriptExecutor)_driver).ExecuteScript("arguments[0].click();", holidaysLabel); + Thread.Sleep(500); // Let Blazor re-render + + TakeScreenshot("47_enable_holidays_on_schedule", "Edit 'Today All Day' schedule — checking Holidays checkbox"); + + ClickModalButton("Save"); + WaitForModalClose(); + + // Wait for the save API call to complete (snackbar confirms it) + WaitForBodyText("Successfully updated schedule"); + + TakeScreenshot("48_holidays_enabled_saved", "'Today All Day' schedule saved with Holidays enabled"); + + // --- Swipe badge and verify Access Granted --- + _driver.Navigate().GoToUrl($"{BaseUrl}/configuration/driver/{VirtualDriverGuid}"); + + WaitForBodyText("Test Reader"); + var readerRow = _driver.FindElement(By.Id("Reader:Test Reader")); + + var actionToggle = readerRow.FindElement(By.CssSelector("button.dropdown-toggle")); + actionToggle.Click(); + + WaitForVisibleDropdown(); + ClickDropdownItem("Swipe Badge"); + + WaitForModal(); + + var badgeInput = _driver.FindElement(By.Id("SwipeBadgeTextEdit")); + badgeInput.Clear(); + badgeInput.SendKeys("12345"); + badgeInput.SendKeys(Keys.Tab); + + ClickModalButton("Swipe the badge"); + WaitForModalClose(); + + Thread.Sleep(2000); + + // Verify Access Granted on monitoring page + _driver.Navigate().GoToUrl($"{BaseUrl}/monitoring"); + WaitForBodyText("Access Granted"); + + // Check the first row is Access Granted + var firstRow = _driver.FindElement(By.CssSelector("tbody tr")); + Assert.That(firstRow.Text, Does.Contain("Access Granted"), + "First monitoring row should show 'Access Granted' — schedule now includes holidays"); + + TakeScreenshot("49_access_granted_holidays_enabled", "Monitoring shows Access Granted — schedule includes holidays, access is restored"); + TestContext.Progress.WriteLine("Holidays enabled on schedule, Access Granted verified"); + } + // --- Card Format Test Helpers --- private void ClickModalBodyButton(string text) From 0359564b4ac26fc6221ccbb54dfa83fb9e4d5c67 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 21 Feb 2026 22:07:55 -0500 Subject: [PATCH 80/86] Add nuget.config to enforce nuget.org as sole package source Uses to override any developer-local NuGet sources, ensuring all packages resolve from nuget.org only. Co-Authored-By: Claude Opus 4.6 --- nuget.config | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 nuget.config diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..e219de2 --- /dev/null +++ b/nuget.config @@ -0,0 +1,7 @@ + + + + + + + From 8a6cd1698305ef0a2a7a9f60e201cd06de88d7a8 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 21 Feb 2026 23:03:44 -0500 Subject: [PATCH 81/86] Revert "Add nuget.config to enforce nuget.org as sole package source" This reverts commit 0359564b4ac26fc6221ccbb54dfa83fb9e4d5c67. --- nuget.config | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 nuget.config diff --git a/nuget.config b/nuget.config deleted file mode 100644 index e219de2..0000000 --- a/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - From ff61a20d11a23b2f896c5722489e06af4d442523 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Sat, 21 Feb 2026 23:44:29 -0500 Subject: [PATCH 82/86] Switch Z9.Flex.Community from local ProjectReference to NuGet package Replace the local project reference to z9flex-community with a NuGet PackageReference (v1.0.1). Also remove NuGet.Config which contained a local package source that is no longer needed. Co-Authored-By: Claude Opus 4.6 --- NuGet.Config | 7 ------- .../Aporta.FlexClient.Integration.Tests.csproj | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 NuGet.Config diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100644 index 07c55b8..0000000 --- a/NuGet.Config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/test/Aporta.FlexClient.Integration.Tests/Aporta.FlexClient.Integration.Tests.csproj b/test/Aporta.FlexClient.Integration.Tests/Aporta.FlexClient.Integration.Tests.csproj index c21c45a..0d701da 100644 --- a/test/Aporta.FlexClient.Integration.Tests/Aporta.FlexClient.Integration.Tests.csproj +++ b/test/Aporta.FlexClient.Integration.Tests/Aporta.FlexClient.Integration.Tests.csproj @@ -10,6 +10,6 @@ - + From 45c81b1e80e328397c690e04c6d04e7b6c755bce Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Fri, 20 Mar 2026 12:34:18 +0000 Subject: [PATCH 83/86] Update Z9.Protobuf.Community to 1.0.15 Picks up SpCoreHostConnection with optional password support. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- src/Aporta.Migration/Aporta.Migration.csproj | 2 +- src/Aporta/Aporta.csproj | 2 +- test/Aporta.Core.Tests/Aporta.Core.Tests.csproj | 2 +- test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index dcf633e..b4c40eb 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index 1d3df29..d6113d1 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index c950d47..14c2b16 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index dd38e21..73126fc 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index f94ba06..aaefb05 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,7 +10,7 @@ - + From 78945261e24b84497cf577c93001d6135014da08 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Fri, 20 Mar 2026 13:44:58 +0000 Subject: [PATCH 84/86] Update Z9.Protobuf.Community to 1.0.16 Sets SpCoreDevUse to IoControllerSecondary in identification. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- src/Aporta.Migration/Aporta.Migration.csproj | 2 +- src/Aporta/Aporta.csproj | 2 +- test/Aporta.Core.Tests/Aporta.Core.Tests.csproj | 2 +- test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index b4c40eb..700a4de 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index d6113d1..4162903 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 14c2b16..f4383b0 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 73126fc..6289db4 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index aaefb05..bdc2c84 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,7 +10,7 @@ - + From f6bf1f9e9bdc50dcee0ae6b7097c8b44bc60f9e9 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Fri, 20 Mar 2026 13:50:13 +0000 Subject: [PATCH 85/86] Update Z9.Protobuf.Community to 1.0.17 Adds exponential backoff for SpCoreHostConnection reconnects. Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- src/Aporta.Migration/Aporta.Migration.csproj | 2 +- src/Aporta/Aporta.csproj | 2 +- test/Aporta.Core.Tests/Aporta.Core.Tests.csproj | 2 +- test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 700a4de..36732b5 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index 4162903..2e400cb 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index f4383b0..86ed991 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 6289db4..85f7727 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index bdc2c84..aa9773f 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,7 +10,7 @@ - + From 29760434b0a7b968d9b45292907ed4cff11809db Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Fri, 20 Mar 2026 17:19:37 +0000 Subject: [PATCH 86/86] Update Z9.Protobuf.Community to 1.0.18 Co-Authored-By: Claude Opus 4.6 --- src/Aporta.Core/Aporta.Core.csproj | 2 +- src/Aporta.Migration/Aporta.Migration.csproj | 2 +- src/Aporta/Aporta.csproj | 2 +- test/Aporta.Core.Tests/Aporta.Core.Tests.csproj | 2 +- test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Aporta.Core/Aporta.Core.csproj b/src/Aporta.Core/Aporta.Core.csproj index 36732b5..af986d0 100644 --- a/src/Aporta.Core/Aporta.Core.csproj +++ b/src/Aporta.Core/Aporta.Core.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Aporta.Migration/Aporta.Migration.csproj b/src/Aporta.Migration/Aporta.Migration.csproj index 2e400cb..1e69ed3 100644 --- a/src/Aporta.Migration/Aporta.Migration.csproj +++ b/src/Aporta.Migration/Aporta.Migration.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Aporta/Aporta.csproj b/src/Aporta/Aporta.csproj index 86ed991..91bc5a5 100644 --- a/src/Aporta/Aporta.csproj +++ b/src/Aporta/Aporta.csproj @@ -24,7 +24,7 @@ - + diff --git a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj index 85f7727..ec899fc 100644 --- a/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj +++ b/test/Aporta.Core.Tests/Aporta.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj index aa9773f..68edcd5 100644 --- a/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj +++ b/test/Aporta.Migration.Tests/Aporta.Migration.Tests.csproj @@ -10,7 +10,7 @@ - +