bugfixes

Author: Tom Reitz

lightbeam/api.py

@@ -375,13 +375,13 @@ def get_all_params_from_swagger(self, swagger, definition, prefix=""):
             if "$ref" in schema["properties"][prop].keys():
                 params[prop_name] = {}
                 sub_definition = schema["properties"][prop]["$ref"]
-                sub_params = self.get_all_params_from_swagger(swagger, sub_definition, prefix=prop+"_")
+                sub_params = self.get_all_params_from_swagger(swagger, sub_definition, prefix=prefix+prop+"_")
                 for k,v in sub_params.items():
                     params[prop_name][k] = v
             elif schema["properties"][prop]["type"]!="array":
                 params[prop_name] = f"[{schema['properties'][prop]['type']}]" + prefix + prop
             else:
-                params[prop_name] = [self.get_all_params_from_swagger(swagger, schema["properties"][prop]["items"]["$ref"], prefix=prop+"_")]
+                params[prop_name] = [self.get_all_params_from_swagger(swagger, schema["properties"][prop]["items"]["$ref"], prefix=prefix+prop+"-")]
         return params
 
     def get_identity_params_from_swagger(self, swagger, definition, prefix=""):

lightbeam/create.py

@@ -92,7 +92,7 @@ def create_jsont(self, endpoint):
         # for loops over arrays:
         content = re.sub('"(.*)": \[', r'"\1": [ {% for item in \1 %}', content)
         content = re.sub('\]', r'{% endfor %} ]', content)
-        content = re.sub('{{(.*)_(.*)}}', r'{{item.\2}}', content)
+        content = re.sub('{{(.*)-(.*)}}', r'{{item.\2}}', content)
         # add info header message:
         content = """{#
   This is an earthmover JSON template file, generated with `lightbeam create`, for creating Ed-Fi JSON `"""+endpoint+"""`