From 8fc009ca77a7403ec2a77c5ca9b3bf80778dd402 Mon Sep 17 00:00:00 2001
From: admin <admin@example.com>
Date: Sat, 14 Jan 2023 14:06:51 -0800
Subject: [PATCH] Improved method of wrapping.

#FA-8, #FA-10
---
 c04afa629713111093a8337e6253af6d/checksum.txt |  2 +-
 ...clude_0d925a7a975821105838bfb3f153afb0.xml |  4 +-
 ...clude_57d21676975821105838bfb3f153af24.xml | 60 +++++++++++--------
 ...clude_6cb35e7a975821105838bfb3f153aff3.xml | 10 +++-
 .../sys_ui_list_x_355681_fa_log_null.xml      | 59 +++++++++++++++---
 5 files changed, 98 insertions(+), 37 deletions(-)

diff --git a/c04afa629713111093a8337e6253af6d/checksum.txt b/c04afa629713111093a8337e6253af6d/checksum.txt
index 18b8ce6..d7bb696 100644
--- a/c04afa629713111093a8337e6253af6d/checksum.txt
+++ b/c04afa629713111093a8337e6253af6d/checksum.txt
@@ -1 +1 @@
-V1XQ0cJw0F-L5AKEIPGxVh2hmnZF2O27OWfZVPXWyyiKomWGupDQrt4Nn_kjJbInZf_8OrCRkGcizjYN4URHvMVQ6NwlAe9S3xHvu2MUk4ptiIs8BZXjDG3Mw9etcRaOig4DKYhiB89qYvvAJ4xXM7Rvyqpf_vfky6HrhGzqT2AwClsLzCV0nAyEjIlhnij8u6w4abLO7WHDyETxWWFpv5PZ_vLl7YF7H5r5qGr5JTu7aUN6bgrSHvwFKNeKR27QQisYPuCItpHQi5wce4lwFfMgiX1cqgOZPJQ0eMkvHreeqEMofTFZHEDGBhD5Yg_xyPHDbFz95x5LdD9R1JCuKtEQ1VxO3t1d-AvHGt0dwJuQgKN9G0OTNOEOgEiVeipdN4DvZMnePdgsIXwNsIvRt-zNb0RjTR_Fuh1inoxiZ5Ozfx1rKcURvo0Of7-1OwndbSOg3rUHJgrdYV1isghVnAo60WLLo2q1CAQ6hXgQjomBlnz49vodhvwocgdBq6cSfoOEB9Zj-1ZgCnR_ZEf_EIADKSvoJ8B6wWn2hnL0km9h96n3gXA3BCjRqvpsq3j01UQ-TXO8nVAxbFrq5x6conlqLA6qsubZRnaGE4STdxuQxDAwXL7mMSaUKtIFPuji_i03ckYtx-EATE1IJvA3aGvgaxWukA2LR8YA3f0aNCU
\ No newline at end of file
+GNshEW5qOuuh0Z4lJQkJ1o9ySTr2SboGe5ZcaKXxsouTJt857eKt--jD5SO-v9iy2W6iAyPC8tx-3ZCgQbviEEHMof6ignbm12ilwZgNE3IFgsk4HeNtnS2D4a9Kh8fexJXowSyKSUSzP0yK_PZuN7D99GqB3sjkwmIWpKZkVB2QBqCyJz4ZbexB_uBfptXeGFyNI3h6eVVRreha6jgEYL-FV24KNCkvpq-8DpyrSxsXHgaycUsv4cWAvCqY4QfoN9PhD8TJDDsocKA9VceRXNelkSxfWgWSI-W_D6Wr6qeI7XBCpjL9faX8eUkKk1CRx5V2mmyuczkIoRamtP4u19ZLtSCOjv-LMWICNR4YaWvcpPkru2jTKd9JOlN1pcVfSbVf4YBnEvsW0pKZ3JwnV0105C6G7i1X6cG8544C9Ryt-oKnY4ceepDqui5cHJa_RKasVNErjcYQVbCTF3ijHZojzo7zN2eT34WgwsiUZNRIF3vzGLXZ3COlxWFb30PqS1wJaog_JBJcmVBAcHVi1UDVXZ9chf16xveLwgOzhskkFhMEuhNqimIzdO5i8lnaIlVKFBHI77TKAARlszo2YwSaZfrepvXtpIzxZ0mdzXCvVti87yUYKwWaLCS3bDGhnbSOpL5qi6cbg6vHTpx8oD08jghtlq6nRrBItAeZ6_c
\ No newline at end of file
diff --git a/c04afa629713111093a8337e6253af6d/update/sys_script_include_0d925a7a975821105838bfb3f153afb0.xml b/c04afa629713111093a8337e6253af6d/update/sys_script_include_0d925a7a975821105838bfb3f153afb0.xml
index dcc7c42..b638316 100644
--- a/c04afa629713111093a8337e6253af6d/update/sys_script_include_0d925a7a975821105838bfb3f153afb0.xml
+++ b/c04afa629713111093a8337e6253af6d/update/sys_script_include_0d925a7a975821105838bfb3f153afb0.xml
@@ -25,11 +25,11 @@ LogUtils.prototype = {
 		}
 	},
 	
