Changeset 6f203af for FarmatikoServices

Timestamp:

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

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

993189e

Parents:

1454207

Message:

Change methods & add error controller

Location:

FarmatikoServices

Files:

• FarmatikoServiceInterfaces/IAdminService.cs (modified) (1 diff)
• FarmatikoServiceInterfaces/IPHService.cs (modified) (1 diff)
• FarmatikoServiceInterfaces/IService.cs (modified) (3 diffs)
• FarmatikoServices.csproj (modified) (1 diff)
• Services/AdminService.cs (modified) (2 diffs)
• Services/PHService.cs (modified) (2 diffs)
• Services/ProcessJSONService.cs (modified) (1 diff)
• Services/Service.cs (modified) (10 diffs)

FarmatikoServices/FarmatikoServiceInterfaces/IAdminService.cs

@@ -10 +10 @@
     public interface IAdminService
     {
-        Task<IQueryable<PharmacyHead>> GetPharmacyHeads();
-        Task<IQueryable<RequestPharmacyHead>> GetCalimingRequests();
-        Task RejectRequest(RequestPharmacyHead req);
+        Task<IEnumerable<PharmacyHead>> GetPharmacyHeads();
+        Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests();
+        bool RejectRequest(RequestPharmacyHead req);
     }
 }

FarmatikoServices/FarmatikoServiceInterfaces/IPHService.cs

@@ -10 +10 @@
     public interface IPHService
     {
-        Task<IQueryable<PharmacyHead>> GetPharmacyHeadInfo(string Token);
+        Task<IEnumerable<PharmacyHead>> GetPharmacyHeadInfo(string Token);
         Task UpdatePharmacyHead(PharmacyHead pharmacyHead);
         Task<int> Login(PharmacyHead pharmacyHead);
-        Task ClaimPharmacy(RequestPharmacyHead pharmacy);
+        Task<bool> ClaimPharmacy(RequestPharmacyHead pharmacy);
+        Task<PharmacyHead> GetPharmacyHeadByIdAsync(int id);
+        Task<bool> Add(PharmacyHead pharmacyHead);
+        Task<bool> Remove(int id);
+        Task<bool> RemoveClaimingRequest(int id);
     }
 }

FarmatikoServices/FarmatikoServiceInterfaces/IService.cs

@@ -1 +1 @@
 using FarmatikoData.Models;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -8 +9 @@
     {
         //GET
-        Task<IQueryable<HealthcareWorker>> GetAllWorkers();
-        Task<IQueryable<HealthcareWorker>> SearchWorkers(string query);
+        Task<IEnumerable<HealthcareWorker>> GetAllWorkers();
+        Task<IEnumerable<HealthcareWorker>> SearchWorkers(string query);
         Task<HealthcareWorker> GetWorker(int id);
-        Task<IQueryable<HealthFacility>> GetFacilities();
-        Task<IQueryable<HealthFacility>> SearchFacilities(string query);
+        Task<IEnumerable<HealthFacility>> GetFacilities();
+        Task<IEnumerable<HealthFacility>> SearchFacilities(string query);
         Task<HealthFacility> GetFacility(int id);
         Task<HealthFacility> GetFacilityJSON(string healthFacility);
         Task<Medicine> GetMedicine(int id);
-        Task<IQueryable<Medicine>> SearchMedicines(string query);
-        Task<IQueryable<Medicine>> GetMedicines();
+        Task<IEnumerable<Medicine>> SearchMedicines(string query);
+        Task<IEnumerable<Medicine>> GetMedicines();
         Task<Pandemic> GetPandemic();
-        Task<IQueryable<Pharmacy>> GetPharmacies();
-        Task<IQueryable<Pharmacy>> SearchPharmacies(string query);
+        Task<IEnumerable<Pharmacy>> GetPharmacies();
+        Task<IEnumerable<Pharmacy>> SearchPharmacies(string query);
         Task<Pharmacy> GetPharmacy(int id);
         //POST
@@ -31 +32 @@
         Task UpdateFacility(HealthFacility healthFacilities);
         Task RemoveMedicine(Medicine medicine);
-        Task RemovePharmacyHead(PharmacyHead pharmacyHead);
+        Task RemovePharmacyHead(int Id);
         Task UpdatePandemic(Pandemic pandemic);
         Task RemovePharmacy(Pharmacy pharmacy);

FarmatikoServices/FarmatikoServices.csproj

@@ -6 +6 @@
 
   <ItemGroup>
+    <PackageReference Include="EPPlus" Version="5.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="RestSharp" Version="106.11.4" />

FarmatikoServices/Services/AdminService.cs

@@ -5 +5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
@@ -18 +17 @@
         }
 
