From c29d5bec2b298196f5298855aaf3865a6b19320a Mon Sep 17 00:00:00 2001
From: unknown <smishchuk@nubes.ru>
Date: Tue, 10 Mar 2026 13:04:27 +0300
Subject: [PATCH] 210 exception handling improvement

---
 v1/Application.cfc | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/v1/Application.cfc b/v1/Application.cfc
index e21a72d..764e46b 100644
--- a/v1/Application.cfc
+++ b/v1/Application.cfc
@@ -457,14 +457,23 @@
 		<cfquery name="local.qGetUserInfo">
 			select u.usr_id, c.contragent_id, c.contract_id, s.specification_id
 			from usr u 
-			join contract c on (u.contragent_id=c.contragent_id)
-			join specification s on (c.contract_id=s.contract_id)
+			left outer join contract c on (u.contragent_id=c.contragent_id)
+			left outer join specification s on (c.contract_id=s.contract_id)
 			where u.idp_usr_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.usrUid#" null=#!isValid('guid',arguments.usrUid)#/>
 			order by s.specification_id desc 
 			limit 1;
 		</cfquery>	
 		<cfif local.qGetUserInfo.recordCount EQ 0>
-			<cfthrow message="User Not Found in CMDB" detail="User with uuid=(#arguments.contragentUid#) not found in CMDB"/>
+			<cfthrow message="User Not Found in CMDB" detail="User with uuid=(#arguments.usrUid#) not found in CMDB"/>
+		</cfif>	
+		<cfif !len(local.qGetUserInfo.contragent_id)>
+			<cfthrow message="User is not mapped to Contragent in CMDB" detail="Contragent for user with uuid=(#arguments.usrUid#) not found in CMDB"/>
+		</cfif>			
+		<cfif !len(local.qGetUserInfo.contract_id)>
+			<cfthrow message="Contract for user not found in CMDB" detail="Contract for user with uuid=(#arguments.usrUid#) not found in CMDB"/>
+		</cfif>			
+		<cfif !len(local.qGetUserInfo.specification_id)>
+			<cfthrow message="Specification for user not found in CMDB" detail="Specification for user with uuid=(#arguments.usrUid#) not found in CMDB"/>
 		</cfif>		
 
 		<!--- <cfdump var=#local.qGetCustomerInfo#/><cfabort/> --->