Removed extraneous parts in OpenAtmos JSON

Made the reactants and products in the reaction part of the JSON only show up if there are any.
NCAR · Apr 9, 2024 · a4fab65 · a4fab65
1 parent e734b66
commit a4fab65
Showing 1 changed file with 27 additions and 13 deletions.
diff --git a/Services/OpenAtmosService.cs b/Services/OpenAtmosService.cs
@@ -116,26 +116,40 @@ public async Task<string> Get(Guid tag_mechanism_uuid)
                     JSON += ", \n";
                 }
                 var reactants = reactantProductListService.GetReactantsAsync(reaction.reactant_list_uuid).Result;
-                JSON += "      \"reactants\": [ \n" +
-                    "        {\n";
-                foreach (ReactantsProducts reactant in reactants)
+                if(reactants.Count != 0)
                 {
-                    JSON += "          \"species name\": \"" + reactant.type + "\", \n";
-                    JSON += "          \"coefficient\": \"" + reactant.quantity + "\" \n";
+                    JSON += "      \"reactants\": [ \n" +
+                    "        {\n";
+                    foreach (ReactantsProducts reactant in reactants)
+                    {
+                        JSON += "          \"species name\": \"" + reactant.type + "\", \n";
+                        JSON += "          \"coefficient\": \"" + reactant.quantity + "\" \n";
+                    }
+                    JSON += "        }\n" +
+                        "      ], \n";
                 }
-                JSON += "        }\n" +
-                    "      ], \n";
 
                 var products = reactantProductListService.GetProductsAsync(reaction.product_list_uuid).Result;
-                JSON += "      \"products\": [ \n" +
+
+                if(products.Count != 0)
+                {
+                    JSON += "      \"products\": [ \n" +
                     "        {\n";
-                foreach (ReactantsProducts product in products)
+                    foreach (ReactantsProducts product in products)
+                    {
+                        JSON += "          \"species name\": \"" + product.type + "\", \n";
+                        JSON += "          \"coefficient\": \"" + product.quantity + "\" \n";
+                    }
+                    JSON += "        }\n" +
+                        "      ]\n";
+                }
+
+                if(reactants.Count == 0 && products.Count == 0)
                 {
-                    JSON += "          \"species name\": \"" + product.type + "\", \n";
-                    JSON += "          \"coefficient\": \"" + product.quantity + "\" \n";
+                    JSON = JSON.Remove(JSON.LastIndexOf(','));
+                    JSON += "\n";
                 }
-                JSON += "        }\n" +
-                    "      ]\n";
+
                 JSON += "    },\n";
             }
             JSON = JSON.Remove(JSON.LastIndexOf(','));