-        public async Task<IQueryable<RequestPharmacyHead>> GetCalimingRequests()
+        public async Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests()
         {
-            var req = await Task.Run(() => _adminRepo.GetClaimingRequests());
-            return req;
+            var req = await _adminRepo.GetClaimingRequests();
+            if (req != null)
+                return req;
+            throw new Exception("No data is found.");
         }
 
-        public async Task<IQueryable<PharmacyHead>> GetPharmacyHeads()
+        public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeads()
         {
-            var PHeads = await Task.Run(() => _adminRepo.GetPharmacyHeads());
-            return PHeads;
+            var PHeads = await _adminRepo.GetPharmacyHeads();
+            var list = PHeads.Select(x => x.DeletedOn == null);
+            if (list != null)
+            {
+                return PHeads;
+            }
+            throw new Exception("No data is found.");
         }
 
-        public async Task RejectRequest(RequestPharmacyHead req)
+        public bool RejectRequest(RequestPharmacyHead req)
         {
-            await _adminRepo.RemoveClaimRequest(req);
+            if (req != null)
+            {
+                _adminRepo.RemoveClaimRequest(req);
+                return true;
+            }
+            return false;
         }
     }

FarmatikoServices/Services/PHService.cs

@@ -18 +18 @@
         }
 
-        public async Task ClaimPharmacy(RequestPharmacyHead pharmacy)
+        public async Task<bool> ClaimPharmacy(RequestPharmacyHead pharmacy)
         {
-            await _iPHRepo.ClaimPharmacy(pharmacy);
+            if (pharmacy != null)
+            {
+                await _iPHRepo.ClaimPharmacy(pharmacy);
+                return true;
+            }
+            return false;
         }
 
-        public Task<IQueryable<PharmacyHead>> GetPharmacyHeadInfo(string Token)
+        public async Task<PharmacyHead> GetPharmacyHeadByIdAsync(int id)
         {
-            throw new NotImplementedException();
+            PharmacyHead Phead = null;
+            if (id >= 0)
+                Phead = await _iPHRepo.GetPharmacyHeadByIdAsync(id);
+            if (Phead != null)
+                return Phead;
+            throw new Exception("No data found.");
+        }
+
+        public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeadInfo(string Token)
+        {
+            var PHeads = await _iPHRepo.GetPharmacyHeadInfo();
+            if (PHeads != null)
+                return PHeads;
+            throw new Exception("No Pharmacy heads found.");
         }
 
         public async Task<int> Login(PharmacyHead pharmacyHead)
         {
-            var PHead = await Task.Run(() => _iPHRepo.GetPharmacyHead(pharmacyHead));
+            var PHead = await _iPHRepo.GetPharmacyHeadByIdAsync(pharmacyHead.Id);
             if (PHead.Password.Equals(pharmacyHead.Password))
                 return PHead.Id;
@@ -43 +61 @@
             else throw new Exception("PharmacyHead has a null value.");
         }
+        public async Task<bool> Add(PharmacyHead pharmacyHead)
+        {
+            if (pharmacyHead != null)
+            {
+                await _iPHRepo.Add(pharmacyHead);
+                return true;
+            }
+            return false;
+        }
+
+        public async Task<bool> Remove(int id)
+        {
+            PharmacyHead Phead = await _iPHRepo.GetPharmacyHeadByIdAsync(id);
+            if (Phead != null && id >= 0)
+            {
+                Phead.DeletedOn = DateTime.UtcNow;
+                await _iPHRepo.Remove(Phead);
+                return true;
+            }
+            return false;
+        }
+
+        public async Task<bool> RemoveClaimingRequest(int id)
+        {
+            if (id >= 0)
+            {
+                await _iPHRepo.RemoveClaimingRequest(id);
+                return true;
+            }
+            return false;
+        }
     }
 }

FarmatikoServices/Services/ProcessJSONService.cs

