Changeset 4e72684 for FarmatikoData

Timestamp:

07/29/20 20:02:58 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

a55ef91

Parents:

de18858

Message:

Add services

Location:

FarmatikoData

Files:

• FarmatikoRepo/MedicineListRepository.cs (modified) (3 diffs)
• FarmatikoRepo/MedicineRepository.cs (modified) (4 diffs)
• FarmatikoRepo/PharmacyHeadRepository.cs (modified) (1 diff)
• FarmatikoRepo/PharmacyRepository.cs (modified) (1 diff)
• FarmatikoRepoInterfaces/IMedicineListRepository.cs (modified) (3 diffs)
• FarmatikoRepoInterfaces/IPharmacyHeadRepository.cs (modified) (2 diffs)
• FarmatikoRepoInterfaces/IPharmacyRepository.cs (modified) (1 diff)
• Models/Pandemic.cs (modified) (2 diffs)

FarmatikoData/FarmatikoRepo/MedicineListRepository.cs

@@ -1 +1 @@
 using FarmatikoData.Models;
-using Microsoft.EntityFrameworkCore;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -20 +17 @@
             _context.SaveChangesAsync();
         }
-        // Maybe later
-        /*public MedicineList CheckMedicine(string Name)
+        public MedicineList CheckMedicine(string Name)
         {
             return (MedicineList)_context.MedicineLists
                 .Where(medicineList => medicineList.Medicine.Name.Contains(Name))
                 .OrderBy(x => x.Medicine.Name);
-        }*/
+        }
 
-        public ICollection<MedicineList> GetAll()
+        public IEnumerable<MedicineList> GetAll()
         {
-            return (ICollection<MedicineList>)_context.MedicineLists.OrderBy(x => x.Medicine.Name);
+            return _context.MedicineLists.OrderBy(x => x.Medicine.Name);
         }
 
@@ -49 +45 @@
         {
             var list = (MedicineList)_context.MedicineLists.Where(x => x.Equals(medicineList));
-            _context.Remove(list);
+            _context.MedicineLists.Remove(list);
         }
 
-        public void SetHasMedicine(MedicineList medicineList, bool HasMedicine)
+        public bool SetHasMedicine(MedicineList medicineList, bool HasMedicine)
         {
-            var medicine = _context.MedicineLists.Where(x => x.Medicine.Equals(medicineList.Medicine));
+            MedicineList medicine = (MedicineList)_context.MedicineLists.Where(x => x.Medicine.Name.Equals(medicineList.Medicine.Name));
+            
+            if (medicine != null || medicineList != null)
+            {
+                if (HasMedicine == true)
+                {
+                    medicine.HasMedicine = HasMedicine;
+                    _context.MedicineLists.Add(medicine);
+                    _context.SaveChangesAsync();
+                    return true;
+                }
+                else
+                {
+                    medicine.HasMedicine = HasMedicine;
+                    _context.MedicineLists.Add(medicine);
+                    _context.SaveChangesAsync();
+                    return true;
+                }
+            }else
+            {
+                return false;
+            }
         }
     }

FarmatikoData/FarmatikoRepo/MedicineRepository.cs

@@ -1 +1 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
-using Microsoft.EntityFrameworkCore;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -24 +21 @@
         public IEnumerable<Medicine> GetAll()
         {
-            return _context.Medicines.Include(medicine => medicine.Name).Include(medicine => medicine.Strength).Include(medicine => medicine.Form);
+            return _context.Medicines.OrderBy(x => x.Name);
         }
 
@@ -34 +31 @@
         public IEnumerable<Medicine> GetByName(string Name)
         {
-            return (IEnumerable<Medicine>)_context.Medicines.Where(medicine => medicine.Name == Name);
+            return _context.Medicines.Where(medicine => medicine.Name == Name);
         }
 
@@ -40 +37 @@
         {
             Medicine med = (Medicine)_context.Medicines.Where(medicine => medicine.Name.Equals(medicine));
-            _context.Remove(med);
+            _context.Medicines.Remove(med);
         }
     }

FarmatikoData/FarmatikoRepo/PharmacyHeadRepository.cs

@@ -23 +23 @@
         }
 
