Changeset 6f203af for FarmatikoData

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:

FarmatikoData

Files:

• FarmatikoRepo/AdminRepo.cs (modified) (2 diffs)
• FarmatikoRepo/PHRepo.cs (modified) (3 diffs)
• FarmatikoRepo/Repository.cs (modified) (11 diffs)
• FarmatikoRepoInterfaces/IAdminRepo.cs (modified) (1 diff)
• FarmatikoRepoInterfaces/IPHRepo.cs (modified) (1 diff)
• FarmatikoRepoInterfaces/IRepository.cs (modified) (2 diffs)

FarmatikoData/FarmatikoRepo/AdminRepo.cs

@@ -1 +1 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -17 +18 @@
         }
 
-        public async Task<IQueryable<RequestPharmacyHead>> GetClaimingRequests()
+        public async Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests()
         {
-            var reqs = await Task.Run(() => _context.PHRequests.OrderBy(x => x.Head.Name));
+            var reqs = await _context.PHRequests.OrderBy(x => x.Head.Name).ToListAsync();
             return reqs;
         }
 
         //GET
-        public async Task<IQueryable<PharmacyHead>> GetPharmacyHeads()
+        public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeads()
         {
-            var PHeads = await Task.Run(() => _context.PharmacyHeads.OrderBy(x => x.Name));
+            var PHeads = await _context.PharmacyHeads.OrderBy(x => x.Name).ToListAsync();
             return PHeads;
         }
         //POST
-        public async Task RemoveClaimRequest(RequestPharmacyHead req)
+        public void RemoveClaimRequest(RequestPharmacyHead req)
         {
-            await Task.Run(() => _context.PHRequests.Remove(req));
-            await _context.SaveChangesAsync();
+            _context.PHRequests.Remove(req);
+            _context.SaveChanges();
         }
     }

FarmatikoData/FarmatikoRepo/PHRepo.cs

@@ -1 +1 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
-using System;
+using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
@@ -16 +15 @@
             _context = context;
         }
-
-        public async Task ClaimPharmacy(RequestPharmacyHead pharmacy)
+        //GET
+        public async Task<PharmacyHead> GetPharmacyHeadByIdAsync(int id)
         {
-            await Task.Run(() => _context.PHRequests.Add(pharmacy));
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task<PharmacyHead> GetPharmacyHead(PharmacyHead pharmacyHead)
-        {
-            var Phead = await Task.Run(() => _context.PharmacyHeads.Where(x => x.Email.Equals(pharmacyHead.Email)).FirstOrDefault());
+            var Phead = await _context.PharmacyHeads.Where(x => x.Id == id).FirstOrDefaultAsync();
             return Phead;
         }
 
-        public async Task<IQueryable<PharmacyHead>> GetPharmacyHeadInfo()
+        public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeadInfo()
         {
-            var PHeadInfo = await Task.Run(() => _context.PharmacyHeads.Take(10));
+            var PHeadInfo = await _context.PharmacyHeads.Take(10).Where(x => x.DeletedOn == null)
+                .Select(x => new PharmacyHead
+                {
+                    Id = x.Id,
+                    Name = x.Name,
+                    Email = x.Email,
+                    Password = x.Password,
+                    MedicineLists = x.MedicineLists,
+                    PharmaciesList = x.PharmaciesList
+                }).ToListAsync();
             return PHeadInfo;
         }
-
+        //POST
         public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead)
         {
-            var EditedPHead = await Task.Run(() => _context.PharmacyHeads.Where(x => x.Id == pharmacyHead.Id).FirstOrDefault());
+            var EditedPHead = await _context.PharmacyHeads.Where(x => x.Id == pharmacyHead.Id).FirstOrDefaultAsync();
             EditedPHead.Email = pharmacyHead.Email;
             EditedPHead.Name = pharmacyHead.Name;
@@ -45 +47 @@
             await _context.SaveChangesAsync();
         }
+        public async Task ClaimPharmacy(RequestPharmacyHead pharmacy)
+        {
+            await _context.PHRequests.AddAsync(pharmacy);
+            await _context.SaveChangesAsync();
+        }
+        public async Task Add(PharmacyHead pharmacyHead)
+        {
+            await _context.PharmacyHeads.AddAsync(pharmacyHead);
+            await _context.SaveChangesAsync();
+        }
+
+        public async Task Remove(PharmacyHead phead)
+        {
+            var Phead = await _context.PharmacyHeads.Where(x => x.Id == phead.Id).FirstOrDefaultAsync();
+            Phead.DeletedOn = phead.DeletedOn;
+            await _context.SaveChangesAsync();
+        }
+
+        public async Task RemoveClaimingRequest(int id)
+        {
+            var req = await _context.PHRequests.Where(r => r.Id == id).FirstOrDefaultAsync();
+            _context.PHRequests.Remove(req);
+            await _context.SaveChangesAsync();
+        }
     }
 }

FarmatikoData/FarmatikoRepo/Repository.cs

@@ -1 +1 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -14 +17 @@
         }
         //GET
-        public async Task<IQueryable<HealthcareWorker>> GetAllWorkers()
+        public async Task<IEnumerable<HealthcareWorker>> GetAllWorkers()
         {
             var Workers = await Task.Run(() => _context.HealthcareWorkers.Take(10));
@@ -20 +23 @@
         }
 
-        public async Task<IQueryable<HealthFacility>> GetFacilities()
+        public async Task<IEnumerable<HealthFacility>> GetFacilities()
         {
             var Facilities = await Task.Run(() => _context.HealthFacilities.Take(10));
@@ -38 +41 @@
         }
 
