Merge pull request #12 from NCAR/Additional-Routes-for-Front-End

Bug fixes and refactors due to database changes

Controllers/FamilyController.cs

@@ -35,7 +35,7 @@ public async Task<IReadOnlyList<Family>> Get()
 
         // POST api/Family/create
         [HttpPost("create")]
-        public async Task<Guid> Create([FromBody] string name)
+        public async Task<Family> Create([FromBody] string name)
         {
             return await familyService.CreateFamilyAsync(name);
         }

Controllers/FamilyMechListController.cs → Controllers/FamilyTagMechListController.cs

@@ -9,40 +9,40 @@ namespace Chemistry_Cafe_API.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
-    public class FamilyMechListController : ControllerBase
+    public class FamilyTagMechListController : ControllerBase
     {
-        private FamilyMechListService familyMechListService;
+        private FamilyTagMechListService familyMechListService;
 
         //Injects sql data source setup in Program.cs
-        public FamilyMechListController([FromServices] MySqlDataSource db)
+        public FamilyTagMechListController([FromServices] MySqlDataSource db)
         {
-            this.familyMechListService = new FamilyMechListService(db);
+            this.familyMechListService = new FamilyTagMechListService(db);
         }
 
         // GET: api/FamilyMechList/all
         [HttpGet("all")]
-        public async Task<IReadOnlyList<FamilyMechList>> Get()
+        public async Task<IReadOnlyList<FamilyTagMechList>> Get()
         {
             return await familyMechListService.GetFamilyMechListsAsync();
         }
 
         // GET api/FamilyMechList/5
         [HttpGet("{uuid}")]
-        public async Task<FamilyMechList?> Get(Guid uuid)
+        public async Task<FamilyTagMechList?> Get(Guid uuid)
         {
             return await familyMechListService.GetFamilyMechListAsync(uuid);
         }
 
         // POST api/FamilyMechList/create
         [HttpPost("create")]
-        public async Task<Guid> Create([FromBody] FamilyMechList newFamilyMechList)
+        public async Task<Guid> Create([FromBody] FamilyTagMechList newFamilyMechList)
         {
             return await familyMechListService.CreateFamilyMechListAsync(newFamilyMechList);
         }
 
         // PUT api/FamilyMechList/5
         [HttpPut("update")]
-        public async Task Put([FromBody] FamilyMechList newFamilyMechList)
+        public async Task Put([FromBody] FamilyTagMechList newFamilyMechList)
         {
             await familyMechListService.UpdateFamilyMechListAsync(newFamilyMechList);
         }

Controllers/FamilyMechListVersionController.cs → Controllers/FamilyTagMechListVersionController.cs

@@ -9,40 +9,40 @@ namespace Chemistry_Cafe_API.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
-    public class FamilyMechListVersionController : ControllerBase
+    public class FamilyTagMechListVersionController : ControllerBase
     {
-        private FamilyMechListVersionService familyMechListVersionService;
+        private FamilyTagMechListVersionService familyMechListVersionService;
 
         //Injects sql data source setup in Program.cs
-        public FamilyMechListVersionController([FromServices] MySqlDataSource db)
+        public FamilyTagMechListVersionController([FromServices] MySqlDataSource db)
         {
-            this.familyMechListVersionService = new FamilyMechListVersionService(db);
+            this.familyMechListVersionService = new FamilyTagMechListVersionService(db);
         }
 
         // GET: api/FamilyMechListVersion/all
         [HttpGet("all")]
-        public async Task<IReadOnlyList<FamilyMechListVersion>> Get()
+        public async Task<IReadOnlyList<FamilyTagMechListVersion>> Get()
         {
             return await familyMechListVersionService.GetFamilyMechListVersionsAsync();
         }
 
         // GET api/FamilyMechListVersion/5
         [HttpGet("{uuid}")]
-        public async Task<FamilyMechListVersion?> Get(Guid uuid)
+        public async Task<FamilyTagMechListVersion?> Get(Guid uuid)
         {
             return await familyMechListVersionService.GetFamilyMechListVersionAsync(uuid);
         }
 
         // POST api/FamilyMechListVersion/create
         [HttpPost("create")]
-        public async Task<Guid> Create([FromBody] FamilyMechListVersion newFamilyMechListVersion)
+        public async Task<Guid> Create([FromBody] FamilyTagMechListVersion newFamilyMechListVersion)
         {
             return await familyMechListVersionService.CreateFamilyMechListVersionAsync(newFamilyMechListVersion);
         }
 
         // PUT api/FamilyMechListVersion/5
         [HttpPut("update")]
-        public async Task Put([FromBody] FamilyMechListVersion newFamilyMechListVersion)
+        public async Task Put([FromBody] FamilyTagMechListVersion newFamilyMechListVersion)
         {
             await familyMechListVersionService.UpdateFamilyMechListVersionAsync(newFamilyMechListVersion);
         }

Controllers/OpenAtmosController.cs

@@ -21,9 +21,16 @@ public OpenAtmosController([FromServices] MySqlDataSource db)
 
         // GET: api/OpenAtmos/JSON
         [HttpGet("JSON/{tag_mechanism_uuid}")]
-        public async Task<string> Get(Guid tag_mechanism_uuid)
+        public async Task<string> GetJSON(Guid tag_mechanism_uuid)
         {
-            return await openAtmosService.Get(tag_mechanism_uuid);
+            return await openAtmosService.GetJSON(tag_mechanism_uuid);
+        }
+
+        // GET: api/OpenAtmos/YAML
+        [HttpGet("YAML/{tag_mechanism_uuid}")]
+        public async Task<string> GetYAML(Guid tag_mechanism_uuid)
+        {
+            return await openAtmosService.GetYAML(tag_mechanism_uuid);
         }
 
     }

Controllers/PropertyTypeController.cs

@@ -33,6 +33,13 @@ public async Task<IReadOnlyList<PropertyType>> Get()
             return await propertyTypeService.GetPropertyTypeAsync(uuid);
         }
 
