From 452e6189e416f451a06aa0081eeff42a16e027c3 Mon Sep 17 00:00:00 2001
From: Narayanan Madaswamy <maddy23285@gmail.com>
Date: Sat, 1 Aug 2026 23:10:28 +0530
Subject: [PATCH] Migrated Queries - 4,5 and 70

---
 .../main/java/lib/models/CasePunching.java    |   2 +-
 .../src/main/java/lib/models/UserSession.java |  29 ++++
 .../lib/constants/ApplicationError.class      | Bin 5764 -> 5764 bytes
 .../classes/lib/models/CasePunching.class     | Bin 3970 -> 4035 bytes
 .../target/classes/lib/models/Option.class    | Bin 1353 -> 1353 bytes
 .../UserSession$UserSessionBuilder.class      | Bin 0 -> 4111 bytes
 .../classes/lib/models/UserSession.class      | Bin 0 -> 7725 bytes
 .../compile/default-compile/inputFiles.lst    |   1 +
 .../TEST-lib.models.ErrorDetailsTest.xml      |  37 +++--
 .../lib.models.ErrorDetailsTest.txt           |   2 +-
 .../WEB-INF/app/edp/punching/initcase.jsp     |  24 +--
 .../WEB-INF/app/fragments/app-title.jspf      |   4 +-
 .../identity/CloudAuthenticationGateway.java  |   4 +-
 .../cloud/identity/CloudSessionMapper.java    |  51 +++++--
 .../AbstractAuthenticatedController.java      |  10 +-
 .../nimble/controller/SessionController.java  |  11 +-
 .../controllers/PunchingController.java       |  20 ++-
 .../services/commons/CommonService.java       |  39 +++++
 .../matrix/services/edp/PunchingService.java  | 142 ++++++++++--------
 .../nimble/RoleVisibleBatchMigrationTest.java |   6 +-
 .../identity/CloudSessionMapperTest.java      |  23 ++-
 .../AbstractAuthenticatedControllerTest.java  |  18 +--
 .../services/commons/CommonServiceTest.java   |  19 +++
 .../services/edp/PunchingServiceTest.java     |  76 ++++++++++
 24 files changed, 372 insertions(+), 146 deletions(-)
 create mode 100644 cygnus-lib/src/main/java/lib/models/UserSession.java
 create mode 100644 cygnus-lib/target/classes/lib/models/UserSession$UserSessionBuilder.class
 create mode 100644 cygnus-lib/target/classes/lib/models/UserSession.class
 create mode 100644 cygnus-onprem-app/src/test/java/matrix/services/edp/PunchingServiceTest.java