@@ -29 +29 @@
         public async Task<Medicine> ReadPharmaciesFromExcel()
         {
-            var client = new WebClient();
-            string Path = client.DownloadString(@"C:\Users\dslez\Desktop\apteki-fzo.xlsx");
-            using (var package = new ExcelPackage(new FileInfo(Path)))
-            {
-                var Sheet = package.Workbook.Worksheets[1];
-                for (int i = 2; i < Sheet.Dimension.End.Row; ++i)
-                {
-                    Pharmacy pharmacy = new Pharmacy()
+            try
+            {
+                var client = new WebClient();
+                string Path = client.DownloadString(@"C:\Users\dslez\Desktop\apteki-fzo.xlsx");
+                using (var package = new ExcelPackage(new FileInfo(Path)))
+                {
+                    var Sheet = package.Workbook.Worksheets[1];
+                    for (int i = 2; i < Sheet.Dimension.End.Row; ++i)
                     {
-                        Name = Sheet.Cells[i, 2].Value.ToString(),
-                        Address = Sheet.Cells[i, 3].Value.ToString(),
-                        Location = Sheet.Cells[i, 4].Value.ToString(),
-                        WorkAllTime = false
-                    };
-                    await _service.AddPharmacy(pharmacy);
-                }
+                        Pharmacy pharmacy = new Pharmacy()
+                        {
+                            Name = Sheet.Cells[i, 2].Value.ToString(),
+                            Address = Sheet.Cells[i, 3].Value.ToString(),
+                            Location = Sheet.Cells[i, 4].Value.ToString(),
+                            WorkAllTime = false
+                        };
+                        await _service.AddPharmacy(pharmacy);
+                    }
+                }
+
+            }
+            catch(Exception e)
+            {
+                _logger.LogInformation(e.Message);
+                throw new Exception("Cannot process Medicines from Excel.");
             }
             return null;

FarmatikoServices/Services/Service.cs

@@ -3 +3 @@
 using FarmatikoServices.FarmatikoServiceInterfaces;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -17 +18 @@
 
         //GET
-        public async Task<IQueryable<HealthcareWorker>> GetAllWorkers()
+        public async Task<IEnumerable<HealthcareWorker>> GetAllWorkers()
         {
             var Workers = await _repository.GetAllWorkers();
@@ -23 +24 @@
         }
 
-        public async Task<IQueryable<HealthFacility>> GetFacilities()
+        public async Task<IEnumerable<HealthFacility>> GetFacilities()
         {
             var Facilities = await _repository.GetFacilities();
@@ -41 +42 @@
         }
 
-        public async Task<IQueryable<Medicine>> GetMedicines()
+        public async Task<IEnumerable<Medicine>> GetMedicines()
         {
             var Medicines = await _repository.GetMedicines();
@@ -53 +54 @@
         }
 
-        public async Task<IQueryable<Pharmacy>> GetPharmacies()
+        public async Task<IEnumerable<Pharmacy>> GetPharmacies()
         {
             var Pharmacies = await _repository.GetPharmacies();
@@ -71 +72 @@
         }
 
-        public async Task<IQueryable<HealthFacility>> SearchFacilities(string query)
+        public async Task<IEnumerable<HealthFacility>> SearchFacilities(string query)
         {
             var SearchQuery = await _repository.SearchFacilities(query);
@@ -77 +78 @@
         }
 
-        public async Task<IQueryable<Medicine>> SearchMedicines(string query)
+        public async Task<IEnumerable<Medicine>> SearchMedicines(string query)
         {
             var SearchQuery = await _repository.SearchMedicines(query);
@@ -83 +84 @@
         }
 
-        public async Task<IQueryable<Pharmacy>> SearchPharmacies(string query)
+        public async Task<IEnumerable<Pharmacy>> SearchPharmacies(string query)
         {
             var SearchQuery = await _repository.SearchPharmacies(query);
@@ -89 +90 @@
         }
 
-        public async Task<IQueryable<HealthcareWorker>> SearchWorkers(string query)
+        public async Task<IEnumerable<HealthcareWorker>> SearchWorkers(string query)
         {
             var SearchQuery = await _repository.SearchWorkers(query);
@@ -202 +203 @@
         }
 
-        public async Task RemovePharmacyHead(PharmacyHead pharmacyHead)
-        {
-            if (pharmacyHead != null)
+        public async Task RemovePharmacyHead(int Id)
+        {
+            if (Id > 0)
             {
-                pharmacyHead.DeletedOn = DateTime.UtcNow;
-                await _repository.RemovePharmacyHead(pharmacyHead);
+                await _repository.RemovePharmacyHead(Id);
             }
-            else throw new Exception("PharmacyHead is null.");
+            throw new Exception("Index out of bounds.");
         }