Changeset 1454207 for Farmatiko

Timestamp:

10/01/20 03:17:09 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

6f203af

Parents:

5d02859

Message:

Change structure, Add repo, services & controllers

Location:

Farmatiko

Files:

• ClientApp/src/app/admin/admin.component.ts (modified) (1 diff)
• Controllers/AdminController.cs (added)
• Controllers/FarmatikoController.cs (modified) (5 diffs)
• Controllers/PharmacyHeadController.cs (modified) (2 diffs)
• Controllers/SystemController.cs (added)
• appsettings.json (modified) (1 diff)

Farmatiko/ClientApp/src/app/admin/admin.component.ts

@@ -123 +123 @@
     this.dataService.updatePharmacyHead(req.PharmacyHead)
         .subscribe(() => {
-          
+          this.rejectRequest(req);
         },
         (err: any) => console.log(err),

Farmatiko/Controllers/FarmatikoController.cs

@@ -20 +20 @@
         [HttpGet]
         [Route("/api/workers")]
-        public async Task<IQueryable<HealthcareWorkers>> GetWorkers()
+        public async Task<IQueryable<HealthcareWorker>> GetWorkers()
         {
-            return await _service.GetAllWorkers();
+            var Workers =  await _service.GetAllWorkers();
+            return Workers;
         }
         [HttpGet]
         [Route("/api/workers/search/{Query}")]
-        public async Task<IQueryable<HealthcareWorkers>> SearchWorkers(string Query)
+        public async Task<IQueryable<HealthcareWorker>> SearchWorkers(string Query)
         {
             return await _service.SearchWorkers(Query);
@@ -32 +33 @@
         [HttpGet]
         [Route("/api/workers/{id}")]
-        public async Task<HealthcareWorkers> GetWorker(int Id)
+        public async Task<HealthcareWorker> GetWorker(int Id)
         {
             return await _service.GetWorker(Id);
@@ -43 +44 @@
         [HttpGet]
         [Route("/api/facilities")]
-        public async Task<IQueryable<HealthFacilities>> GetFacilities()
+        public async Task<IQueryable<HealthFacility>> GetFacilities()
         {
             return await _service.GetFacilities();
@@ -49 +50 @@
         [HttpGet]
         [Route("/api/facilities/search/{Query}")]
-        public async Task<IQueryable<HealthFacilities>> SearchFacilities(string Query)
+        public async Task<IQueryable<HealthFacility>> SearchFacilities(string Query)
         {
             return await _service.SearchFacilities(Query);
@@ -55 +56 @@
         [HttpGet]
         [Route("/api/facilities/{Id}")]
-        public async Task<HealthFacilities> GetFacility(int Id)
+        public async Task<HealthFacility> GetFacility(int Id)
         {
             return await _service.GetFacility(Id);

Farmatiko/Controllers/PharmacyHeadController.cs

@@ -1 +1 @@
 using System.Linq;
+using System.Threading.Tasks;
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
+using FarmatikoServices.FarmatikoServiceInterfaces;
 using Microsoft.AspNetCore.Mvc;
 
@@ -10 +12 @@
     public class PharmacyHeadController : Controller
     {
-        private readonly IPharmacyHeadRepository _pharmacyHeadRepository;
-        public PharmacyHeadController(IPharmacyHeadRepository pharmacyHeadRepository)
+        private readonly IPHService _PHService;
+        public PharmacyHeadController(IPHService PHService)
         {
-            _pharmacyHeadRepository = pharmacyHeadRepository;
+            _PHService = PHService;
         }
+        
+        //GET
+        //Mi trebaat rutite
         [HttpGet]
-        public IQueryable<PharmacyHead> GetAllPharmacies(string NameOfPharmacy)
+        public async Task<IQueryable<PharmacyHead>> GetPharmacyHeadInfo(string Token)
         {
-            return _pharmacyHeadRepository.GetAllPharmacies(NameOfPharmacy);
+            return await _PHService.GetPharmacyHeadInfo(Token);
         }
-        [HttpGet]
-        public IQueryable<PharmacyHead> GetPharmacyByName(string Name)
+        //POST
+        [HttpPost]
+        public async Task<int> Login(PharmacyHead pharmacyHead)
         {
-            return _pharmacyHeadRepository.GetPharmacyByName(Name);
-        }
-        [HttpGet]
-        public IQueryable<MedicineList> GetPharmacyMedicines(string NameOfPharmacy)
-        {
-            return _pharmacyHeadRepository.GetPharmacyMedicines(NameOfPharmacy);
+            return await _PHService.Login(pharmacyHead);
         }
         [HttpPost]
-        public void Add(PharmacyHead pharmacyHead)
+        public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead)
         {
-            _pharmacyHeadRepository.Add(pharmacyHead);
+            await _PHService.UpdatePharmacyHead(pharmacyHead);
         }
         [HttpPost]
-        public void Remove(PharmacyHead pharmacyHead)
+        public async Task<IActionResult> ClaimPharmacy(RequestPharmacyHead pharmacy)
         {
-            _pharmacyHeadRepository.Remove(pharmacyHead);
+            await _PHService.ClaimPharmacy(pharmacy);
+            return Ok();
         }
+        
     }
 }

Farmatiko/appsettings.json

@@ -10 +10 @@
     }
   },
+  "EPPlus": {
+    "ExcelPackage": {
+      "LicenseContext": "NonCommercial" 
+    }
+  },
   "AllowedHosts": "*"
 }