Changeset d23bf72 for Farmatiko/Controllers/FarmatikoController.cs

Timestamp:

11/05/20 06:57:35 (3 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

afc9a9a

Parents:

1f4846d

Message:

Add SystemService, Auth, fix a lil bugs :)

File:

• Farmatiko/Controllers/FarmatikoController.cs (modified) (6 diffs)

Farmatiko/Controllers/FarmatikoController.cs

@@ -11 +11 @@
     {
         private readonly IService _service;
-        public FarmatikoController(IService service)
+        private readonly IProcessJSONService _JSONservice;
+        public FarmatikoController(IService service, IProcessJSONService JSONservice)
         {
             _service = service;
+            _JSONservice = JSONservice;
         }
         // Workers
         //Get
+        [HttpGet]
+        [Route("api/getData")]
+        public void InsertData()
+        {
+            //_JSONservice.DownloadPharmaciesExcel();
+            //_JSONservice.GetProcessedHealthcareWorkersFromJSON();
+            //_JSONservice.GetProcessedHealthFacilitiesFromJSON();
+            //_JSONservice.GetProcessedMedicinesFromJSON();
+            //_JSONservice.GetProcessedPandemicsFromJSONApi();
+        }
         [HttpGet]
         [Route("api/workers")]
@@ -25 +37 @@
         }
         [HttpGet]
-        [Route("api/workers/search/{Query}")]
-        public async Task<IEnumerable<HealthcareWorker>> SearchWorkers(string Query)
+        [Route("api/workers/search/{query}")]
+        public async Task<IEnumerable<HealthcareWorker>> SearchWorkers([FromRoute]string query)
         {
-            return await _service.SearchWorkers(Query);
+            return await _service.SearchWorkers(query);
         }
         [HttpGet]
         [Route("api/workers/{id}")]
-        public async Task<HealthcareWorker> GetWorker(int Id)
+        public async Task<HealthcareWorker> GetWorker([FromRoute] int Id)
         {
             return await _service.GetWorker(Id);
@@ -48 +60 @@
         }
         [HttpGet]
-        [Route("api/facilities/search/{Query}")]
-        public async Task<IEnumerable<HealthFacility>> SearchFacilities(string Query)
+        [Route("api/facilities/search/{query}")]
+        public async Task<IEnumerable<HealthFacility>> SearchFacilities([FromRoute] string query)
         {
-            return await _service.SearchFacilities(Query);
+            return await _service.SearchFacilities(query);
         }
         [HttpGet]
-        [Route("api/facilities/{Id}")]
-        public async Task<HealthFacility> GetFacility(int Id)
+        [Route("api/facilities/{id}")]
+        public async Task<HealthFacility> GetFacility([FromRoute] int id)
         {
-            return await _service.GetFacility(Id);
+            return await _service.GetFacility(id);
         }
         //Post
@@ -70 +82 @@
         }
         [HttpGet]
-        [Route("api/medicines/search/{Query}")]
-        public async Task<IEnumerable<Medicine>> SearchMedicines(string Query)
+        [Route("api/medicines/search/{query}")]
+        public async Task<IEnumerable<Medicine>> SearchMedicines([FromRoute] string query)
         {
-            return await _service.SearchMedicines(Query);
+            return await _service.SearchMedicines(query);
         }
         [HttpGet]
         [Route("api/medicines/{Id}")]
-        public async Task<Medicine> GetMedicine(int Id)
+        public async Task<Medicine> GetMedicine([FromRoute] int Id)
         {
             return await _service.GetMedicine(Id);
@@ -98 +110 @@
         [HttpGet]
         [Route("api/pharmacy/search/{Query}")]
-        public async Task<IEnumerable<Pharmacy>> SearchPharmacies(string Query)
+        public async Task<IEnumerable<Pharmacy>> SearchPharmacies([FromRoute] string Query)
         {
             return await _service.SearchPharmacies(Query);
@@ -104 +116 @@
         [HttpGet]
         [Route("api/pharmacy/{Id}")]
-        public async Task<Pharmacy> GetPharmacy(int Id)
+        public async Task<Pharmacy> GetPharmacy([FromRoute] int Id)
         {
             return await _service.GetPharmacy(Id);