-        public ICollection<PharmacyHead> GetAllPharmacies(string NameOfPharmacyHead)
+        public IQueryable<PharmacyHead> GetAllPharmacies(string NameOfPharmacyHeads)
         {
-            return (ICollection<PharmacyHead>)_context.PharmacyHeads.Where(pharmacyHead => pharmacyHead.Name.Equals(NameOfPharmacyHead));
+            return _context.PharmacyHeads
+                .Where(pharmacyHead => pharmacyHead.Name.Contains(NameOfPharmacyHeads))
+                .OrderBy(x => x.Name);
         }
         //Not needed
-        public IEnumerable<PharmacyHead> GetPharmacyByName(string Name)
+        public IQueryable<PharmacyHead> GetPharmacyByName(string Name)
         {
             return _context.PharmacyHeads.Where(pharmacyHead => pharmacyHead.Name.Equals(Name));
+        }
+
+        public IQueryable<MedicineList> GetPharmacyMedicines(string NameOfPharmacy)
+        {
+
+            IQueryable<MedicineList> Pharmacy = (IQueryable<MedicineList>)_context.PharmacyHeads.Where(x => x.Name.Equals(NameOfPharmacy));
+            
+            return Pharmacy;
         }
 

FarmatikoData/FarmatikoRepo/PharmacyRepository.cs

@@ -21 +21 @@
             _context.Pharmacies.Add(pharmacy);
             _context.SaveChangesAsync();
+        }
+        //Just for users
+        public IEnumerable<Pharmacy> GetAll()
+        {
+            return _context.Pharmacies.OrderBy(x => x.Name);
         }
 

FarmatikoData/FarmatikoRepoInterfaces/IMedicineListRepository.cs

@@ -1 +1 @@
 using FarmatikoData.Models;
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -10 +8 @@
         void Add(MedicineList medicineList);
         void Remove(MedicineList medicineList);
-        ICollection<MedicineList> GetAll();
+        IEnumerable<MedicineList> GetAll();
         //Not needed, maybe later
         /*MedicineList CheckMedicine(MedicineList medicineList, bool HasMedicine);
@@ -16 +14 @@
         ICollection<MedicineList> GetByName(string Name);
         ICollection<MedicineList> GetByManufacturer(string Manufacturer);
-        void SetHasMedicine(MedicineList medicineList, bool HasMedicine);
+        bool SetHasMedicine(MedicineList medicineList, bool HasMedicine);
     }
 }

FarmatikoData/FarmatikoRepoInterfaces/IPharmacyHeadRepository.cs

@@ -2 +2 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
@@ -10 +11 @@
         void Add(PharmacyHead pharmacyHead);
         void Remove(PharmacyHead pharmacyHead, string Name);
-        ICollection<PharmacyHead> GetAllPharmacies(string NameOfPharmacyHead);
+        IQueryable<PharmacyHead> GetAllPharmacies(string NameOfPharmacyHead);
         //Not actually needed
-        IEnumerable<PharmacyHead> GetPharmacyByName(string Name);
+        IQueryable<PharmacyHead> GetPharmacyByName(string Name);
+        IQueryable<MedicineList> GetPharmacyMedicines(string NameOfPharmacy);
     }
 }

FarmatikoData/FarmatikoRepoInterfaces/IPharmacyRepository.cs

@@ -10 +10 @@
         void Add(Pharmacy pharmacy);
         ICollection<Pharmacy> GetPharmacies();
+        IEnumerable<Pharmacy> GetAll();
         void Remove(Pharmacy pharmacy);
         void UpdatePharmacy(Pharmacy pharmacy, string Name);

FarmatikoData/Models/Pandemic.cs

@@ -10 +10 @@
     {
         public Pandemic() { }
+        public string Name { get; set; }
+        public int TotalMK { get; set; }
+        public int ActiveMK { get; set; }
+        public int DeathsMK { get; set; }
+        public int NewMK { get; set; }
+        public long TotalGlobal { get; set; }
+        public long DeathsGlobal { get; set; }
+        public long ActiveGlobal { get; set; }
         public Pandemic(string Name, int TotalMK, int ActiveMK,
             int DeathsMK, int NewMK, long TotalGlobal, long DeathsGlobal, long ActiveGlobal)
@@ -22 +30 @@
             this.ActiveGlobal = ActiveGlobal;
         }
-        public string Name { get; set; }
-        public int TotalMK { get; set; }
-        public int ActiveMK { get; set; }
-        public int DeathsMK { get; set; }
-        public int NewMK { get; set; }
-        public long TotalGlobal { get; set; }
-        public long DeathsGlobal { get; set; }
-        public long ActiveGlobal { get; set; }
     }
 }