-	write: function(message, options){
+	write: function(message, options = {}){
 		var {
 			type = "info", 
 			timestamp = new Date(), 
-			funcName = "Unknown",
+			funcName = "",
 			currentRecord = current
 		} = options;
 		
diff --git a/c04afa629713111093a8337e6253af6d/update/sys_script_include_57d21676975821105838bfb3f153af24.xml b/c04afa629713111093a8337e6253af6d/update/sys_script_include_57d21676975821105838bfb3f153af24.xml
index df43e8b..92ab441 100644
--- a/c04afa629713111093a8337e6253af6d/update/sys_script_include_57d21676975821105838bfb3f153af24.xml
+++ b/c04afa629713111093a8337e6253af6d/update/sys_script_include_57d21676975821105838bfb3f153af24.xml
@@ -8,52 +8,51 @@
         <description/>
         <name>ProcessorUtils</name>
         <script><![CDATA[var _source;
+var _appScope;
 
 var ProcessorUtils = Class.create();
 ProcessorUtils.prototype = {
-    initialize: function(options) {
-		var { table, scope, name } = options;
-		if(table) this.setSource(options.table, {scope, name});
+    initialize: function(appScope) {
+		if(!appScope) 
+			new LogUtils().write("Application scope is not received.", {type: "error", funcName: "initialize"});
+		
+		_appScope = appScope;
     },
 	
-	setSource: function(table, options){
-		var { scope, name } = options;
+	wrapScriptInclude: function(scriptPrototype, options = {}){
+		var {
+			table = "sys_script_include",
+			name = scriptPrototype.type,
+			sys_id = false
+		} = options;
 		
-		var sourceGr = new GlideRecord(table);
-		sourceGr.addQuery("name", name);
-		sourceGr.addQuery("sys_scope.scope", scope);
-		sourceGr.query();
-		if(sourceGr.next()){
-			_source = sourceGr;
-		}
-	},
-
-    wrapper: function(scopedClass){
-		Object.getOwnPropertyNames(scopedClass).forEach(function(f) {
-				if(Object.getOwnPropertyDescriptor(scopedClass,f).writable){
-					if (typeof scopedClass[f] === 'function') {
-						var old = scopedClass[f];
+		var sourceRecord = this.getSourceRecord(table, { name, sys_id });
+		
+		Object.getOwnPropertyNames(scriptPrototype).forEach(function(f) {
+				if(Object.getOwnPropertyDescriptor(scriptPrototype,f).writable){
+					if (typeof scriptPrototype[f] === 'function') {
+						var old = scriptPrototype[f];
 						var funcName = f.toString();
 						if(_source){
 							var sourceTable = _source.getTableName();
 							var sourceID = _source.getValue("sys_id");
 						}
-						scopedClass[f] = function() {
+						scriptPrototype[f] = function() {
+							functionName = Symbol(funcName);
 							var returnValue = false;
 							try{
 								if(old == undefined) throw new Error("Function: " + funcName + " does not exist");
 								returnValue =  old.apply(this, arguments);
 							}catch(err){
-								var func = funcName ? "Function: " + funcName : undefined;
 								var message = err.message ? "Message: " +err.message : undefined;
 								var line = err.lineNumber ? "Line: " + err.lineNumber : undefined;
 								
-								
 								var options = {
 									type: "error",
-									funcName: funcName
+									funcName: funcName,
+									lineNumber: line
 								};
-								new LogUtils().write("message", options);
+								new LogUtils().write(message, options);
 							}
 							
 							return returnValue;
@@ -62,6 +61,19 @@ ProcessorUtils.prototype = {
 				}
 			});
 	},
+	
+	getSourceRecord: function(table, options){
+		var { sys_id, name } = options;
+		
+		var sourceGr = new GlideRecord(table);
+		if(name) sourceGr.addQuery("name", name);
+		if(sys_id) sourceGr.addQuery("sys_id", sys_id);
+		sourceGr.addQuery("sys_scope.scope", _appScope);
+		sourceGr.query();
+		if(sourceGr.next()){
+			_source = sourceGr;
+		}
+	},
 
     type: 'ProcessorUtils'
 };]]></script>
diff --git a/c04afa629713111093a8337e6253af6d/update/sys_script_include_6cb35e7a975821105838bfb3f153aff3.xml b/c04afa629713111093a8337e6253af6d/update/sys_script_include_6cb35e7a975821105838bfb3f153aff3.xml
index ebf0a5f..c1dfb9c 100644
--- a/c04afa629713111093a8337e6253af6d/update/sys_script_include_6cb35e7a975821105838bfb3f153aff3.xml
+++ b/c04afa629713111093a8337e6253af6d/update/sys_script_include_6cb35e7a975821105838bfb3f153aff3.xml
@@ -14,14 +14,18 @@ QueueUtils.prototype = {
 
     writeToQueue: function(event, data){
 		gs.info('writer');
+		this.tester();
+		new LogUtils().write("finished function",{ type: "debug", funcName: "writeToQueue" });
     },
+	
+	tester: function(){
+		new LogUtils().write("tester",{ type: "debug", funcName: "tester" });
+	},
 
     type: 'QueueUtils'
 };
 
-
-new ProcessorUtils({table: "sys_script_include", scope: "x_355681_fa", name: "QueueUtils"})
-	.wrapper(QueueUtils.prototype);]]></script>
+new ProcessorUtils("x_355681_fa").wrapScriptInclude(QueueUtils.prototype);]]></script>
         <sys_class_name>sys_script_include</sys_class_name>
         <sys_created_by>admin</sys_created_by>
         <sys_created_on>2023-01-13 22:09:49</sys_created_on>
diff --git a/c04afa629713111093a8337e6253af6d/update/sys_ui_list_x_355681_fa_log_null.xml b/c04afa629713111093a8337e6253af6d/update/sys_ui_list_x_355681_fa_log_null.xml
index e4518ac..ccd6abd 100644
--- a/c04afa629713111093a8337e6253af6d/update/sys_ui_list_x_355681_fa_log_null.xml
+++ b/c04afa629713111093a8337e6253af6d/update/sys_ui_list_x_355681_fa_log_null.xml
@@ -2,18 +2,63 @@
     <sys_ui_list parent="" relationship="" sys_domain="global" table="x_355681_fa_log" version="2" view="">
         <sys_ui_list_element action="INSERT_OR_UPDATE">
             <average_value>false</average_value>
-            <element>sys_created_on</element>
-            <list_id display_value="x_355681_fa_log" element="NULL" name="x_355681_fa_log" parent="NULL" relationship="NULL" sys_domain="global" view="Default view">9a1af9369700211093a8337e6253af71</list_id>
+            <element>impacted_record</element>
+            <list_id display_value="x_355681_fa_log" element="NULL" name="x_355681_fa_log" parent="NULL" relationship="NULL" sys_domain="global" view="Default view">120c4307971021105838bfb3f153afe3</list_id>
             <max_value>false</max_value>
             <min_value>false</min_value>
             <position>0</position>
             <sum>false</sum>
             <sys_created_by>admin</sys_created_by>
-            <sys_created_on>2023-01-01 10:02:08</sys_created_on>
-            <sys_id>121af9369700211093a8337e6253af73</sys_id>
+            <sys_created_on>2023-01-14 20:54:17</sys_created_on>
+            <sys_id>1a0c4307971021105838bfb3f153afe4</sys_id>
             <sys_mod_count>0</sys_mod_count>
             <sys_updated_by>admin</sys_updated_by>
-            <sys_updated_on>2023-01-01 10:02:08</sys_updated_on>
+            <sys_updated_on>2023-01-14 20:54:17</sys_updated_on>
+        </sys_ui_list_element>
+        <sys_ui_list_element action="INSERT_OR_UPDATE">
+            <average_value>false</average_value>
+            <element>message</element>
+            <list_id display_value="x_355681_fa_log" element="NULL" name="x_355681_fa_log" parent="NULL" relationship="NULL" sys_domain="global" view="Default view">120c4307971021105838bfb3f153afe3</list_id>
+            <max_value>false</max_value>
+            <min_value>false</min_value>
+            <position>1</position>
+            <sum>false</sum>
+            <sys_created_by>admin</sys_created_by>
+            <sys_created_on>2023-01-14 20:54:17</sys_created_on>
+            <sys_id>de0c4307971021105838bfb3f153afe4</sys_id>
+            <sys_mod_count>0</sys_mod_count>
+            <sys_updated_by>admin</sys_updated_by>
+            <sys_updated_on>2023-01-14 20:54:17</sys_updated_on>
+        </sys_ui_list_element>
+        <sys_ui_list_element action="INSERT_OR_UPDATE">
+            <average_value>false</average_value>
+            <element>timestamp</element>
+            <list_id display_value="x_355681_fa_log" element="NULL" name="x_355681_fa_log" parent="NULL" relationship="NULL" sys_domain="global" view="Default view">120c4307971021105838bfb3f153afe3</list_id>
+            <max_value>false</max_value>
+            <min_value>false</min_value>
+            <position>2</position>
+            <sum>false</sum>
+            <sys_created_by>admin</sys_created_by>
+            <sys_created_on>2023-01-14 20:54:17</sys_created_on>
+            <sys_id>520c4307971021105838bfb3f153afe5</sys_id>
+            <sys_mod_count>0</sys_mod_count>
+            <sys_updated_by>admin</sys_updated_by>
+            <sys_updated_on>2023-01-14 20:54:17</sys_updated_on>
+        </sys_ui_list_element>
+        <sys_ui_list_element action="INSERT_OR_UPDATE">
+            <average_value>false</average_value>
+            <element>sys_created_on</element>
+            <list_id display_value="x_355681_fa_log" element="NULL" name="x_355681_fa_log" parent="NULL" relationship="NULL" sys_domain="global" view="Default view">120c4307971021105838bfb3f153afe3</list_id>
+            <max_value>false</max_value>
+            <min_value>false</min_value>
+            <position>3</position>
+            <sum>false</sum>
+            <sys_created_by>admin</sys_created_by>
+            <sys_created_on>2023-01-14 20:54:17</sys_created_on>
+            <sys_id>d20c4307971021105838bfb3f153afe5</sys_id>
+            <sys_mod_count>0</sys_mod_count>
+            <sys_updated_by>admin</sys_updated_by>
+            <sys_updated_on>2023-01-14 20:54:17</sys_updated_on>
         </sys_ui_list_element>
         <sys_ui_list action="INSERT_OR_UPDATE">
             <average_value>false</average_value>
@@ -27,10 +72,10 @@
             <sum>false</sum>
             <sys_class_name>sys_ui_list</sys_class_name>
             <sys_created_by>admin</sys_created_by>
-            <sys_created_on>2023-01-01 10:02:08</sys_created_on>
+            <sys_created_on>2023-01-14 20:54:17</sys_created_on>
             <sys_domain>global</sys_domain>
             <sys_domain_path>/</sys_domain_path>
-            <sys_id>9a1af9369700211093a8337e6253af71</sys_id>
+            <sys_id>120c4307971021105838bfb3f153afe3</sys_id>
             <sys_name>x_355681_fa_log</sys_name>
             <sys_package display_value="Fulfilment Automater" source="x_355681_fa">c04afa629713111093a8337e6253af6d</sys_package>
             <sys_policy/>