+        // GET: api/PropertyType/Validation/uuid
+        [HttpGet("Validation/{validation}")]
+        public async Task<IReadOnlyList<PropertyType>> GetValidation(string validation)
+        {
+            return await propertyTypeService.GetPropertyTypeValidationAsync(validation);
+        }
+
         // POST api/PropertyType/create
         [HttpPost("create")]
         public async Task<Guid> Create([FromBody] PropertyType propertyType)

Controllers/ReactantProductListController.cs

@@ -57,14 +57,14 @@ public async Task Create([FromBody] ReactantProductList reactantProduct)
 
         // PUT api/ReactantProductList/5
         [HttpPut("update")]
-        public async Task Put([FromBody] ReactantProductList userpreferences)
+        public async Task Put([FromBody] ReactantProductList reactantProductList)
         {
-            await userpreferencesService.UpdateReactantProductListAsync(userpreferences);
+            await userpreferencesService.UpdateReactantProductListAsync(reactantProductList);
         }
 
-        // DELETE api/ReactantProductList/delete/5
-        [HttpDelete("delete/{uuid}")]
-        public async Task Delete(Guid uuid)
+        // DELETE api/ReactantProductList/delete  Body [reaction_product_uuid, species_uuid]
+        [HttpDelete("delete")]
+        public async Task Delete([FromBody]DeleteReactantProductList uuid)
         {
             await userpreferencesService.DeleteReactantProductListAsync(uuid);
         }

Controllers/ReactionController.cs

@@ -33,6 +33,13 @@ public async Task<IReadOnlyList<Reaction>> Get()
             return await reactionService.GetReactionAsync(uuid);
         }
 
+        // GET api/Reaction/String/5
+        [HttpGet("String/{uuid}")]
+        public async Task<String?> GetString(Guid uuid)
+        {
+            return await reactionService.GetReactionStringAsync(uuid);
+        }
+
         // GET api/Reaction/TagMechanism/5
         [HttpGet("TagMechanism/{tag_mechanism_uuid}")]
         public async Task<IReadOnlyList<Reaction>> GetTags(Guid tag_mechanism_uuid)