Changeset a55ef91 for Farmatiko/Controllers

Timestamp:

07/31/20 10:15:02 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

d8fafb8

Parents:

4e72684

Message:

Update & add service

Location:

Farmatiko/Controllers

Files:

• HealthFacilitiesController.cs (modified) (2 diffs)
• HealthcareWorkerController.cs (modified) (2 diffs)
• MedicineController.cs (modified) (2 diffs)
• MedicineListController.cs (modified) (2 diffs)
• PandemicController.cs (modified) (2 diffs)
• PharmacyController.cs (modified) (2 diffs)
• PharmacyHeadController.cs (modified) (2 diffs)

Farmatiko/Controllers/HealthFacilitiesController.cs

@@ -1 +1 @@
 using FarmatikoData;
 using FarmatikoData.Models;
-using Microsoft.AspNetCore.Cors;
+using FarmatikoServices.FarmatikoServiceInterfaces;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
 
 namespace Farmatiko.Controllers
@@ -12 +19 @@
     {
         private IHealthFacilityService _healthFacilitiesService;
-        public HealthFacilitiesController(IHealthFacilityService healthFacilitiesService)
+        private IProcessJSONService _processJSONService;
+        /*private IProcessJSONService _processJSONService;*/
+        private string Path = @"C:\Users\dslez\Desktop\ustanovi.json";
+        public HealthFacilitiesController(IHealthFacilityService healthFacilitiesService, IProcessJSONService processJSONService)
         {
             _healthFacilitiesService = healthFacilitiesService;
+            _processJSONService = processJSONService;
         }
         [HttpGet]
-        public IEnumerable<HealthFacilities> Get()
+        public IQueryable<HealthFacilities> Get()
         {
             return _healthFacilitiesService.GetAll();
         }
+       /* public void Index()
+        
+        {
+            _processJSONService.GetProcessedHealthFacilitiesFromJSON();
+        }*/
     }
 }

Farmatiko/Controllers/HealthcareWorkerController.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Linq;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -20 +17 @@
 
         [HttpGet]
-        public IEnumerable<HealthcareWorkers> Get()
+        public IQueryable<HealthcareWorkers> Get()
         {
             return _healthcareWorkerService.GetAll();

Farmatiko/Controllers/MedicineController.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Linq;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -19 +16 @@
         }
         [HttpGet]
-        public IEnumerable<Medicine> Get()
+        public IQueryable<Medicine> Get()
         {
             return _medicineService.GetAll();
         }
+        /*[HttpPost]
+        public void Add(Medicine medicine)
+        {
+            _medicineService.Add(medicine);
+        }
+        [HttpPost]
+        public void Remove(string Medicine)
+        {
+            _medicineService.Remove(Medicine);
+        }
+        [HttpGet]
+        public IQueryable<Medicine> GetByName(string Name)
+        {
+            return _medicineService.GetByName(Name);
+        }
+        [HttpGet]
+        public IQueryable<Medicine> GetByManufacturer(string Manufacturer)
+        {
+            return _medicineService.GetByManufacturer(Manufacturer);
+        }*/
     }
 }

Farmatiko/Controllers/MedicineListController.cs

@@ -1 +1 @@
 using System.Collections.Generic;
+using System.Linq;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -16 +17 @@
         }
         [HttpGet]
-        public IEnumerable<MedicineList> Get()
+        public IQueryable<MedicineList> Get()
         {
             return _medicineListService.GetAll();
         }
+        [HttpGet]
+        public ICollection<MedicineList> GetByName(string Name)
+        {
+            return _medicineListService.GetByName(Name);
+        }
+        [HttpGet]
+        public ICollection<MedicineList> GetByManufacturer(string Manufacturer)
+        {
+            return _medicineListService.GetByManufacturer(Manufacturer);
+        }
+        /*[HttpPost]
+        public void SetHasMedicine(MedicineList medicineList, bool HasMedicine)
+        {
+            _medicineListService.SetHasMedicine(medicineList, HasMedicine);
+        }*/
+        [HttpPost]
+        public void Add(MedicineList medicineList)
+        {
+            _medicineListService.Add(medicineList);
+        }
+        [HttpPost]
+        public void Remove(MedicineList medicineList)
+        {
+            _medicineListService.Remove(medicineList);
+        }
     }
 }

Farmatiko/Controllers/PandemicController.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Linq;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -19 +16 @@
         }
         [HttpGet]
-        public IEnumerable<Pandemic> Get()
+        public IQueryable<Pandemic> Get()
         {
             return _pandemicService.GetAll();

Farmatiko/Controllers/PharmacyController.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -19 +17 @@
         }
         [HttpGet]
-        public IEnumerable<Pharmacy> Get()
+        public IQueryable<Pharmacy> Get()
         {
             return _pharmacyService.GetAll();
         }
+        [HttpGet]
+        public ICollection<Pharmacy> GetPharmacies()
+        {
+            return _pharmacyService.GetPharmacies();
+        }
+        [HttpPost]
+        public void UpdatePharmacy(Pharmacy pharmacy, string Name)
+        {
+            _pharmacyService.UpdatePharmacy(pharmacy,Name);
+        }
+        [HttpPost]
+        public void AddPharmacy(Pharmacy pharmacy)
+        {
+            _pharmacyService.Add(pharmacy);
+        }
+        [HttpPost]
+        public void RemovePharmacy(Pharmacy pharmacy)
+        {
+            _pharmacyService.Remove(pharmacy);
+        }
     }
 }

Farmatiko/Controllers/PharmacyHeadController.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Linq;
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
@@ -23 +20 @@
             return _pharmacyHeadRepository.GetAllPharmacies(NameOfPharmacy);
         }
+        [HttpGet]
+        public IQueryable<PharmacyHead> GetPharmacyByName(string Name)
+        {
+            return _pharmacyHeadRepository.GetPharmacyByName(Name);
+        }
+        [HttpGet]
+        public IQueryable<MedicineList> GetPharmacyMedicines(string NameOfPharmacy)
+        {
+            return _pharmacyHeadRepository.GetPharmacyMedicines(NameOfPharmacy);
+        }
+        [HttpPost]
+        public void Add(PharmacyHead pharmacyHead)
+        {
+            _pharmacyHeadRepository.Add(pharmacyHead);
+        }
+        [HttpPost]
+        public void Remove(PharmacyHead pharmacyHead, string Name)
+        {
+            _pharmacyHeadRepository.Remove(pharmacyHead, Name);
+        }
     }
 }