Make service program extension of program, and add parameter parent class

Author: jordiwes

pykit/Character.py

@@ -1,4 +1,5 @@
-class Character:
+import Parameter
+class Character(Parameter):
     """
     Object for IBM i Character.
     """
@@ -19,5 +20,5 @@ def __init__(self, name, length, value):
 
     def get_payload(self):
         self.payload['type'] = str(self.length) + 'a'
-        self.payload['value'] = self.value
+        Parameter.get_payload(self);
         return self.payload

pykit/Float.py

@@ -1,4 +1,5 @@
-class Float:
+import Parameter
+class Float(Parameter):
     """
     Object for IBM i Float.
     """
@@ -21,5 +22,5 @@ def __init__(self, name, length, precision, value):
 
     def get_payload(self):
         self.payload['type'] = str(self.length) + 'f' + str(self.precision)
-        self.payload['value'] = self.value
+        Parameter.get_payload(self);
         return self.payload

pykit/Integer.py

@@ -1,4 +1,5 @@
-class Integer:
+import Parameter
+class Integer(Parameter):
     """
     Object for IBM i Integer.
     """
@@ -20,5 +21,6 @@ def __init__(self, name, length, value, signed=True):
 
     def get_payload(self):
         self.payload['type'] = str(self.length) + ('i' if self.signed else 'u') + '0'
-        self.payload['value'] = self.value
+        Parameter.get_payload(self);
+        
         return self.payload

pykit/Parameter.py

@@ -0,0 +1,21 @@
+class Parameter:
+    """
+    Object for IBM i Parameters.
+    """
+    def __init__(self, name, value):
+        """
+        :param name:
+        :param value:
+        """
+        self.value = value
+        self.name = str(name)
+        self.isReturn = False
+        self.payload = {"name":self.name}
+            
+            
+    def get_payload(self):
+        self.payload['value'] = self.value
+        if self.isReturn:
+            self.payload['by'] = 'return'
+        
+        return self.payload

pykit/ServiceProgram.py

@@ -1,4 +1,6 @@
-class ServiceProgram:
+import Program
+
+class ServiceProgram(Program):
     """
     Object for calling an IBM i Program.
     """
@@ -10,20 +12,13 @@ def __init__(self, name, library='', function=''):
             "pgm": [{"name": name, "lib": library, "func": function}]
         }
 
-    def add_parameter(self, parameter):
+    def add_return(self, parameter):
         """
 
-        :param parameter: Parameter to be added
+        :param parameter: Return parameter to be added
         :return:
         """
+        parameter.isReturn = True
         self.parameters.append(parameter)
-
-    def get_payload(self):
-        if len(self.parameters) is 1:
-            self.payload["pgm"].append({"s": self.parameters[0].get_payload()})
-        else:
-            self.payload["pgm"].append({"s":[]})
-            for p in self.parameters:
-                self.payload["pgm"][-1]["s"].append(p.get_payload())
-
-        return self.payload
+        
+    

pykit/tests/test_service_program.py

@@ -7,14 +7,23 @@
 class TestServiceProgram(unittest.TestCase):
     def setUp(self):
         char = Character("char", 128, "Hi there")
+        char_return = Character("char", 128, "Hi back")
         self.hello_prog = ServiceProgram("HELLOSRV", "DB2JSON", "HELLO")
         self.hello_prog.add_parameter(char)
+        self.hello_prog_return = ServiceProgram("HELLOSRV", "DB2JSON", "HELLOAGAIN")
+        self.hello_prog_return.add_parameter(char)
+        self.hello_prog_return.add_return(char_return)
+        
 
     def test_hello(self):
         self.assertEqual(
             self.hello_prog.get_payload(),
             {"pgm":[{"name":"HELLOSRV",  "lib":"DB2JSON", "func": "HELLO"}, {"s":{"name":"char", "type":"128a", "value":"Hi there"}}]}
         )
+        self.assertEqual(
+            self.hello_prog_return.get_payload(),
+            {"pgm":[{"name":"HELLOSRV",  "lib":"DB2JSON", "func": "HELLOAGAIN"}, {"s":[{"name":"char", "type":"128a", "value":"Hi there"},{"name":"char", "type":"128a", "value":"Hi back", "by":"return"}]}]}
+        )
 
     def test_execute_hello_world(self):
         connection = connect(