055 instance.is_auxiliary cfd_param minvalue, maxvalue

v1/Application.cfc

@@ -51,7 +51,7 @@
 		
 		//variables.framework.docs={};
 		variables.framework.docs.APIName="Deck API";
-		variables.framework.docs.APIVersion="0.054";
+		variables.framework.docs.APIVersion="0.055";
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 

v1/resources/instance.cfc

@@ -24,6 +24,7 @@
 				<m:field>e.service_id</m:field>
 				<m:field>e.descr</m:field>
 				<m:field>e.specification_item_id</m:field>
+				<m:field formatter=#request.castToBool#>e.is_auxiliary</m:field>
 				<m:field>to_char(e.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as instance_config_dt_created</m:field><!--- to_json(e.dt_created)##>>'{}' --->
 				<m:field>to_char(e.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as instance_config_dt_updated</m:field>
 				<m:field>d.contract_id</m:field>

v1/resources/instance_ls.cfc

@@ -32,6 +32,7 @@
 		"is_deleted"={prefix="inr", type="string"},<!--- not bool --->
 		"suspended"={prefix="inr", type="string"},<!--- not bool --->
 		"is_test"={prefix="inr", type="boolean"},
+		"is_auxiliary"={prefix="inr", type="boolean"},
 		"explained_status"={prefix="inr", type="string"},
 		"version"={prefix="inr", type="integer"} 
 	}
@@ -89,6 +90,7 @@
 				<m:field>e.display_name</m:field>
 				<m:field>e.service_id</m:field>
 				<m:field>e.specification_item_id</m:field>				
+				<m:field formatter=#request.castToBool#>e.is_auxiliary</m:field>				
 				<m:field>d.contract_id</m:field>
 				<m:field>i.specification_id</m:field>
 				<m:field>s.specification</m:field>

v1/resources/instance_operation_cfs_param_ls.cfc

@@ -203,7 +203,9 @@
 			,sop.maxlength
 			,sop.minlength
 			,sop.regex
-			,sop.unique_scope 		
+			,sop.unique_scope 	
+			,sop.maxvalue
+			,sop.minvalue
 			from svc_operation_cfs_param sop	
 			where sop.svc_operation_cfs_param_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.svcOperationCfsParamId#"/>	
 		</cfquery>
@@ -231,6 +233,13 @@
 		<cfif len(arguments.paramValue) AND len(qSvcOperationCfsParam.regex) AND reFind(qSvcOperationCfsParam.regex,arguments.paramValue) EQ 0>
 			<!--- <cfreturn 'Pattern "#qSvcOperationCfsParam.regex#" does not match "#arguments.paramValue#"'/> --->
 			<cfthrow type="invalidParamValue" message='Parameter "#qSvcOperationCfsParam.svc_operation_cfs_param#" value "#arguments.paramValue#" does not match pattern "#qSvcOperationCfsParam.regex#" '/>
+		</cfif>
+		<cfif isNumeric(arguments.paramValue) AND isNumeric(qSvcOperationCfsParam.maxvalue) AND arguments.paramValue GT qSvcOperationCfsParam.maxvalue>
+			<!--- <cfreturn 'Pattern "#qSvcOperationCfsParam.regex#" does not match "#arguments.paramValue#"'/> --->
+			<cfthrow type="invalidParamValue" message='Parameter "#qSvcOperationCfsParam.svc_operation_cfs_param#" value "#arguments.paramValue#" is greater than "#qSvcOperationCfsParam.maxvalue#" '/>
+		</cfif>	
+		<cfif isNumeric(arguments.paramValue) AND isNumeric(qSvcOperationCfsParam.minvalue) AND arguments.paramValue LT qSvcOperationCfsParam.minvalue>
+			<cfthrow type="invalidParamValue" message='Parameter "#qSvcOperationCfsParam.svc_operation_cfs_param#" value "#arguments.paramValue#" is less than "#qSvcOperationCfsParam.minvalue#" '/>
 		</cfif>	
 		
 		<!--- *** интересно, как мы ухитряемся проверить уникальность параметра, если он относится к операции, а не к экземпляру. Нам-то нужна уникальность для стейта (и то, скорее, единовременная, и интересовать будут только успешные операции) --->

v1/resources/svc_operation.cfc

@@ -42,6 +42,10 @@
 				<m:field>p.default_value</m:field>
 				<m:field>p.regex</m:field>
 				<m:field>p.unique_scope</m:field>
+				<m:field>p.maxlength</m:field>
+				<m:field>p.minlength</m:field>				
+				<m:field>p.maxvalue</m:field>
+				<m:field>p.minvalue</m:field>
 				<m:field>p.descr</m:field>
 				<m:field>p.man</m:field>
 				<m:field formatter=#request.castToBool#>(