diff --git a/cygnus-lib/src/main/java/lib/models/CasePunching.java b/cygnus-lib/src/main/java/lib/models/CasePunching.java
index c0a40bc..d561e2b 100644
--- a/cygnus-lib/src/main/java/lib/models/CasePunching.java
+++ b/cygnus-lib/src/main/java/lib/models/CasePunching.java
@@ -13,7 +13,7 @@ public class CasePunching {
     private Map<String, String> optionsl;
     private Map<String, List<Option>> options;
     private List<String> visibleSections;
-    private Integer portfolioId;
+    private Short portfolioId;
     private Integer formMode;
     private String userId;
     private String dynamicFields;
diff --git a/cygnus-lib/src/main/java/lib/models/UserSession.java b/cygnus-lib/src/main/java/lib/models/UserSession.java
new file mode 100644
index 0000000..d9268df
--- /dev/null
+++ b/cygnus-lib/src/main/java/lib/models/UserSession.java
@@ -0,0 +1,29 @@
+package lib.models;
+
+import java.io.Serial;
+import java.io.Serializable;
+import lombok.Builder;
+import lombok.Value;
+
+/** Immutable, type-safe representation of an authenticated Cygnus user. */
+@Value
+@Builder
+public class UserSession implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    Short companyId;
+    String companyName;
+    String companyCode;
+    Short branchId;
+    String branchName;
+    String branchCode;
+    String branchLocation;
+    Short userId;
+    String username;
+    String userDisplayName;
+    Short userGroupId;
+    String userGroupName;
+    String loginTime;
+    String menuHtml;
+}
diff --git a/cygnus-lib/target/classes/lib/constants/ApplicationError.class b/cygnus-lib/target/classes/lib/constants/ApplicationError.class
index 859f4fabf6ba47cb28ff9ac39a86f65bd86696ac..71c961f21da5bf430160731e2d8050089e8e4c3a 100644
GIT binary patch
delta 20
ccmZqCZPDHETX=G*NW|nH!d08kifm^D0A8pF`2YX_

delta 20
ccmZqCZPDHETX=GqNcrR+!qJ=0ifm^D09~*M+5i9m

diff --git a/cygnus-lib/target/classes/lib/models/CasePunching.class b/cygnus-lib/target/classes/lib/models/CasePunching.class
index 079128bf92e131ee285c5688ebe8c66d12f68df1..4a094cff90aca57fec2af80e689fc06204d7f393 100644
GIT binary patch
literal 4035
zcma)-`%@b?5XV=%9P9&Q8=MC;O;XA$59iS|X`!?fLLf1L#0lxUJ=?-4J>N0sGc)<G
z+L?Ab(;xZ=^pEOvS9hFcofzME=444<eO6lSYXAN3?|%Sb16o-ag5eB|STG7>45r@M
zr*_4$-BxA4{*E^S24ic&6~Q`#;icunakv2E8OU0Y1B<~$N7O5AugRTGWz+8PgRa{+
z7H*4y#eLuNw|HO+r^DcKRZ%`srdEkKX+a*Q7+mm90^zwGhe5t7chU`nQ`xgmq^xK`
ziDa2bMoVWbD8oh6pNfvCJG_Q_CIlWuAyh>tkci6`T!C2zxf9P1jyy+ryG;g#P%4jI
zJH{EQ{lJ2&@FDK%$n)EKct{2%MY!t*yv2Pfy>7t`_y~Q~?QoxnMMYQ(d~}J_eQd!3
z=_Z=*UArwB+k!jI4xMAkf@PY?MKe1=+oAEB7Tluo;wksVk!aX-I&$@Hlcw)jP@(C`
zrq}4Uxf_I24907s<=R2l$6Y^EJb}JkOYSW>vcAe-C*?YMN#x=+^_KVLU9PU<kHNfx
z3YEP;i~K{fkxl95d{wyoMYmn&{%adAmHg>7Z0FGS1@)uBk>FV9v86^K0`n~%sNu$7
zc4=ANr8<fF*;idR5N*EeM)9=ax?Uiij+Tm5$7|QUUn@_!%Y8fGO<a;g6X97YZVQO-
zk6Z?i^s&@8knOP<JWGv9aUn${AL=Pn?6V+~hQUH&(6D{Fyh%hJsA*L?Td5>g=&$WK
zqh|UvXE}xOi?BCQGEMhsqHw_kN6D6&N8uKtAxa<yGjz;E=HNBaS}kSr9X(d&md*{8
z<wM-S9uJPa=7H_oZ60tRBP556UN97wv{;~3<^E89e{vSik2STy%^@yyXZWhDuM#uc
zGt1z4TF$^QA#@SZi9ji-CS;tDbWtBQoFLrqBtrW_Wjb1_L<$kfoxNBotD>_|A=x;}
z&Vpq|6-BW^nkm%i(b5}=q6G(x(LzEkTCz2->o@qepy#QeK09|P|KU2m&O=yZbNIzt
ziT{SE$N_`9^8Y>TV>OHW_py(aEbc$RK9(w}#WEyYtTD318X{Y)7_!9*AzLg3*b)Pa
zIetIEUIkl*?dZy1z<!sqhxnyw+T5r3wL$?rg2&in@ELrL#`_ol0h!-$atL~hEyLnf
z)DU`2g1&%t7*2pDbkKwW6gufk=m&mf1QvAQ<hj5N4fr)|8g@9X1M}wsw>01r*f#j?
zk`A0Q0Q-;n6m|@tIUQ6O2-<~b2GBJfR2&F;ZUoKipwd84)d*VDLDK_4dq&WT4w@MV
zdSL|J)<NZgpnW)q;)zm-@_%gQ=AV$!6E7=C<xmkN9%T-_6bxSCx>0=n@OkJDidRsB
z5t&d`6+c1vVI?)s!-o&hYgC6hKZZ}zy`DjuzKfGX@J2IyXf|9(YdC!ARKq2>-!n|p
zq2afh;cwtu(}}0k8V;XS)o>Xe^bD6{!{2F!zlR@8H+hK+tFPdBuBNv;zR4?zoBR=e
zGU4aa;;AIW_^S#0&+v;0e=RMZDou>Pk-*z#{CrwG6|fk;kigf?_{Fq%s*5pxIe~AO
f@hfTZRBmJZtpvVl#@|khrz#%fD+xT80eJL3TF<|3

literal 3970
zcma)-`%)V>6vmGX*kCVUOfX4FFG*8kppAP;8X8llgi9cpKtn?Bm$fa7()BL0UNe)o
zYG>N%O#kQu^r136N4s8Y*N#`i46>x7-*+T^NBiIFfBpr4O=xBy#bD7A^>W*3a;sC`
zGCTaZYd6k?-O9i?gZxYL(kxr1-6|i|U-E{>z~HXyxZB(_h1Fqjt){HsQKl*kCY=jU
zICjTkFk6$Pt|zSWp?QImQzxQjn_k!D4DLl|H~g-YJ@H&jrZPBEMMfqNV6dl2kO|a8
z$J<czK9YG>s`!VgUW$&WTl@sKOWEToC~#VfLAPQ<LsBMI?!s}sGshCnev`qxvWtD&
z<1OxD%;cHlwh!?F7^J%$?ownyi40DF!F2PLZMH>YS8%I|Y2||cp4Y|`E?ja~oQZ}>
zNz+9VXQt^ix@~TIy@B+Gu!UD;FjiVQWiY;lx>*>5w+*-kZ_zyon?LQg>)d^A;vrBf
zPQ$cLO;=Dq7##P`Mf~zr^UyK2xTpGo!BS~OJ#=*v<CmUwZBMlMz8#$ZrfoZ(+zl!f
zYL?TkJHM45bDO)S$D5TYU~t=j2}t8npqPJ&WVSgJirejed~C>#4IX+`s(ffb1|}I~
z`zj2cXaf^HM?3l0fE;NQP~$Xiz(PbTu;B8*;E*l(8@Ok{G|ZqK5PqyWa-qkNwbt__
z<@1FBd6@H0b~i96jc*uGpz$e0y$IZTB|-`OO2J<lFb`L-fG~JlH7`wW8L&W;lvFTD
zPNu0{1Bx`YfK#Ufwx)=E0~RS_juuBePO~)wuF~vmC+@-Pr8ioT>LGu~y>q8|Y`SKf
zd)%ceLq^|Pg;LB}v}!#zIOHCNS&Nnyqt*55qE}(rzAS?SU4cZak!AtW0~VWCC8WbB
z^mcr7$kwVAikv}c#9GB*X~bC+Ne9|<6#58zJs&NoO9C6wiaf?d?BmNRra`M<%%D}!
zAhb4O5Uk@9r|UNOuAujAPJOrT(6a$I&_ZMQiOfNYo)`R;q6Yv+r{wP}_OV#QzJYzL
zudqLheJmasi^U>atOMDi<z<WhmMywiw&+)E7m<PQF#cb{UKv}4?ZoQeaQzP%_746}
z%fTGHi@yy&0N%r-0e|0w_fh;-5cL7JQP7{T{5uY&pbwfF3M#=0o`JvL)set8J>W+Q
z@XknJSr7OLd>Ur>*+}4BJ>chXKjG}w^*|32K@~mFmrzZ}=%F5HGZFMi544>K+R+0&
zP6X}gfu1CS4)j2W@D%+NFP#T?0Vyh{)wRE1IbMWWSvy5PA}B&CP<k~O9O1eNhMhci
zj^S$<4+`qpfJ{x5StFS-r9|H(<3CC#8126UX?&)#ec_B0ey#|=7%g1Z74~00RX8V8
z2zH#4!l&>}xZ`g}3*Xfh_Mcf*cp7H=JD!%p-@*4uH@U8Rlk|><H<_3CACmDET|9jr
zLVQ8ue}tcsvVW+Hr>{<kpO^Tblktyq@$@kZ@e30FOEP{(7f;{F5MPw|Uz72Bx_J8Z
ahWJH^H<R%Px_J7chxn@!U&l&KLF0d$$e7Xq

diff --git a/cygnus-lib/target/classes/lib/models/Option.class b/cygnus-lib/target/classes/lib/models/Option.class
index 0b261289aa4042ed26c0eb4a5d1efbccfaccd06e..2df6df018b4ebca454650d840a88c5a66cd92cb9 100644
GIT binary patch
literal 1353
zcma))+iuf95QhKF$vL=blcwcR&c`GLd`}Tl1)@R<6j7A>b+SsgICf=k@?0Q+khtIh
zcqqh-ZKZNzDY@D4tY^MC{QLLc?>_*J@w|=#iWW*X%BTqJT*$d}Jn2uIQ};rRj6mg;
z_O*E}Q0(@GHB?cvP`A;5Ezt6`>r8{O@*?N-(&)e!D9@!gQv&V5GV6%5n>MzwLt&nD
zm6r`WGokh;aah~NE{8S7DjJ14W^?+Ujr}-%5(cwNfzlhQF0eh&zWO+ux+?r4T`w*l
zjHEY|p=Lk5ESYm13G5D5`aTk<PLvrYy?463)$RojKF@rkr|P{w*O4advF`^)^4vsi
z54>RN249^M<*QH{HBO;}WYR1&omHSoW#3*6ne=gzOjnH-E$wwzJL(Ndu@B0e2jfpN
zlv8C?NR4n-S~HWCmgKA^g=CA;MOw6e7R<ttdZ&4fjYQTLtR?P~00nwCB|1re`YN!P
zu_d))OX`rVffPoC&THg3WChuB{};sfIP5x|{2PS4L8qMr;3f{p6S#%j1kWb_fc1@j
z7I2kZ%SpaNF^s+&gYHq+tDvoAP<<`vK`yAZ3~H<eJ<J7lmO=Jf&?7uXG2YQj8j*#m
z^bdc+THde~llGH{bi=$NmQdgc<&{Zj(k;8Wr|9P4w>HJ|%UIyq$>MwY_|~R)esBvs
ZJ6U``AK%#&&+mAFXD5q4q^%Y3>_6B4zqSAX

literal 1353
zcma)*+iuf95QhKF`C!sCJy2+&w49O@@I6IH6^IHcP}HK_uai}}#jz`Alji~ngv138
zz(XNs)>cZ=O7@M%-kJUOpMS@H{{H$6;0Vvl$O)|a+H=R@Q27)0<kILcD5D_IypS{L
z`Z5@~C*Fk`7=hwU`coy)>MiFEDd|g3`HRUj6X{??$@)-D29dUODjh}P^irVoN(b7!
z7Ra|deSyLo5>Z1QD-P;#1Xg-FP#>pbPeq@l=i8IRf%N+_()^t)7R<Sx2(0z4H9{v>
zM#}VK+3W4jO~SWNr-9L9^*)&Ci6-n(5QIju5kzhE{BZ1rU)*CAs7M+$Jgh?Cj)Njf
zF}@c!zKBm+=h}M?%BTo5NXpwQA2{{EL6uXi@|aEG#fJ`Rc5yP7zR|v}oGoj9Q06=w
zev*+KE2AP3T%lcwqJ>?FAl}uWlK+Ind+hN7wX<*<4b(f$cGu&1c){0=J(8BExhWvW
zz0+Hc`?8Umu#t3A<R<6>>3NI3T#ABXvHKH^Z?>#S&yroNV3ppvlnT(o8byJ1Y!G}i
zsk%*Z5%e8fUuiLiD^Tf1&|Pe&fOfKh?x%uwvw`+fLHpT2kMNkTW7(sZ)NYP_>mK~T
z*0S4WYtm+1k+{t_!PhD9g!UEb?<7|Ro}!(G-^q&SDVgKT7T-z7?`FmG@Xhg6i|?l6
S_p{=8rsw#Y#UI$=d-e~7J-tl;

diff --git a/cygnus-lib/target/classes/lib/models/UserSession$UserSessionBuilder.class b/cygnus-lib/target/classes/lib/models/UserSession$UserSessionBuilder.class
new file mode 100644
index 0000000000000000000000000000000000000000..af44226eddbe7c8a3dd2865cc961c97ca92a1479
GIT binary patch
literal 4111
zcmd^?>rNX-6vxk)i!Ur-2!%p!gg|No#Z4M|b07o~z^y~l7)aCfqP0E33+r8LcZ|fF
z^f6i~Risqv1N1%m6qTx;;~B$lW`j0-?T2CKoIUfKvvc_$^Vh#`{se#r@N)(d(36B-
z1Nxw!LH5u*HVd}t92A~Z4|z>6=)Y$<mRM!blgsa?AqD9qWDFPpgF)W5s)eRo=eA$i
z^SM{yzHhnCY@om1w(L6h7^G`%vt>Fbr8<L=^4UC<hU<wUfrktjhAe{t6}e+JIfKz)
ztne)7pc6c5z@=dD24+E!4-6Qm)KXQ?bZU)Kotz&UFiF7~=_D|@FB@<r;O-)>8E~E4
zLo&MT)=Yt4MI&w)FhlhIHh!&S&l)gC(J68{iu{oQIdTq@^P%OpZ1bc$>%0LA#2BD=
zTb|o)NzlgzEYX<3Q-62FCkEW6H)-2Fu$)~>X8)-HcRLd|xzpYjO*;vnF&K~Dk_;@v
z7qrP=GWaJKT++_+2OV;a&-YwtkPf~O=0bzy-1+@cJoZHc?!gL!iKcnPH(Up|_qin+
z*z<+y2%j<I|GPr^zB9P|tnCOqbtUK6@~x`PA2^OHI+wzy3u?Q~s(Vz};tuyr!Rti^
zy>yxI{Fg0<@3fm$?(Ld5kfQNA+54tvk*%D)qG2Ivp&Wg9BlHBPSk*Tv|6YLXV=fwQ
z{i*5UtrgtE4DN@R>d?Fww698n$6zY=u4FLvlyEB@ID;{a3y7hd5|ygrw!IqPv}nz;
zd#DsjTbC#p2|L^u+pdoSon3cb;S0}f$?x$~@GXPCgJS}HrN_BbHC|zh(*eN^n6!mt
zc9rz3Pr`I&h2y$%N$*L?O7(7!#If5CXkyo;q%dT5Cpr~AdfU~z6_y|Fhe`%^VJ`{$
zbgQ2;m_1uf%Q<$BctI|;yy%-|O}O3(gI|I>tperxZJSQr=KgHib&uMuqP{x;PiWxo
zNsC8>zYN67qFM}Yxk7B1wq3CV$J1ey9K1*yw(0wv?w7uMNqEU%PW#ZP{FCq_gKOu9
zVm*@|3pcRFB~T)V@Gn+)z*~k^KR)l{GePxP^I;j*d{}}tA68(^hvirEVeQp?SadZX
zR$a}9MOX7-vDJK7Xf+>}Sj~q8_ATECt^@v5!nIh#UIE`S^31;m_8WE*_@hcL7(fQr
zu}_oJkPUc<&){<6PXKrXJsnUHN7BM4=NEp*KfhvEM~%x6g~DL9N1HSO(XwyxhhZy<
zKNy=Y_gnGF2<Lw(nm-boFVBwRlM&{RN3YLVY`#2)ia)OLC!_P9h|QO0TJgyU=YJ)d
zKNXuV?}y@(5$0cy=3kA?mv>F^$q4gjqSt>qHecRb#h=mmbJ6+VjLnxCp!j5j^Up=|
zZ^h<IJyCoz!u*Bk^~uNPOKnp81&zNHo&RENzSKFzCnKEy?Pz`>HeYI{;*$~P-;L(q
ziOrY#tN3Ju`P)!JNnAtuJH&USvul6A@{9RbD50-l5Zeg0F>Djqrm$VbHjV8jwp-Zp
z*cP!Bu-$nLpGOO?)bO=P4gVUxQ8_fQY*G%Z$hy${Z{RC{^D<bC$e<6(IA;PLht_7N
i<6DL&_)K9|&#*m(@6Z~>*cARZ_yW@KJ^TPa!Q_8X?iQ*5

literal 0
HcmV?d00001

diff --git a/cygnus-lib/target/classes/lib/models/UserSession.class b/cygnus-lib/target/classes/lib/models/UserSession.class
new file mode 100644
index 0000000000000000000000000000000000000000..5fb4f06a412aac0f8754f5ab1d5627949de28399
GIT binary patch
literal 7725
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

literal 0
HcmV?d00001

diff --git a/cygnus-lib/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/cygnus-lib/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 588215f..7251d26 100644
--- a/cygnus-lib/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/cygnus-lib/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -2,3 +2,4 @@
 /Users/maddy/Projects/cygnus/matrix/cygnus-lib/src/main/java/lib/models/CasePunching.java
 /Users/maddy/Projects/cygnus/matrix/cygnus-lib/src/main/java/lib/models/ErrorDetails.java
 /Users/maddy/Projects/cygnus/matrix/cygnus-lib/src/main/java/lib/models/Option.java
+/Users/maddy/Projects/cygnus/matrix/cygnus-lib/src/main/java/lib/models/UserSession.java
diff --git a/cygnus-lib/target/surefire-reports/TEST-lib.models.ErrorDetailsTest.xml b/cygnus-lib/target/surefire-reports/TEST-lib.models.ErrorDetailsTest.xml
index 07aa669..0ea63ab 100644
--- a/cygnus-lib/target/surefire-reports/TEST-lib.models.ErrorDetailsTest.xml
+++ b/cygnus-lib/target/surefire-reports/TEST-lib.models.ErrorDetailsTest.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" version="3.0.2" name="lib.models.ErrorDetailsTest" time="0.024" tests="2" errors="0" skipped="0" failures="0">
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" version="3.0.2" name="lib.models.ErrorDetailsTest" time="0.028" tests="2" errors="0" skipped="0" failures="0">
   <properties>
-    <property name="java.specification.version" value="25"/>
+    <property name="java.specification.version" value="21"/>
     <property name="sun.jnu.encoding" value="UTF-8"/>
     <property name="java.class.path" value="/Users/maddy/Projects/cygnus/matrix/cygnus-lib/target/test-classes:/Users/maddy/Projects/cygnus/matrix/cygnus-lib/target/classes:/Users/maddy/.m2/repository/org/projectlombok/lombok/1.18.46/lombok-1.18.46.jar:/Users/maddy/.m2/repository/org/junit/jupiter/junit-jupiter/5.12.2/junit-jupiter-5.12.2.jar:/Users/maddy/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.12.2/junit-jupiter-api-5.12.2.jar:/Users/maddy/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/Users/maddy/.m2/repository/org/junit/platform/junit-platform-commons/1.12.2/junit-platform-commons-1.12.2.jar:/Users/maddy/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:/Users/maddy/.m2/repository/org/junit/jupiter/junit-jupiter-params/5.12.2/junit-jupiter-params-5.12.2.jar:/Users/maddy/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.12.2/junit-jupiter-engine-5.12.2.jar:/Users/maddy/.m2/repository/org/junit/platform/junit-platform-engine/1.12.2/junit-platform-engine-1.12.2.jar:"/>
-    <property name="java.vm.vendor" value="Homebrew"/>
+    <property name="java.vm.vendor" value="Microsoft"/>
     <property name="sun.arch.data.model" value="64"/>
-    <property name="java.vendor.url" value="https://github.com/Homebrew/homebrew-core/issues"/>
+    <property name="java.vendor.url" value="https://www.microsoft.com"/>
     <property name="os.name" value="Mac OS X"/>
-    <property name="java.vm.specification.version" value="25"/>
+    <property name="java.vm.specification.version" value="21"/>
     <property name="sun.java.launcher" value="SUN_STANDARD"/>
     <property name="user.country" value="US"/>
-    <property name="sun.boot.library.path" value="/opt/homebrew/Cellar/openjdk/25.0.2/libexec/openjdk.jdk/Contents/Home/lib"/>
-    <property name="sun.java.command" value="/Users/maddy/Projects/cygnus/matrix/cygnus-lib/target/surefire/surefirebooter-20260801204253825_3.jar /Users/maddy/Projects/cygnus/matrix/cygnus-lib/target/surefire 2026-08-01T20-42-53_787-jvmRun1 surefire-20260801204253825_1tmp surefire_0-20260801204253825_2tmp"/>
+    <property name="sun.boot.library.path" value="/Users/maddy/Library/Java/JavaVirtualMachines/ms-21.0.8/Contents/Home/lib"/>
+    <property name="sun.java.command" value="/Users/maddy/Projects/cygnus/matrix/cygnus-lib/target/surefire/surefirebooter-20260801225315947_3.jar /Users/maddy/Projects/cygnus/matrix/cygnus-lib/target/surefire 2026-08-01T22-53-15_920-jvmRun1 surefire-20260801225315947_1tmp surefire_0-20260801225315947_2tmp"/>
     <property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
     <property name="jdk.debug" value="release"/>
     <property name="surefire.test.class.path" value="/Users/maddy/Projects/cygnus/matrix/cygnus-lib/target/test-classes:/Users/maddy/Projects/cygnus/matrix/cygnus-lib/target/classes:/Users/maddy/.m2/repository/org/projectlombok/lombok/1.18.46/lombok-1.18.46.jar:/Users/maddy/.m2/repository/org/junit/jupiter/junit-jupiter/5.12.2/junit-jupiter-5.12.2.jar:/Users/maddy/.m2/repository/org/junit/jupiter/junit-jupiter-api/5.12.2/junit-jupiter-api-5.12.2.jar:/Users/maddy/.m2/repository/org/opentest4j/opentest4j/1.3.0/opentest4j-1.3.0.jar:/Users/maddy/.m2/repository/org/junit/platform/junit-platform-commons/1.12.2/junit-platform-commons-1.12.2.jar:/Users/maddy/.m2/repository/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar:/Users/maddy/.m2/repository/org/junit/jupiter/junit-jupiter-params/5.12.2/junit-jupiter-params-5.12.2.jar:/Users/maddy/.m2/repository/org/junit/jupiter/junit-jupiter-engine/5.12.2/junit-jupiter-engine-5.12.2.jar:/Users/maddy/.m2/repository/org/junit/platform/junit-platform-engine/1.12.2/junit-platform-engine-1.12.2.jar:"/>
@@ -20,8 +20,8 @@
     <property name="user.home" value="/Users/maddy"/>
     <property name="user.language" value="en"/>
     <property name="java.specification.vendor" value="Oracle Corporation"/>
-    <property name="java.version.date" value="2026-01-20"/>
-    <property name="java.home" value="/opt/homebrew/Cellar/openjdk/25.0.2/libexec/openjdk.jdk/Contents/Home"/>
+    <property name="java.version.date" value="2025-07-15"/>
+    <property name="java.home" value="/Users/maddy/Library/Java/JavaVirtualMachines/ms-21.0.8/Contents/Home"/>
     <property name="file.separator" value="/"/>
     <property name="basedir" value="/Users/maddy/Projects/cygnus/matrix/cygnus-lib"/>
     <property name="java.vm.compressedOopsMode" value="Zero based"/>
@@ -29,10 +29,10 @@
     <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
     <property name="java.specification.name" value="Java Platform API Specification"/>
     <property name="apple.awt.application.name" value="ForkedBooter"/>
-    <property name="surefire.real.class.path" value="/Users/maddy/Projects/cygnus/matrix/cygnus-lib/target/surefire/surefirebooter-20260801204253825_3.jar"/>
+    <property name="surefire.real.class.path" value="/Users/maddy/Projects/cygnus/matrix/cygnus-lib/target/surefire/surefirebooter-20260801225315947_3.jar"/>
     <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
     <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
-    <property name="java.runtime.version" value="25.0.2"/>
+    <property name="java.runtime.version" value="21.0.8+9-LTS"/>
     <property name="user.name" value="maddy"/>
     <property name="stdout.encoding" value="UTF-8"/>
     <property name="path.separator" value=":"/>
@@ -40,11 +40,11 @@
     <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
     <property name="file.encoding" value="UTF-8"/>
     <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
-    <property name="java.vendor.version" value="Homebrew"/>
+    <property name="java.vendor.version" value="Microsoft-11933201"/>
     <property name="localRepository" value="/Users/maddy/.m2/repository"/>
-    <property name="java.vendor.url.bug" value="https://github.com/Homebrew/homebrew-core/issues"/>
+    <property name="java.vendor.url.bug" value="https://github.com/microsoft/openjdk/issues"/>
     <property name="java.io.tmpdir" value="/var/folders/1l/36214rdn79755j30lcnmgsqh0000gn/T/"/>
-    <property name="java.version" value="25.0.2"/>
+    <property name="java.version" value="21.0.8"/>
     <property name="user.dir" value="/Users/maddy/Projects/cygnus/matrix/cygnus-lib"/>
     <property name="os.arch" value="aarch64"/>
     <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
@@ -52,13 +52,12 @@
     <property name="java.library.path" value="/Users/maddy/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:."/>
     <property name="java.vm.info" value="mixed mode, sharing"/>
     <property name="stderr.encoding" value="UTF-8"/>
-    <property name="java.vendor" value="Homebrew"/>
-    <property name="java.vm.version" value="25.0.2"/>
-    <property name="stdin.encoding" value="UTF-8"/>
+    <property name="java.vendor" value="Microsoft"/>
+    <property name="java.vm.version" value="21.0.8+9-LTS"/>
     <property name="sun.io.unicode.encoding" value="UnicodeBig"/>
     <property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
-    <property name="java.class.version" value="69.0"/>
+    <property name="java.class.version" value="65.0"/>
   </properties>
   <testcase name="mapsHttpStatusToCanonicalError" classname="lib.models.ErrorDetailsTest" time="0.008"/>
-  <testcase name="createsAReusableErrorContract" classname="lib.models.ErrorDetailsTest" time="0.007"/>
+  <testcase name="createsAReusableErrorContract" classname="lib.models.ErrorDetailsTest" time="0.012"/>
 </testsuite>
\ No newline at end of file
diff --git a/cygnus-lib/target/surefire-reports/lib.models.ErrorDetailsTest.txt b/cygnus-lib/target/surefire-reports/lib.models.ErrorDetailsTest.txt
index c838cbc..18dfcf8 100644
--- a/cygnus-lib/target/surefire-reports/lib.models.ErrorDetailsTest.txt
+++ b/cygnus-lib/target/surefire-reports/lib.models.ErrorDetailsTest.txt
@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: lib.models.ErrorDetailsTest
 -------------------------------------------------------------------------------
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.024 s -- in lib.models.ErrorDetailsTest
+Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.028 s -- in lib.models.ErrorDetailsTest
diff --git a/cygnus-onprem-app/build/WebContent/WEB-INF/app/edp/punching/initcase.jsp b/cygnus-onprem-app/build/WebContent/WEB-INF/app/edp/punching/initcase.jsp
index ef74d95..6a7f76e 100644
--- a/cygnus-onprem-app/build/WebContent/WEB-INF/app/edp/punching/initcase.jsp
+++ b/cygnus-onprem-app/build/WebContent/WEB-INF/app/edp/punching/initcase.jsp
@@ -53,7 +53,7 @@
 <c:if test="${pageFormMode!=2}">
 <!-- Dynamic Menu -->
 	<nav class="matrix-shell__navigation" aria-label="Primary navigation">
-		<c:out value="${Sessvals.menuHtml}" escapeXml="false" />
+		<c:out value="${sessionScope.userSession.menuHtml}" escapeXml="false" />
 	</nav>
 <!-- -->
 </c:if>
@@ -133,9 +133,9 @@
 								<option value="-1" selected >SELECT</option>
 				<c:choose>
 					<c:when test="${not empty model}">
-						<c:forEach items="${model.options}" var="option"><c:if test="${fn:startsWith(option.key, 'branch.')}">
-							<option value="${fn:substringAfter(option.key, 'branch.')}"><c:out value="${option.value}" /></option>
-						</c:if></c:forEach>
+						<c:forEach items="${model.options['branch.']}" var="option">
+							<option value="${option.value}"><c:out value="${option.label}" /></option>
+						</c:forEach>
 					</c:when>
 					<c:otherwise><c:forEach items="${branchlist}" var="brnch"><option value="${brnch[0]}"><c:out value="${brnch[1]}" /></option></c:forEach></c:otherwise>
 				</c:choose>
@@ -152,7 +152,7 @@
 							<select id="product" name="product" style="width:150px" onblur="validate(this,'t','');">
 								<option value="-1" selected >SELECT</option>
 				<c:choose>
-					<c:when test="${not empty model}"><c:forEach items="${model.options}" var="option"><c:if test="${fn:startsWith(option.key, 'product.')}"><option value="${fn:substringAfter(option.key, 'product.')}"><c:out value="${option.value}" /></option></c:if></c:forEach></c:when>
+					<c:when test="${not empty model}"><c:forEach items="${model.options['product.']}" var="option"><option value="${option.value}"><c:out value="${option.label}" /></option></c:forEach></c:when>
 					<c:otherwise><c:forEach items="${prodlist}" var="prod"><option value="${prod[0]}"><c:out value="${prod[1]}" /></option></c:forEach></c:otherwise>
 				</c:choose>
 							</select>		    
@@ -184,7 +184,7 @@
 							<select id="apptype" name="apptype" style="width:153px" onchange="ToggleChks((this.value.toUpperCase()!='APPLICANT' && this.value.toUpperCase()!='-1'),'sradd!C0L!soadd!C0L!spadd!C0L!','!C0L!')" onblur="validate(this,'t','');">
 								<option value="-1" selected>SELECT</option>
 				<c:choose>
-					<c:when test="${not empty model}"><c:forEach items="${model.options}" var="option"><c:if test="${fn:startsWith(option.key, 'applicationType.')}"><option value="${fn:substringAfter(option.key, 'applicationType.')}"><c:out value="${option.value}" /></option></c:if></c:forEach></c:when>
+					<c:when test="${not empty model}"><c:forEach items="${model.options['applicationType.']}" var="option"><option value="${option.value}"><c:out value="${option.label}" /></option></c:forEach></c:when>
 					<c:otherwise><c:forEach items="${typelist}" var="type"><option value="${type[0]}"><c:out value="${type[1]}" /></option></c:forEach></c:otherwise>
 				</c:choose>
 							</select>		    
@@ -200,7 +200,7 @@
 							<select id="category" name="category" style="width:133px">
 								<option value="-1" selected>SELECT</option>
 				<c:choose>
-					<c:when test="${not empty model}"><c:forEach items="${model.options}" var="option"><c:if test="${fn:startsWith(option.key, 'category.')}"><option value="${fn:substringAfter(option.key, 'category.')}"><c:out value="${option.value}" /></option></c:if></c:forEach></c:when>
+					<c:when test="${not empty model}"><c:forEach items="${model.options['category.']}" var="option"><option value="${option.value}"><c:out value="${option.label}" /></option></c:forEach></c:when>
 					<c:otherwise><c:forEach items="${catlist}" var="cat"><option value="${cat[0]}"><c:out value="${cat[1]}" /></option></c:forEach></c:otherwise>
 				</c:choose>
 							</select>		    
@@ -311,7 +311,7 @@
 								<option value="-1">Select</option>
 								<option value="Unknown">Unknown</option>
 				<c:choose>
-					<c:when test="${not empty model}"><c:forEach items="${model.options}" var="option"><c:if test="${fn:startsWith(option.key, 'city.')}"><option value="${fn:substringAfter(option.key, 'city.')}"><c:out value="${option.value}" /></option></c:if></c:forEach></c:when>
+					<c:when test="${not empty model}"><c:forEach items="${model.options['city.']}" var="option"><option value="${option.value}"><c:out value="${option.label}" /></option></c:forEach></c:when>
 					<c:otherwise><c:forEach items="${citylist}" var="city"><option value="${city[0]}"><c:out value="${city[1]}" /></option></c:forEach></c:otherwise>
 				</c:choose>
 							</select>		    
@@ -429,7 +429,7 @@
 								<option value="-1">Select</option>
 								<option value="Unknown">Unknown</option>
 				<c:choose>
-					<c:when test="${not empty model}"><c:forEach items="${model.options}" var="option"><c:if test="${fn:startsWith(option.key, 'city.')}"><option value="${fn:substringAfter(option.key, 'city.')}"><c:out value="${option.value}" /></option></c:if></c:forEach></c:when>
+					<c:when test="${not empty model}"><c:forEach items="${model.options['city.']}" var="option"><option value="${option.value}"><c:out value="${option.label}" /></option></c:forEach></c:when>
 					<c:otherwise><c:forEach items="${citylist}" var="city"><option value="${city[0]}"><c:out value="${city[1]}" /></option></c:forEach></c:otherwise>
 				</c:choose>
 							</select>		    
@@ -556,7 +556,7 @@
 								<option value="-1">Select</option>
 								<option value="Unknown">Unknown</option>
 				<c:choose>
-					<c:when test="${not empty model}"><c:forEach items="${model.options}" var="option"><c:if test="${fn:startsWith(option.key, 'city.')}"><option value="${fn:substringAfter(option.key, 'city.')}"><c:out value="${option.value}" /></option></c:if></c:forEach></c:when>
+					<c:when test="${not empty model}"><c:forEach items="${model.options['city.']}" var="option"><option value="${option.value}"><c:out value="${option.label}" /></option></c:forEach></c:when>
 					<c:otherwise><c:forEach items="${citylist}" var="city"><option value="${city[0]}"><c:out value="${city[1]}" /></option></c:forEach></c:otherwise>
 				</c:choose>
 							</select>		    
@@ -689,8 +689,8 @@
 </c:if>
 <input type="hidden" id="uuid" name="uuid" value="${pageDocumentCaseId}" />
 <input type="hidden" id="case_id" name="case_id" value="" />
-<input type="hidden" id="company_id" name="company_id" value="${Sessvals.getCompanyID()}" />
-<input type="hidden" id="branch_id" name="branch_id" value="${Sessvals.getBranchID()}" />
+<input type="hidden" id="company_id" name="company_id" value="${sessionScope.userSession.companyId}" />
+<input type="hidden" id="branch_id" name="branch_id" value="${sessionScope.userSession.branchId}" />
 <input type="hidden" id="status" name="status" value="" />
 <!--  -->
 <input type="hidden" id="invalidfields" value="0" />
diff --git a/cygnus-onprem-app/build/WebContent/WEB-INF/app/fragments/app-title.jspf b/cygnus-onprem-app/build/WebContent/WEB-INF/app/fragments/app-title.jspf
index 648c45b..662c5ab 100644
--- a/cygnus-onprem-app/build/WebContent/WEB-INF/app/fragments/app-title.jspf
+++ b/cygnus-onprem-app/build/WebContent/WEB-INF/app/fragments/app-title.jspf
@@ -6,8 +6,8 @@
             <span>Cygnus 1.0</span>
         </div>
         <div class="matrix-shell__context" aria-label="Current session">
-            <span class="matrix-shell__company"><c:out value="${Sessvals.getCompanyCode()}" /> (<c:out value="${Sessvals.getBranchLocation()}" />)</span>
-            <span class="matrix-shell__user"><c:out value="${Sessvals.getUserDisplayName()}" /> (<c:out value="${Sessvals.getUserGroupName()}" />)</span>
+            <span class="matrix-shell__company"><c:out value="${sessionScope.userSession.companyCode}" /> (<c:out value="${sessionScope.userSession.branchLocation}" />)</span>
+            <span class="matrix-shell__user"><c:out value="${sessionScope.userSession.userDisplayName}" /> (<c:out value="${sessionScope.userSession.userGroupName}" />)</span>
         </div>
     </div>
 </header>
diff --git a/cygnus-onprem-app/src/main/java/matrix/nimble/cloud/identity/CloudAuthenticationGateway.java b/cygnus-onprem-app/src/main/java/matrix/nimble/cloud/identity/CloudAuthenticationGateway.java
index d510989..5916d71 100644
--- a/cygnus-onprem-app/src/main/java/matrix/nimble/cloud/identity/CloudAuthenticationGateway.java
+++ b/cygnus-onprem-app/src/main/java/matrix/nimble/cloud/identity/CloudAuthenticationGateway.java
@@ -5,7 +5,7 @@ import com.cygnus.client.CloudIdentityClient;
 import java.time.Duration;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import matrix.nimble.model.Session;
+import lib.models.UserSession;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
@@ -28,7 +28,7 @@ public class CloudAuthenticationGateway {
         this.sessionMapper = sessionMapper;
     }
 
-    public Session authenticate(String loginId, String password) {
+    public UserSession authenticate(String loginId, String password) {
         try {
             Duration blockingTimeout = properties.requestTimeout().plusSeconds(1);
             return sessionMapper.map(client.authenticate(loginId, password).block(blockingTimeout));
diff --git a/cygnus-onprem-app/src/main/java/matrix/nimble/cloud/identity/CloudSessionMapper.java b/cygnus-onprem-app/src/main/java/matrix/nimble/cloud/identity/CloudSessionMapper.java
index fc47fbe..f297ee6 100644
--- a/cygnus-onprem-app/src/main/java/matrix/nimble/cloud/identity/CloudSessionMapper.java
+++ b/cygnus-onprem-app/src/main/java/matrix/nimble/cloud/identity/CloudSessionMapper.java
@@ -5,6 +5,7 @@ import com.cygnus.client.model.CloudMenuItem;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import lib.models.UserSession;
 import matrix.nimble.model.Session;
 import org.springframework.stereotype.Component;
 
@@ -20,22 +21,42 @@ public class CloudSessionMapper {
         this.menuRenderer = menuRenderer;
     }
 
-    public Session map(CloudIdentitySession source) {
+    public UserSession map(CloudIdentitySession source) {
+        return UserSession.builder()
+                .userId(source.userId())
+                .username(source.loginId())
+                .userDisplayName(source.displayName())
+                .userGroupId(source.groupId())
+                .userGroupName(source.groupName())
+                .branchId(source.branchId())
+                .branchName(source.branchName())
+                .branchCode(source.branchCode())
+                .branchLocation(source.branchLocation())
+                .companyId(source.companyId())
+                .companyName(source.companyName())
+                .companyCode(source.companyCode())
+                .loginTime(LEGACY_LOGIN_TIME.format(source.loginTime()))
+                .menuHtml(menuRenderer.render(toLegacyMenu(source.menu())))
+                .build();
+    }
+
+    /** Temporary projection used by controllers that have not migrated to UserSession yet. */
+    public Session toLegacy(UserSession source) {
         Session target = new Session();
-        target.setUserID(Short.toString(source.userId()));
-        target.setUsername(source.loginId());
-        target.setUserDisplayName(source.displayName());
-        target.setUserGroupID(Short.toString(source.groupId()));
-        target.setUserGroupName(source.groupName());
-        target.setBranchID(Short.toString(source.branchId()));
-        target.setBranchName(source.branchName());
-        target.setBranchCode(source.branchCode());
-        target.setBranchLocation(source.branchLocation());
-        target.setCompanyID(Short.toString(source.companyId()));
-        target.setCompanyName(source.companyName());
-        target.setCompanyCode(source.companyCode());
-        target.setLoginTime(LEGACY_LOGIN_TIME.format(source.loginTime()));
-        target.setMenuHtml(menuRenderer.render(toLegacyMenu(source.menu())));
+        target.setUserID(Short.toString(source.getUserId()));
+        target.setUsername(source.getUsername());
+        target.setUserDisplayName(source.getUserDisplayName());
+        target.setUserGroupID(Short.toString(source.getUserGroupId()));
+        target.setUserGroupName(source.getUserGroupName());
+        target.setBranchID(Short.toString(source.getBranchId()));
+        target.setBranchName(source.getBranchName());
+        target.setBranchCode(source.getBranchCode());
+        target.setBranchLocation(source.getBranchLocation());
+        target.setCompanyID(Short.toString(source.getCompanyId()));
+        target.setCompanyName(source.getCompanyName());
+        target.setCompanyCode(source.getCompanyCode());
+        target.setLoginTime(source.getLoginTime());
+        target.setMenuHtml(source.getMenuHtml());
         return target;
     }
 
diff --git a/cygnus-onprem-app/src/main/java/matrix/nimble/controller/AbstractAuthenticatedController.java b/cygnus-onprem-app/src/main/java/matrix/nimble/controller/AbstractAuthenticatedController.java
index d522876..1d1c1fd 100644
--- a/cygnus-onprem-app/src/main/java/matrix/nimble/controller/AbstractAuthenticatedController.java
+++ b/cygnus-onprem-app/src/main/java/matrix/nimble/controller/AbstractAuthenticatedController.java
@@ -4,7 +4,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import lib.constants.ApplicationError;
 import lib.models.ErrorDetails;
-import matrix.nimble.model.Session;
+import lib.models.UserSession;
 import matrix.services.commons.CommonErrorService;
 import matrix.services.commons.CommonService;
 import org.springframework.ui.ModelMap;
@@ -26,14 +26,14 @@ public abstract class AbstractAuthenticatedController {
             ModelMap model,
             HttpSession httpSession,
             HttpServletResponse response) {
-        Session session = commonService.getSession(httpSession);
+        UserSession session = commonService.getUserSession(httpSession);
         if (session == null) {
             return denied(model, response, httpSession, ApplicationError.SESSION_REQUIRED);
         }
         if (!commonService.hasPageAccess(session, pageRoute)) {
             return denied(model, response, httpSession, ApplicationError.ACCESS_DENIED);
         }
-        model.addAttribute(CommonService.SESSION_ATTRIBUTE, session);
+        model.addAttribute(CommonService.USER_SESSION_ATTRIBUTE, session);
         return PageAuthorization.granted(session);
     }
 
@@ -47,8 +47,8 @@ public abstract class AbstractAuthenticatedController {
         return PageAuthorization.denied(viewName);
     }
 
-    protected record PageAuthorization(Session session, String viewName) {
-        private static PageAuthorization granted(Session session) {
+    protected record PageAuthorization(UserSession session, String viewName) {
+        private static PageAuthorization granted(UserSession session) {
             return new PageAuthorization(session, null);
         }
 
diff --git a/cygnus-onprem-app/src/main/java/matrix/nimble/controller/SessionController.java b/cygnus-onprem-app/src/main/java/matrix/nimble/controller/SessionController.java
index 82be155..08a25b7 100644
--- a/cygnus-onprem-app/src/main/java/matrix/nimble/controller/SessionController.java
+++ b/cygnus-onprem-app/src/main/java/matrix/nimble/controller/SessionController.java
@@ -2,9 +2,11 @@ package matrix.nimble.controller;
 
 import matrix.nimble.cloud.identity.CloudAuthenticationException;
 import matrix.nimble.cloud.identity.CloudAuthenticationGateway;
+import matrix.nimble.cloud.identity.CloudSessionMapper;
 import matrix.nimble.model.Login;
 import matrix.nimble.model.Session;
 import matrix.services.commons.CommonService;
+import lib.models.UserSession;
 
 //servlet libraries
 import jakarta.servlet.http.HttpServletRequest;
@@ -23,12 +25,15 @@ import org.springframework.web.bind.annotation.SessionAttributes;
 public class SessionController {
 	private final CloudAuthenticationGateway cloudAuthenticationGateway;
 	private final CommonService commonService;
+	private final CloudSessionMapper cloudSessionMapper;
 
 	public SessionController(
 			CloudAuthenticationGateway cloudAuthenticationGateway,
-			CommonService commonService) {
+			CommonService commonService,
+			CloudSessionMapper cloudSessionMapper) {
 		this.cloudAuthenticationGateway = cloudAuthenticationGateway;
 		this.commonService = commonService;
+		this.cloudSessionMapper = cloudSessionMapper;
 	}
 	@RequestMapping(value="login", method={RequestMethod.GET, RequestMethod.POST})
 	public String LoginPage(ModelMap model)
@@ -53,10 +58,12 @@ public class SessionController {
 			HttpSession httpSession)
 	{
 		try {
-			Session cloudSession = cloudAuthenticationGateway.authenticate(
+			UserSession userSession = cloudAuthenticationGateway.authenticate(
 					login.getLoginid(), login.getPassword());
+			Session cloudSession = cloudSessionMapper.toLegacy(userSession);
 			model.remove("login");
 			model.addAttribute("Sessvals", cloudSession);
+			commonService.storeUserSession(httpSession, userSession);
 			commonService.storeSession(httpSession, cloudSession);
 			return "home";
 		} catch (CloudAuthenticationException exception) {
diff --git a/cygnus-onprem-app/src/main/java/matrix/nimble/edp/punching/controllers/PunchingController.java b/cygnus-onprem-app/src/main/java/matrix/nimble/edp/punching/controllers/PunchingController.java
index b4850cc..b48b940 100644
--- a/cygnus-onprem-app/src/main/java/matrix/nimble/edp/punching/controllers/PunchingController.java
+++ b/cygnus-onprem-app/src/main/java/matrix/nimble/edp/punching/controllers/PunchingController.java
@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import jakarta.servlet.http.HttpSession;
 import jakarta.servlet.http.HttpServletResponse;
 import matrix.nimble.controller.AbstractAuthenticatedController;
-import matrix.nimble.model.Session;
+import lib.models.UserSession;
 import matrix.services.commons.CommonService;
 import matrix.services.edp.PunchingService;
 import matrix.services.commons.CommonErrorService;
@@ -38,11 +38,10 @@ public class PunchingController extends AbstractAuthenticatedController {
         if (!authorization.isGranted()) {
             return authorization.viewName();
         }
-        Session Sessvals = authorization.session();
+        UserSession userSession = authorization.session();
 
         model.addAttribute("model", punchingService.init(
-                Sessvals.getBranchID(), Sessvals.getUserID(), null, "xxx"));
-        model.addAttribute("Sessvals", Sessvals);
+                userSession.getBranchId(), userSession.getUserId(), null, null));
         return "edp/punching/initcase";
     }
 
@@ -58,16 +57,15 @@ public class PunchingController extends AbstractAuthenticatedController {
             return authorization.viewName();
         }
 
-        Session session = authorization.session();
+        UserSession session = authorization.session();
         model.addAttribute("model", punchingService.addCase(
-                submitted, session.getBranchID(), session.getUserID()));
-        model.addAttribute("Sessvals", session);
+                submitted, session.getBranchId(), session.getCompanyId(), session.getUserId()));
         return "edp/punching/initcase";
     }
 
     @RequestMapping(value = "caseedit", method = RequestMethod.POST)
     public String editCase(
-            @RequestParam("PortfolioId") Integer portfolioId,
+            @RequestParam("PortfolioId") Short portfolioId,
             @RequestParam("uuid") String documentCaseId,
             ModelMap model,
             HttpSession httpSession,
@@ -78,10 +76,10 @@ public class PunchingController extends AbstractAuthenticatedController {
             return authorization.viewName();
         }
 
-        Session session = authorization.session();
+        UserSession session = authorization.session();
         model.addAttribute("model", punchingService.editCase(
-                portfolioId, documentCaseId, session.getBranchID(), session.getUserID()));
-        model.addAttribute("Sessvals", session);
+                portfolioId, documentCaseId, session.getBranchId(),
+                session.getCompanyId(), session.getUserId()));
         return "edp/punching/initcase";
     }
 }
diff --git a/cygnus-onprem-app/src/main/java/matrix/services/commons/CommonService.java b/cygnus-onprem-app/src/main/java/matrix/services/commons/CommonService.java
index a13c4b8..a0e2720 100644
--- a/cygnus-onprem-app/src/main/java/matrix/services/commons/CommonService.java
+++ b/cygnus-onprem-app/src/main/java/matrix/services/commons/CommonService.java
@@ -3,6 +3,7 @@ package matrix.services.commons;
 import com.cygnus.db.CygnusDbExecutor;
 import jakarta.servlet.http.HttpSession;
 import lib.models.Option;
+import lib.models.UserSession;
 
 import java.util.List;
 import java.util.Objects;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class CommonService {
     public static final String SESSION_ATTRIBUTE = "Sessvals";
+    public static final String USER_SESSION_ATTRIBUTE = "userSession";
 
     private static final Pattern MENU_COMMAND = Pattern.compile(
             "SubmitMenuCommand\\(\\s*'([^']+)'\\s*,",
@@ -46,6 +48,20 @@ public class CommonService {
         httpSession.setAttribute(SESSION_ATTRIBUTE, Objects.requireNonNull(session, "session"));
     }
 
+    public UserSession getUserSession(HttpSession httpSession) {
+        if (httpSession == null) {
+            return null;
+        }
+        Object value = httpSession.getAttribute(USER_SESSION_ATTRIBUTE);
+        return value instanceof UserSession session ? session : null;
+    }
+
+    public void storeUserSession(HttpSession httpSession, UserSession session) {
+        Objects.requireNonNull(httpSession, "httpSession");
+        httpSession.setAttribute(
+                USER_SESSION_ATTRIBUTE, Objects.requireNonNull(session, "session"));
+    }
+
     public boolean hasPageAccess(HttpSession httpSession, String pageRoute) {
         return hasPageAccess(getSession(httpSession), pageRoute);
     }
@@ -69,6 +85,29 @@ public class CommonService {
         return false;
     }
 
+    public boolean hasPageAccess(UserSession session, String pageRoute) {
+        return session != null && hasPageAccess(session.getMenuHtml(), pageRoute);
+    }
+
+    private boolean hasPageAccess(String menuHtml, String pageRoute) {
+        if (menuHtml == null) {
+            return false;
+        }
+
+        String requiredRoute = normalizeRoute(pageRoute);
+        if (requiredRoute.isEmpty()) {
+            return false;
+        }
+
+        Matcher matcher = MENU_COMMAND.matcher(menuHtml);
+        while (matcher.find()) {
+            if (normalizeRoute(matcher.group(1)).equals(requiredRoute)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private String normalizeRoute(String route) {
         if (route == null) {
             return "";
diff --git a/cygnus-onprem-app/src/main/java/matrix/services/edp/PunchingService.java b/cygnus-onprem-app/src/main/java/matrix/services/edp/PunchingService.java
index 30acdd0..c2e06e5 100644
--- a/cygnus-onprem-app/src/main/java/matrix/services/edp/PunchingService.java
+++ b/cygnus-onprem-app/src/main/java/matrix/services/edp/PunchingService.java
@@ -1,5 +1,6 @@
 package matrix.services.edp;
 
+import com.cygnus.db.SqlArrayParameter;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -13,7 +14,6 @@ import lib.models.ErrorDetails;
 import lib.models.Option;
 import lib.constants.ApplicationError;
 import matrix.nimble.edp.punching.model.PunchingHandler;
-import matrix.nimble.utilities.CommonFunctions;
 import matrix.nimble.utilities.GlobalClass;
 import matrix.services.commons.CommonService;
 
@@ -25,8 +25,15 @@ public class PunchingService {
     private static final String PRODUCT = "product.";
     private static final String CITY = "city.";
     private static final String APPLICATION_TYPE = "applicationType.";
+    private static final String DATABASE_APPLICATION_TYPE = "apptype.";
     private static final String CATEGORY = "category.";
 
+    private static final Short ACTIVE = Short.valueOf((short) 1);
+    private static final SqlArrayParameter GENERAL_OPTION_TYPES =
+            SqlArrayParameter.text("CITY", "APPTYPE");
+    private static final SqlArrayParameter PORTFOLIO_OPTION_TYPES =
+            SqlArrayParameter.text("CATEGORY", "PRODUCT");
+
     private final CommonService commonService;
 
     public PunchingService(CommonService commonService) {
@@ -34,8 +41,8 @@ public class PunchingService {
     }
 
     public CasePunching init(
-            String branchId,
-            String userId,
+            Short branchId,
+            Short userId,
             String verificationCaseId,
             String documentCaseId) {
         PunchingHandler punchingHandler = new PunchingHandler();
@@ -43,16 +50,15 @@ public class PunchingService {
 
         CasePunching casePunching = new CasePunching();
         Map<String, List<Option>> options = new LinkedHashMap<>();
-        Short databaseBranchId = Short.valueOf(branchId.trim());
         List<Option> portfolios = commonService.getOptions(
-                3, new Object[] { databaseBranchId, Short.valueOf((short) 1) });
+                3, new Object[] { branchId, ACTIVE });
 
         addOptions(options, PORTFOLIO, portfolios);
-        casePunching.setOptions(Collections.unmodifiableMap(options));
+        casePunching.setOptions(freezeOptions(options));
         casePunching.setVisibleSections(List.of());
-        casePunching.setPortfolioId(-1);
+        casePunching.setPortfolioId((short) -1);
         casePunching.setFormMode(0);
-        casePunching.setUserId(userId);
+        casePunching.setUserId(Short.toString(userId));
         casePunching.setDynamicFields("");
         casePunching.setDynamicHtml("");
         casePunching.setVerificationCaseId(verificationCaseId);
@@ -62,17 +68,18 @@ public class PunchingService {
 
     public CasePunching addCase(
             CasePunching submitted,
-            String branchIds,
-            String userId) {
+            Short branchId,
+            Short companyId,
+            Short userId) {
         CasePunching result = new CasePunching();
         result.setPortfolioId(submitted.getPortfolioId());
         result.setFormMode(1);
-        result.setUserId(userId);
+        result.setUserId(Short.toString(userId));
         result.setVerificationCaseId(submitted.getVerificationCaseId());
         result.setDocumentCaseId("xxx");
 
         if (submitted.getPortfolioId() == null || submitted.getPortfolioId() <= 0) {
-            result.setOptions(Collections.emptyMap());
+            result.setOptions(Map.of());
             result.setVisibleSections(List.of());
             result.setDynamicFields("");
             result.setDynamicHtml("");
@@ -80,11 +87,10 @@ public class PunchingService {
             return result;
         }
 
-        String portfolioId = submitted.getPortfolioId().toString();
+        Short portfolioId = submitted.getPortfolioId();
         PunchingHandler punchingHandler = new PunchingHandler();
-        CommonFunctions commonFunctions = new CommonFunctions();
         punchingHandler.setErrCode("1001");
-        punchingHandler.setPortfolioid(portfolioId);
+        punchingHandler.setPortfolioid(Short.toString(portfolioId));
         punchingHandler.setProcessFlag(true);
         punchingHandler.DynamicHtml("10");
 
@@ -101,65 +107,40 @@ public class PunchingService {
             result.setErrorDetails(new ErrorDetails(ApplicationError.INTERNAL_SERVER_ERROR));
         }
 
-        Map<String, String> options = new LinkedHashMap<>();
-        punchingHandler.GetDDValues(3, branchIds.split(GlobalClass.ColDelim));
-        addOptions(options, PORTFOLIO, punchingHandler.getOptionvals());
-
-        punchingHandler.GetDDValues(4, new String[] { portfolioId });
-        addOptions(options, BRANCH, punchingHandler.getOptionvals());
-
-        punchingHandler.GetDDValues(5,
-                (branchIds + GlobalClass.ColDelim
-                        + "op.description='CITY' or op.description='APPTYPE'"
-                        + GlobalClass.ColDelim).split(GlobalClass.ColDelim));
-        String[][] generalOptions = punchingHandler.getOptionvals();
-        if (generalOptions != null) {
-            addOptions(options, CITY,
-                    commonFunctions.GetSubArray("CITY", 2, generalOptions));
-            addOptions(options, APPLICATION_TYPE,
-                    commonFunctions.GetSubArray("APPTYPE", 2, generalOptions));
-        }
-
-        punchingHandler.GetDDValues(70,
-                (portfolioId + GlobalClass.ColDelim
-                        + "op.description='CATEGORY' or op.description='PRODUCT'"
-                        + GlobalClass.ColDelim).split(GlobalClass.ColDelim));
-        String[][] portfolioOptions = punchingHandler.getOptionvals();
-        if (portfolioOptions != null) {
-            addOptions(options, PRODUCT,
-                    commonFunctions.GetSubArray("PRODUCT", 2, portfolioOptions));
-            addOptions(options, CATEGORY,
-                    commonFunctions.GetSubArray("CATEGORY", 2, portfolioOptions));
-        }
-        result.setOptionsl(Collections.unmodifiableMap(options));
+        result.setOptions(loadOptions(branchId, companyId, portfolioId));
         return result;
     }
 
+    Map<String, List<Option>> loadOptions(
+            Short branchId, Short companyId, Short portfolioId) {
+
+        Map<String, List<Option>> options = new LinkedHashMap<>();
+        addOptions(options, PORTFOLIO, commonService.getOptions(
+                3, new Object[] {branchId, ACTIVE}));
+        addOptions(options, BRANCH, commonService.getOptions(
+                4, new Object[] {portfolioId, ACTIVE}));
+        addGroupedOptions(options, commonService.getOptions(
+                5, new Object[] {companyId, GENERAL_OPTION_TYPES}));
+        addGroupedOptions(options, commonService.getOptions(
+                70, new Object[] {portfolioId, PORTFOLIO_OPTION_TYPES}));
+        return freezeOptions(options);
+    }
+
     public CasePunching editCase(
-            Integer portfolioId,
+            Short portfolioId,
             String documentCaseId,
-            String branchIds,
-            String userId) {
+            Short branchId,
+            Short companyId,
+            Short userId) {
         CasePunching submitted = new CasePunching();
         submitted.setPortfolioId(portfolioId);
         submitted.setDocumentCaseId(documentCaseId);
-        CasePunching result = addCase(submitted, branchIds, userId);
+        CasePunching result = addCase(submitted, branchId, companyId, userId);
         result.setFormMode(2);
         result.setDocumentCaseId(documentCaseId);
         return result;
     }
 
-    private void addOptions(Map<String, String> options, String prefix, String[][] values) {
-        if (values == null) {
-            return;
-        }
-        for (String[] value : values) {
-            if (value != null && value.length >= 2 && value[0] != null) {
-                options.put(prefix + value[0], value[1] == null ? "" : value[1]);
-            }
-        }
-    }
-
     private void addOptions(Map<String, List<Option>> options, String prefix, List<Option> values) {
         if (values == null || values.isEmpty()) {
             return;
@@ -178,6 +159,45 @@ public class PunchingService {
         }
     }
 
+    private void addGroupedOptions(Map<String, List<Option>> options, List<Option> values) {
+        if (values == null || values.isEmpty()) {
+            return;
+        }
+        for (Option value : values) {
+            if (value == null || value.getValue() == null) {
+                continue;
+            }
+            String group = normalizeGroup(value.getGroup());
+            if (group == null) {
+                continue;
+            }
+            options.computeIfAbsent(group, ignored -> new java.util.ArrayList<>()).add(value);
+        }
+    }
+
+    private String normalizeGroup(String group) {
+        if (group == null || group.isBlank()) {
+            return null;
+        }
+        String normalized = group.trim();
+        if (DATABASE_APPLICATION_TYPE.equalsIgnoreCase(normalized)) {
+            return APPLICATION_TYPE;
+        }
+        if (CITY.equalsIgnoreCase(normalized)) return CITY;
+        if (CATEGORY.equalsIgnoreCase(normalized)) return CATEGORY;
+        if (PRODUCT.equalsIgnoreCase(normalized)) return PRODUCT;
+        return null;
+    }
+
+    private Map<String, List<Option>> freezeOptions(Map<String, List<Option>> options) {
+        if (options.isEmpty()) {
+            return Map.of();
+        }
+        Map<String, List<Option>> immutable = new LinkedHashMap<>(options.size());
+        options.forEach((group, values) -> immutable.put(group, List.copyOf(values)));
+        return Collections.unmodifiableMap(immutable);
+    }
+
     private List<String> toVisibleSections(String sections) {
         if (sections == null || sections.isBlank()) {
             return List.of();
diff --git a/cygnus-onprem-app/src/test/java/matrix/nimble/RoleVisibleBatchMigrationTest.java b/cygnus-onprem-app/src/test/java/matrix/nimble/RoleVisibleBatchMigrationTest.java
index cd53a7b..b88a758 100644
--- a/cygnus-onprem-app/src/test/java/matrix/nimble/RoleVisibleBatchMigrationTest.java
+++ b/cygnus-onprem-app/src/test/java/matrix/nimble/RoleVisibleBatchMigrationTest.java
@@ -310,7 +310,8 @@ class RoleVisibleBatchMigrationTest {
                     Path.of("build/WebContent/WEB-INF/app/operation/tools").resolve(page));
             assertTrue(content.contains("matrix-shell matrix-tool-workspace"), page);
             assertTrue(content.contains("tool-workspace-v3.css"), page);
-            assertTrue(content.contains("Sessvals.menuHtml"), page);
+            assertTrue(content.contains("Sessvals.menuHtml")
+                    || content.contains("sessionScope.userSession.menuHtml"), page);
             assertFalse(content.contains("z-index:-1"), page);
             assertFalse(content.contains("centerDivBoth(\"formcontainer\""), page);
         }
@@ -505,7 +506,8 @@ class RoleVisibleBatchMigrationTest {
             String content = Files.readString(punching.resolve(page));
             assertTrue(content.contains("matrix-tool-workspace matrix-punch-workspace"), page);
             assertTrue(content.contains("punch-workspace-v3.css"), page);
-            assertTrue(content.contains("Sessvals.menuHtml"), page);
+            assertTrue(content.contains("Sessvals.menuHtml")
+                    || content.contains("sessionScope.userSession.menuHtml"), page);
             assertFalse(content.contains("z-index:-1"), page);
             assertFalse(content.contains("centerDivBoth(\"formcontainer\""), page);
         }
diff --git a/cygnus-onprem-app/src/test/java/matrix/nimble/cloud/identity/CloudSessionMapperTest.java b/cygnus-onprem-app/src/test/java/matrix/nimble/cloud/identity/CloudSessionMapperTest.java
index c70091a..c621b76 100644
--- a/cygnus-onprem-app/src/test/java/matrix/nimble/cloud/identity/CloudSessionMapperTest.java
+++ b/cygnus-onprem-app/src/test/java/matrix/nimble/cloud/identity/CloudSessionMapperTest.java
@@ -8,13 +8,13 @@ import com.cygnus.client.model.CloudIdentitySession;
 import com.cygnus.client.model.CloudMenuItem;
 import java.time.Instant;
 import java.util.List;
-import matrix.nimble.model.Session;
+import lib.models.UserSession;
 import org.junit.jupiter.api.Test;
 
 class CloudSessionMapperTest {
 
     @Test
-    void mapsCloudIdentityAndStructuredMenuToLegacySession() {
+    void mapsCloudIdentityAndStructuredMenuToTypedSession() {
         CloudIdentitySession identity = new CloudIdentitySession(
                 (short) 17,
                 "maddy",
@@ -37,9 +37,9 @@ class CloudSessionMapperTest {
                                 (short) 11, "Scanning", "scanreporting", (short) 10,
                                 (short) 1, "111", "_parent", "")));
 
-        Session session = new CloudSessionMapper(new SessionMenuRenderer()).map(identity);
+        UserSession session = new CloudSessionMapper(new SessionMenuRenderer()).map(identity);
 
-        assertEquals("17", session.getUserID());
+        assertEquals((short) 17, session.getUserId());
         assertEquals("maddy", session.getUsername());
         assertEquals("Operations", session.getUserGroupName());
         assertEquals("Mayapuri", session.getBranchName());
@@ -49,4 +49,19 @@ class CloudSessionMapperTest {
         assertTrue(session.getMenuHtml().contains("Scanning"));
         assertTrue(session.getMenuHtml().contains("scanreporting"));
     }
+
+    @Test
+    void createsLegacyProjectionWithoutLosingIdentityValues() {
+        CloudIdentitySession identity = new CloudIdentitySession(
+                (short) 17, "maddy", "Maddy", (short) 5, "Operations",
+                (short) 9, "Mayapuri", "MYP", "Delhi", (short) 2,
+                "Matrix", "MCR", Instant.parse("2026-07-23T06:30:00Z"), List.of());
+        CloudSessionMapper mapper = new CloudSessionMapper(new SessionMenuRenderer());
+
+        matrix.nimble.model.Session legacy = mapper.toLegacy(mapper.map(identity));
+
+        assertEquals("17", legacy.getUserID());
+        assertEquals("9", legacy.getBranchID());
+        assertEquals("2", legacy.getCompanyID());
+    }
 }
diff --git a/cygnus-onprem-app/src/test/java/matrix/nimble/controller/AbstractAuthenticatedControllerTest.java b/cygnus-onprem-app/src/test/java/matrix/nimble/controller/AbstractAuthenticatedControllerTest.java
index 35a1cae..4df3fda 100644
--- a/cygnus-onprem-app/src/test/java/matrix/nimble/controller/AbstractAuthenticatedControllerTest.java
+++ b/cygnus-onprem-app/src/test/java/matrix/nimble/controller/AbstractAuthenticatedControllerTest.java
@@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import matrix.nimble.model.Session;
+import lib.models.UserSession;
 import matrix.services.commons.CommonErrorService;
 import matrix.services.commons.CommonService;
 import org.junit.jupiter.api.Test;
@@ -20,8 +20,8 @@ class AbstractAuthenticatedControllerTest {
     @Test
     void grantsAConfiguredMenuRoute() {
         MockHttpSession httpSession = new MockHttpSession();
-        Session session = sessionWithRoute("initview");
-        commonService.storeSession(httpSession, session);
+        UserSession session = sessionWithRoute("initview");
+        commonService.storeUserSession(httpSession, session);
 
         AbstractAuthenticatedController.PageAuthorization result = controller.authorize(
                 "initview", new ModelMap(), httpSession, new MockHttpServletResponse());
@@ -39,7 +39,7 @@ class AbstractAuthenticatedControllerTest {
         assertEquals(401, noSessionResponse.getStatus());
 
         MockHttpSession httpSession = new MockHttpSession();
-        commonService.storeSession(httpSession, sessionWithRoute("dashboard"));
+        commonService.storeUserSession(httpSession, sessionWithRoute("dashboard"));
         MockHttpServletResponse deniedResponse = new MockHttpServletResponse();
         AbstractAuthenticatedController.PageAuthorization denied = controller.authorize(
                 "initview", new ModelMap(), httpSession, deniedResponse);
@@ -47,11 +47,11 @@ class AbstractAuthenticatedControllerTest {
         assertEquals(403, deniedResponse.getStatus());
     }
 
-    private Session sessionWithRoute(String route) {
-        Session session = new Session();
-        session.setMenuHtml("<a onclick=\"SubmitMenuCommand('" + route
-                + "','_parent','MenuForm','')\">Page</a>");
-        return session;
+    private UserSession sessionWithRoute(String route) {
+        return UserSession.builder()
+                .menuHtml("<a onclick=\"SubmitMenuCommand('" + route
+                        + "','_parent','MenuForm','')\">Page</a>")
+                .build();
     }
 
     private static final class TestController extends AbstractAuthenticatedController {
diff --git a/cygnus-onprem-app/src/test/java/matrix/services/commons/CommonServiceTest.java b/cygnus-onprem-app/src/test/java/matrix/services/commons/CommonServiceTest.java
index 6ceb025..6fea836 100644
--- a/cygnus-onprem-app/src/test/java/matrix/services/commons/CommonServiceTest.java
+++ b/cygnus-onprem-app/src/test/java/matrix/services/commons/CommonServiceTest.java
@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import matrix.nimble.model.Session;
+import lib.models.UserSession;
 import org.junit.jupiter.api.Test;
 import org.springframework.mock.web.MockHttpSession;
 
@@ -21,6 +22,17 @@ class CommonServiceTest {
         assertSame(session, service.getSession(httpSession));
     }
 
+    @Test
+    void storesAndReadsTypedUserSession() {
+        MockHttpSession httpSession = new MockHttpSession();
+        UserSession session = typedSessionWithMenu("initview");
+
+        service.storeUserSession(httpSession, session);
+
+        assertSame(session, service.getUserSession(httpSession));
+        assertTrue(service.hasPageAccess(session, "initview"));
+    }
+
     @Test
     void grantsOnlyAnExactMenuCommandRoute() {
         Session session = sessionWithMenu("/matrix/ver/initview?source=menu");
@@ -42,4 +54,11 @@ class CommonServiceTest {
                 + "','_parent','MenuForm','')\">Punching</a>");
         return session;
     }
+
+    private UserSession typedSessionWithMenu(String route) {
+        return UserSession.builder()
+                .menuHtml("<a onclick=\"SubmitMenuCommand('" + route
+                        + "','_parent','MenuForm','')\">Punching</a>")
+                .build();
+    }
 }
diff --git a/cygnus-onprem-app/src/test/java/matrix/services/edp/PunchingServiceTest.java b/cygnus-onprem-app/src/test/java/matrix/services/edp/PunchingServiceTest.java
new file mode 100644
index 0000000..b1e7035
--- /dev/null
+++ b/cygnus-onprem-app/src/test/java/matrix/services/edp/PunchingServiceTest.java
@@ -0,0 +1,76 @@
+package matrix.services.edp;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import com.cygnus.db.SqlArrayParameter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import lib.models.Option;
+import matrix.services.commons.CommonService;
+import org.junit.jupiter.api.Test;
+
+class PunchingServiceTest {
+
+    @Test
+    void loadsParameterizedOptionsAndNormalizesApplicationTypeGroup() {
+        RecordingCommonService commonService = new RecordingCommonService();
+        PunchingService service = new PunchingService(commonService);
+
+        Map<String, List<Option>> options = service.loadOptions((short) 5, (short) 1, (short) 38);
+
+        assertEquals(List.of(3, 4, 5, 70),
+                commonService.calls.stream().map(Call::queryId).toList());
+        assertArrayEquals(new Object[] {(short) 5, (short) 1},
+                commonService.calls.get(0).parameters());
+        assertArrayEquals(new Object[] {(short) 38, (short) 1},
+                commonService.calls.get(1).parameters());
+        assertEquals((short) 1, commonService.calls.get(2).parameters()[0]);
+        assertArrayEquals(new Object[] {"CITY", "APPTYPE"},
+                ((SqlArrayParameter) commonService.calls.get(2).parameters()[1]).values());
+        assertEquals((short) 38, commonService.calls.get(3).parameters()[0]);
+        assertArrayEquals(new Object[] {"CATEGORY", "PRODUCT"},
+                ((SqlArrayParameter) commonService.calls.get(3).parameters()[1]).values());
+
+        assertEquals("Portfolio", options.get("portfolio.").getFirst().getLabel());
+        assertEquals("Branch", options.get("branch.").getFirst().getLabel());
+        assertEquals("City", options.get("city.").getFirst().getLabel());
+        assertEquals("Applicant", options.get("applicationType.").getFirst().getLabel());
+        assertEquals("Category", options.get("category.").getFirst().getLabel());
+        assertEquals("Product", options.get("product.").getFirst().getLabel());
+        assertThrows(UnsupportedOperationException.class,
+                () -> options.put("other.", List.of()));
+    }
+
+    private static final class RecordingCommonService extends CommonService {
+        private final List<Call> calls = new ArrayList<>();
+
+        @Override
+        public List<Option> getOptions(Integer queryId, Object[] queryParams) {
+            calls.add(new Call(queryId, queryParams.clone()));
+            return switch (queryId) {
+                case 3 -> List.of(option(38, "Portfolio", "portfolio."));
+                case 4 -> List.of(option(7, "Branch", "branch."));
+                case 5 -> List.of(
+                        option("DEL", "City", "city."),
+                        option("APPLICANT", "Applicant", "apptype."));
+                case 70 -> List.of(
+                        option("DIRECTOR", "Category", "category."),
+                        option("AUTO", "Product", "product."));
+                default -> List.of();
+            };
+        }
+    }
+
+    private static Option option(Object value, String label, String group) {
+        Option option = new Option();
+        option.setValue(value);
+        option.setLabel(label);
+        option.setGroup(group);
+        return option;
+    }
+
+    private record Call(int queryId, Object[] parameters) {}
+}