-        public async Task<IQueryable<Medicine>> GetMedicines()
+        public async Task<IEnumerable<Medicine>> GetMedicines()
         {
             var Medicines = await Task.Run(() => _context.Medicines.Take(10));
@@ -50 +53 @@
         }
 
-        public async Task<IQueryable<Pharmacy>> GetPharmacies()
+        public async Task<IEnumerable<Pharmacy>> GetPharmacies()
         {
             var Pharmacies = await Task.Run(() => _context.Pharmacies.Take(10));
@@ -68 +71 @@
         }
 
-        public async Task<IQueryable<HealthFacility>> SearchFacilities(string query)
+        public async Task<IEnumerable<HealthFacility>> SearchFacilities(string query)
         {
             var SearchQuery = await Task.Run(() => _context.HealthFacilities
@@ -77 +80 @@
         }
 
-        public async Task<IQueryable<Medicine>> SearchMedicines(string query)
+        public async Task<IEnumerable<Medicine>> SearchMedicines(string query)
         {
             var SearchQuery = await Task.Run(() => _context.Medicines
@@ -86 +89 @@
         }
 
-        public async Task<IQueryable<Pharmacy>> SearchPharmacies(string query)
+        public async Task<IEnumerable<Pharmacy>> SearchPharmacies(string query)
         {
             var SearchQuery = await Task.Run(() => _context.Pharmacies
@@ -95 +98 @@
         }
 
-        public async Task<IQueryable<HealthcareWorker>> SearchWorkers(string query)
+        public async Task<IEnumerable<HealthcareWorker>> SearchWorkers(string query)
         {
             var SearchQuery = await Task.Run(() => _context.HealthcareWorkers
@@ -184 +187 @@
             await _context.SaveChangesAsync();
         }
-        //ke vidime
+        //not impl
         public Task UpdateWorker(HealthcareWorker worker)
         {
@@ -205 +208 @@
         }
 
-        public async Task RemovePharmacyHead(PharmacyHead pharmacyHead)
-        {
-            var PHead = await Task.Run(() => _context.PharmacyHeads.Where(x => x.Id == pharmacyHead.Id).FirstOrDefault());
-            PHead.DeletedOn = pharmacyHead.DeletedOn;
+        public async Task RemovePharmacyHead(int Id)
+        {
+            var PHead = await _context.PharmacyHeads.Where(x => x.Id == Id).FirstOrDefaultAsync();
+            PHead.DeletedOn = DateTime.UtcNow;
             await _context.SaveChangesAsync();
         }

FarmatikoData/FarmatikoRepoInterfaces/IAdminRepo.cs

@@ -10 +10 @@
     public interface IAdminRepo
     {
-        Task<IQueryable<RequestPharmacyHead>> GetClaimingRequests();
-        Task<IQueryable<PharmacyHead>> GetPharmacyHeads();
-        Task RemoveClaimRequest(RequestPharmacyHead req);
+        Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests();
+        Task<IEnumerable<PharmacyHead>> GetPharmacyHeads();
+        void RemoveClaimRequest(RequestPharmacyHead req);
     }
 }

FarmatikoData/FarmatikoRepoInterfaces/IPHRepo.cs

@@ -11 +11 @@
     {
         Task ClaimPharmacy(RequestPharmacyHead pharmacy);
-        Task<PharmacyHead> GetPharmacyHead(PharmacyHead pharmacyHead);
-        Task<IQueryable<PharmacyHead>> GetPharmacyHeadInfo();
+        Task<IEnumerable<PharmacyHead>> GetPharmacyHeadInfo();
         Task UpdatePharmacyHead(PharmacyHead pharmacyHead);
+        Task<PharmacyHead> GetPharmacyHeadByIdAsync(int id);
+        Task Add(PharmacyHead pharmacyHead);
+        Task Remove(PharmacyHead phead);
+        Task RemoveClaimingRequest(int id);
     }
 }

FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs

@@ -11 +11 @@
     {
         //GET
-        Task<IQueryable<HealthcareWorker>> GetAllWorkers();
-        Task<IQueryable<HealthFacility>> GetFacilities();
+        Task<IEnumerable<HealthcareWorker>> GetAllWorkers();
+        Task<IEnumerable<HealthFacility>> GetFacilities();
         Task<HealthFacility> GetFacility(int Id);
         Task<Medicine> GetMedicine(int Id);
-        Task<IQueryable<Medicine>> GetMedicines();
+        Task<IEnumerable<Medicine>> GetMedicines();
         Task<Pandemic> GetPandemic();
-        Task<IQueryable<Pharmacy>> GetPharmacies();
+        Task<IEnumerable<Pharmacy>> GetPharmacies();
         Task<Pharmacy> GetPharmacy(int id);
         Task<HealthcareWorker> GetWorker(int id);
-        Task<IQueryable<HealthFacility>> SearchFacilities(string query);
-        Task<IQueryable<Medicine>> SearchMedicines(string query);
-        Task<IQueryable<Pharmacy>> SearchPharmacies(string query);
-        Task<IQueryable<HealthcareWorker>> SearchWorkers(string query);
+        Task<IEnumerable<HealthFacility>> SearchFacilities(string query);
+        Task<IEnumerable<Medicine>> SearchMedicines(string query);
+        Task<IEnumerable<Pharmacy>> SearchPharmacies(string query);
+        Task<IEnumerable<HealthcareWorker>> SearchWorkers(string query);
         Task<HealthFacility> GetFacilityJSON(string healthFacility);
 
@@ -40 +40 @@
         Task UpadatePharmacy(Pharmacy pharmacy);
         Task UpdateMedicine(Medicine medicine);
-        Task RemovePharmacyHead(PharmacyHead pharmacyHead);
+        Task RemovePharmacyHead(int Id);
     }
 }