Changeset 6f203af for Farmatiko/Controllers/FarmatikoController.cs

Timestamp:

10/28/20 22:06:48 (3 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

993189e

Parents:

1454207

Message:

Change methods & add error controller

File:

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

Farmatiko/Controllers/FarmatikoController.cs

@@ -1 @@
-using System.Linq;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using FarmatikoData.Models;
@@ -8 +8 @@
 {
     [ApiController]
-    [Route("api/[action]")]
     public class FarmatikoController : Controller
     {
@@ -19 +18 @@
         //Get
         [HttpGet]
-        [Route("/api/workers")]
-        public async Task<IQueryable<HealthcareWorker>> GetWorkers()
+        [Route("api/workers")]
+        public async Task<IEnumerable<HealthcareWorker>> GetWorkers()
         {
             var Workers =  await _service.GetAllWorkers();
@@ -26 +25 @@
         }
         [HttpGet]
-        [Route("/api/workers/search/{Query}")]
-        public async Task<IQueryable<HealthcareWorker>> SearchWorkers(string Query)
+        [Route("api/workers/search/{Query}")]
+        public async Task<IEnumerable<HealthcareWorker>> SearchWorkers(string Query)
         {
             return await _service.SearchWorkers(Query);
         }
         [HttpGet]
-        [Route("/api/workers/{id}")]
+        [Route("api/workers/{id}")]
         public async Task<HealthcareWorker> GetWorker(int Id)
         {
@@ -43 +42 @@
         //Get
         [HttpGet]
-        [Route("/api/facilities")]
-        public async Task<IQueryable<HealthFacility>> GetFacilities()
+        [Route("api/facilities")]
+        public async Task<IEnumerable<HealthFacility>> GetFacilities()
         {
             return await _service.GetFacilities();
         }
         [HttpGet]
-        [Route("/api/facilities/search/{Query}")]
-        public async Task<IQueryable<HealthFacility>> SearchFacilities(string Query)
+        [Route("api/facilities/search/{Query}")]
+        public async Task<IEnumerable<HealthFacility>> SearchFacilities(string Query)
         {
             return await _service.SearchFacilities(Query);
         }
         [HttpGet]
-        [Route("/api/facilities/{Id}")]
+        [Route("api/facilities/{Id}")]
         public async Task<HealthFacility> GetFacility(int Id)
         {
@@ -65 +64 @@
         //Get
         [HttpGet]
-        [Route("/api/medicines")]
-        public async Task<IQueryable<Medicine>> GetMedicines()
+        [Route("api/medicines")]
+        public async Task<IEnumerable<Medicine>> GetMedicines()
         {
             return await _service.GetMedicines();
         }
         [HttpGet]
-        [Route("/api/medicines/search/{Query}")]
-        public async Task<IQueryable<Medicine>> SearchMedicines(string Query)
+        [Route("api/medicines/search/{Query}")]
+        public async Task<IEnumerable<Medicine>> SearchMedicines(string Query)
         {
             return await _service.SearchMedicines(Query);
         }
         [HttpGet]
-        [Route("/api/medicines/{Id}")]
+        [Route("api/medicines/{Id}")]
         public async Task<Medicine> GetMedicine(int Id)
         {
             return await _service.GetMedicine(Id);
         }
-        //POST
-
         //Pandemic
         [HttpGet]
-        [Route("/api/pandemic")]
+        [Route("api/pandemic")]
         public async Task<Pandemic> GetPandemic()
         {
@@ -94 +91 @@
         //GET
         [HttpGet]
-        [Route("/api/pharmacy")]
-        public async Task<IQueryable<Pharmacy>> GetPharmacies()
+        [Route("api/pharmacy")]
+        public async Task<IEnumerable<Pharmacy>> GetPharmacies()
         {
             return await _service.GetPharmacies();
         }
         [HttpGet]
-        [Route("/api/pharmacy/search/{Query}")]
-        public async Task<IQueryable<Pharmacy>> SearchPharmacies(string Query)
+        [Route("api/pharmacy/search/{Query}")]
+        public async Task<IEnumerable<Pharmacy>> SearchPharmacies(string Query)
         {
             return await _service.SearchPharmacies(Query);
         }
         [HttpGet]
-        [Route("/api/pharmacy/{Id}")]
+        [Route("api/pharmacy/{Id}")]
         public async Task<Pharmacy> GetPharmacy(int Id)
         {