Changeset e0cdea2 for FarmatikoData

Timestamp:

02/08/21 16:39:25 (3 years ago)

Author:

Dimitar Slezenkovski <dslezenkovski@…>

Branches:

master

Children:

8eb1e21, dae4cde

Parents:

0a694bb

Message:

Fix all bugs

Location:

FarmatikoData

Files:

• FarmatikoDataContext.cs (modified) (1 diff)
• FarmatikoRepo/AdminRepo.cs (modified) (2 diffs)
• FarmatikoRepo/PHRepo.cs (modified) (1 diff)
• FarmatikoRepo/Repository.cs (modified) (12 diffs)
• FarmatikoRepoInterfaces/IAdminRepo.cs (modified) (1 diff)
• FarmatikoRepoInterfaces/IRepository.cs (modified) (1 diff)
• Migrations/20210208041424_Initial-Create.Designer.cs (moved) (moved from FarmatikoData/Migrations/20210205174704_Initial-Migration.Designer.cs ) (6 diffs)
• Migrations/20210208041424_Initial-Create.cs (moved) (moved from FarmatikoData/Migrations/20210205174704_Initial-Migration.cs ) (7 diffs)
• Migrations/FarmatikoDataContextModelSnapshot.cs (modified) (5 diffs)
• Models/Pharmacy.cs (modified) (1 diff)
• Models/RequestPharmacyHead.cs (modified) (2 diffs)

FarmatikoData/FarmatikoDataContext.cs

@@ -42 +42 @@
                 .ValueGeneratedOnAdd();
 
-            /*modelBuilder.Entity<Medicine>()
-                .Property(x => x.Id)
-                .HasIdentityOptions(startValue: 1);
+            modelBuilder.Entity<PharmacyHeadMedicine>()
+                .Property(p => p.Id)
+                .ValueGeneratedOnAdd();
+
+            modelBuilder.Entity<Medicine>()
+                .Property(p => p.Id)
+                .ValueGeneratedOnAdd();
 
             modelBuilder.Entity<Pharmacy>()
-                .Property(x => x.Id)
-                .HasIdentityOptions(startValue: 1);
+                .Property(p => p.Id)
+                .ValueGeneratedOnAdd();
 
             modelBuilder.Entity<PharmacyHead>()
-                .Property(x => x.Id)
-                .HasIdentityOptions(startValue: 1);
-
-            modelBuilder.Entity<PharmacyHeadMedicine>()
-                .Property(x => x.Id)
-                .HasIdentityOptions(startValue: 1);
-
-            modelBuilder.Entity<RequestPharmacyHead>()
-                .Property(x => x.Id)
-                .HasIdentityOptions(startValue: 1);*/
-
-            /*modelBuilder.Entity<User>()
-                .Property(x => x.Id)
-                .HasIdentityOptions(startValue: 1);
-
-            modelBuilder.Entity<PharmacyHeadMedicine>()
-                .HasKey(phm => new { phm.PheadId, phm.MedicineId });
-
-            modelBuilder.Entity<PharmacyHead>()
-                .HasMany<Pharmacy>(p => p.Pharmacy)
-                .WithOne(p => p.PharmacyHead)
-                .HasForeignKey();
+                .HasMany<Pharmacy>(p => p.Pharmacies)
+                .WithOne(p => p.PharmacyHead);
 
             modelBuilder.Entity<Pharmacy>()
                 .HasOne<PharmacyHead>(p => p.PharmacyHead)
-                .WithMany(p => p.Pharmacy);
-            */
+                .WithMany(p => p.Pharmacies)
+                .HasForeignKey(x => x.PheadId);
+
+            modelBuilder.Entity<PharmacyHeadMedicine>()
+            .HasKey(bc => new { bc.PheadId, bc.MedicineId});
+
+            modelBuilder.Entity<PharmacyHeadMedicine>()
+                .HasOne(bc => bc.Head)
+                .WithMany(b => b.Medicines)
+                .HasForeignKey(bc => bc.PheadId);
+
+            modelBuilder.Entity<PharmacyHeadMedicine>()
+                .HasOne(bc => bc.Medicine)
+                .WithMany(c => c.Medicines)
+                .HasForeignKey(bc => bc.MedicineId);
+
 
             base.OnModelCreating(modelBuilder);

FarmatikoData/FarmatikoRepo/AdminRepo.cs

@@ -20 +20 @@
         public async Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests()
         {
-            var reqs = await _context.PHRequests.OrderBy(x => x.Head.Name).ToListAsync();
+            var reqs = await _context.PHRequests.Select(x => new RequestPharmacyHead 
+            {
+                Head = x.Head,
+                Pharmacy = x.Pharmacy
+            }).OrderBy(x => x.Head.Name).ToListAsync();
             return reqs;
         }
@@ -35 +39 @@
         }
         //POST
-        public async void RemoveClaimRequest(int Id)
+        public void RemoveClaimRequest(RequestPharmacyHead request)
         {
-            var req = _context.PHRequests.Where(x => x.Id == Id).FirstOrDefault();
+            var req = _context.PHRequests.Select(x => new RequestPharmacyHead { Head = x.Head, Pharmacy = x.Pharmacy, Id = x.Id})
+                .Where(x => x.Head.Email.Equals(request.Head.Email)).FirstOrDefault();
             _context.PHRequests.Remove(req);
-            await _context.SaveChangesAsync();
+            _context.SaveChanges();
         }
     }

FarmatikoData/FarmatikoRepo/PHRepo.cs

@@ -41 +41 @@
         public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead)
         {
-            var Phead = await _context.PharmacyHeads.Where(x => x.Email == pharmacyHead.Email).FirstOrDefaultAsync();
-            var EditedPHead = await _context.PharmacyHeads.AsNoTracking<PharmacyHead>().Where(x => x.Email == pharmacyHead.Email).FirstOrDefaultAsync();
+            var user = await _context.Users.Where(x => x.Email == pharmacyHead.Email).FirstOrDefaultAsync();
+            var EditedPHead = await _context.PharmacyHeads.Where(x => x.Email.Equals(pharmacyHead.Email)).FirstOrDefaultAsync();
 
-            if (!EditedPHead.Email.Equals(pharmacyHead.Email))
+            /*if (!EditedPHead.Email.Equals(pharmacyHead.Email) && !user.Email.Equals(pharmacyHead.Email))
+            {
                 EditedPHead.Email = pharmacyHead.Email;
+                user.Email = pharmacyHead.Email;
+            }*/
 
-            if (!EditedPHead.Name.Equals(pharmacyHead.Name))
+            if (!EditedPHead.Name.Equals(pharmacyHead.Name) || !user.Name.Equals(pharmacyHead.Name))
+            {
                 EditedPHead.Name = pharmacyHead.Name;
+                user.Name = pharmacyHead.Name;
+            }
 
-            if (!EditedPHead.Password.Equals(pharmacyHead.Password))
+            if (!EditedPHead.Password.Equals(pharmacyHead.Password) || !user.Password.Equals(pharmacyHead.Password))
+            {
                 EditedPHead.Password = pharmacyHead.Password;
+                user.Password = pharmacyHead.Password;
+            }
+            /*if (EditedPHead.Pharmacies != null)
+            {
+                if (EditedPHead.Pharmacies.Count() > 0)
+                    if (!EditedPHead.Pharmacies.Equals(pharmacyHead.Pharmacies))
+                        EditedPHead.Pharmacies = pharmacyHead.Pharmacies;
+            }
+            if (EditedPHead.Medicines != null)
+            {
+                if (EditedPHead.Medicines.Count() > 0)
+                {
+                    if (!EditedPHead.Medicines.Equals(pharmacyHead.Medicines))
+                        EditedPHead.Medicines = pharmacyHead.Medicines;
+                    
+                }
+                    
+            }*/
 
-            if (!EditedPHead.Pharmacies.Equals(pharmacyHead.Pharmacies))
-                EditedPHead.Pharmacies = pharmacyHead.Pharmacies;
-
-            if (!EditedPHead.Medicines.Equals(pharmacyHead.Medicines))
-                EditedPHead.Medicines = pharmacyHead.Medicines;
-
-            await _context.SaveChangesAsync();
+            _context.SaveChanges();
         }
         public async Task ClaimPharmacy(RequestPharmacyHead pharmacy)
         {
+            var phead = _context.PharmacyHeads.Where(x => x.Email.Equals(pharmacy.Head.Email)).FirstOrDefault();
+            pharmacy.Head = phead;
             await _context.PHRequests.AddAsync(pharmacy);
             await _context.SaveChangesAsync();

FarmatikoData/FarmatikoRepo/Repository.cs

@@ -19 +19 @@
         public async Task<IEnumerable<HealthcareWorker>> GetAllWorkers()
         {
-            var Workers = await _context.HealthcareWorkers.Take(5).ToListAsync();
+            var Workers = await _context.HealthcareWorkers.Select(x => new HealthcareWorker 
+            { 
+                Id = x.Id,
+                Name = x.Name,
+                Branch = x.Branch,
+                Facility = x.Facility,
+                Title = x.Title
+            }).Take(5).ToListAsync();
             return Workers;
         }
@@ -54 +61 @@
                 Packaging = x.Packaging
 
-            }).Take(3).ToListAsync();
+            }).Take(5).ToListAsync();
             return Medicines;
         }
@@ -92 +99 @@
         {
             var SearchQuery = await _context.HealthFacilities
-            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
+            .Where(x => x.Name.ToLower().Contains(query.ToLower())
+            || x.Municipality.ToLower().Contains(query.ToLower())
+            || x.Type.ToLower().Contains(query.ToLower())).Take(5)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -101 +110 @@
         {
             var SearchQuery = await _context.Medicines
-            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
+            .Where(x => x.Name.ToLower().Contains(query.ToLower()) 
+            || x.Form.ToLower().Contains(query.ToLower()) 
+            || x.Strength.ToLower().Contains(query.ToLower()) 
+            || x.Packaging.ToLower().Contains(query.ToLower())).Take(20)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -110 +122 @@
         {
             var SearchQuery = await _context.Pharmacies
-            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
+            .Where(x => x.Name.ToLower().Contains(query.ToLower())
+            || x.PharmacyHead.Name.ToLower().Contains(query.ToLower())).Take(5)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -118 +131 @@
         public async Task<IEnumerable<HealthcareWorker>> SearchWorkers(string query)
         {
-            var SearchQuery = await _context.HealthcareWorkers
-            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
+            var SearchQuery = await _context.HealthcareWorkers.Include(x => x.Facility)
+            .Where(x => x.Name.ToLower().Contains(query.ToLower())
+            || x.Facility.Name.ToLower().Contains(query.ToLower())).Take(20)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -146 +160 @@
         public async Task AddPharmacy(Pharmacy pharmacy)
         {
-            await _context.Pharmacies.AddAsync(pharmacy);
-            _context.SaveChanges();
+            pharmacy.Id = 0;
+            if (pharmacy.Id == 0)
+            {
+                var phars = _context.Pharmacies.Select(x => new Pharmacy
+                {
+                    Name = x.Name,
+                    Location = x.Location,
+                    Address = x.Address
+                }).ToList();
+                var pharms = phars.Where(x => x.Name.Equals(pharmacy.Name) && x.Location.Equals(pharmacy.Location) && x.Address.Equals(pharmacy.Address)).ToList();
+                if (pharms is null || pharms.Count() == 0)
+                {
+                    await _context.Pharmacies.AddAsync(pharmacy);
+                    _context.SaveChanges();
+                }
+                
+            }
         }
 
@@ -242 +271 @@
         {
             var PHead = await _context.PharmacyHeads.Where(x => x.Id == Id).FirstOrDefaultAsync();
-            PHead.DeletedOn = DateTime.UtcNow;
-            await _context.SaveChangesAsync();
+            var user = await _context.Users.Where(x => x.Email.Equals(PHead.Email)).FirstOrDefaultAsync();
+            _context.PharmacyHeads.Remove(PHead);
+            _context.Users.Remove(user);
+            _context.SaveChanges();
         }
 
@@ -290 +321 @@
             return phmeds;
         }
-
-        public async Task<bool> AddUser(User user)
+        
+        /*public async Task<bool> AddUser(User user)
         {
             if (user.Id == 0)
@@ -303 +334 @@
                 }).ToListAsync();
                 var usr = users.Where(x => x.Email.Equals(user.Email)).ToList();
-                if (usr != null || usr.Count() > 0)
+                if (usr != null && usr.Count() > 0)
                 {
                     return true;
@@ -315 +346 @@
             }
             return false;
-        }
+        }*/
 
         public async Task<List<PharmacyHeadMedicine>> GetAllPHMedicines()
@@ -329 +360 @@
             return list;
         }
+
+        public ICollection<PharmacyHeadMedicine> GetPHMedicines()
+        {
+            var meds = _context.PharmacyHeadMedicines.Select(x => new PharmacyHeadMedicine
+            {
+                PheadId = x.PheadId,
+                Head = x.Head,
+                MedicineId = x.MedicineId,
+                Medicine = x.Medicine
+            }).ToList();
+            return meds;
+        }
     }
 }

FarmatikoData/FarmatikoRepoInterfaces/IAdminRepo.cs

@@ -12 +12 @@
         Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests();
         Task<IEnumerable<PharmacyHead>> GetPharmacyHeads();
-        void RemoveClaimRequest(int Id);
+        void RemoveClaimRequest(RequestPharmacyHead Id);
     }
 }

FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs

@@ -46 +46 @@
         User GetRole(string userName);
         ICollection<PharmacyHeadMedicine> GetPHMedicines(string email);
-        Task<bool> AddUser(User user);
+        ICollection<PharmacyHeadMedicine> GetPHMedicines();
+        //Task<bool> AddUser(User user);
     }
 }

FarmatikoData/Migrations/20210208041424_Initial-Create.Designer.cs

@@ -11 +11 @@
 {
     [DbContext(typeof(FarmatikoDataContext))]
-    [Migration("20210205174704_Initial-Migration")]
-    partial class InitialMigration
+    [Migration("20210208041424_Initial-Create")]
+    partial class InitialCreate
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -207 +207 @@
                         .HasColumnType("text");
 
-                    b.Property<int?>("PharmacyHeadId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PheadId")
+                    b.Property<int?>("PheadId")
                         .HasColumnType("integer");
 
@@ -218 +215 @@
                     b.HasKey("Id");
 
-                    b.HasIndex("PharmacyHeadId");
+                    b.HasIndex("PheadId");
 
                     b.ToTable("Pharmacies");
@@ -302 +299 @@
                         .HasColumnType("timestamp without time zone");
 
-                    b.Property<int>("HeadId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PharmacyId")
+                    b.Property<int?>("HeadId")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("PharmacyId")
                         .HasColumnType("integer");
 
@@ -363 +360 @@
                     b.HasOne("FarmatikoData.Models.PharmacyHead", "PharmacyHead")
                         .WithMany("Pharmacies")
-                        .HasForeignKey("PharmacyHeadId");
+                        .HasForeignKey("PheadId");
                 });
 
@@ -392 +389 @@
                     b.HasOne("FarmatikoData.Models.PharmacyHead", "Head")
                         .WithMany()
-                        .HasForeignKey("HeadId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("HeadId");
 
                     b.HasOne("FarmatikoData.Models.Pharmacy", "Pharmacy")
                         .WithMany()
-                        .HasForeignKey("PharmacyId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("PharmacyId");
                 });
 #pragma warning restore 612, 618

FarmatikoData/Migrations/20210208041424_Initial-Create.cs

@@ -5 +5 @@
 namespace FarmatikoData.Migrations
 {
-    public partial class InitialMigration : Migration
+    public partial class InitialCreate : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -150 +150 @@
                     Address = table.Column<string>(nullable: false),
                     WorkAllTime = table.Column<bool>(nullable: false),
-                    PheadId = table.Column<int>(nullable: false),
-                    PharmacyHeadId = table.Column<int>(nullable: true)
+                    PheadId = table.Column<int>(nullable: true)
                 },
                 constraints: table =>
@@ -157 +156 @@
                     table.PrimaryKey("PK_Pharmacies", x => x.Id);
                     table.ForeignKey(
-                        name: "FK_Pharmacies_PharmacyHeads_PharmacyHeadId",
-                        column: x => x.PharmacyHeadId,
+                        name: "FK_Pharmacies_PharmacyHeads_PheadId",
+                        column: x => x.PheadId,
                         principalTable: "PharmacyHeads",
                         principalColumn: "Id",
@@ -201 +200 @@
                     CreatedOn = table.Column<DateTime>(nullable: false, defaultValueSql: "now()"),
                     DeletedOn = table.Column<DateTime>(nullable: true),
-                    HeadId = table.Column<int>(nullable: false),
-                    PharmacyId = table.Column<int>(nullable: false)
+                    HeadId = table.Column<int>(nullable: true),
+                    PharmacyId = table.Column<int>(nullable: true)
                 },
                 constraints: table =>
@@ -212 +211 @@
                         principalTable: "PharmacyHeads",
                         principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
+                        onDelete: ReferentialAction.Restrict);
                     table.ForeignKey(
                         name: "FK_PHRequests_Pharmacies_PharmacyId",
@@ -218 +217 @@
                         principalTable: "Pharmacies",
                         principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
+                        onDelete: ReferentialAction.Restrict);
                 });
 
@@ -227 +226 @@
 
             migrationBuilder.CreateIndex(
-                name: "IX_Pharmacies_PharmacyHeadId",
+                name: "IX_Pharmacies_PheadId",
                 table: "Pharmacies",
-                column: "PharmacyHeadId");
+                column: "PheadId");
 
             migrationBuilder.CreateIndex(

FarmatikoData/Migrations/FarmatikoDataContextModelSnapshot.cs

@@ -205 +205 @@
                         .HasColumnType("text");
 
-                    b.Property<int?>("PharmacyHeadId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PheadId")
+                    b.Property<int?>("PheadId")
                         .HasColumnType("integer");
 
@@ -216 +213 @@
                     b.HasKey("Id");
 
-                    b.HasIndex("PharmacyHeadId");
+                    b.HasIndex("PheadId");
 
                     b.ToTable("Pharmacies");
@@ -300 +297 @@
                         .HasColumnType("timestamp without time zone");
 
-                    b.Property<int>("HeadId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PharmacyId")
+                    b.Property<int?>("HeadId")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("PharmacyId")
                         .HasColumnType("integer");
 
@@ -361 +358 @@
                     b.HasOne("FarmatikoData.Models.PharmacyHead", "PharmacyHead")
                         .WithMany("Pharmacies")
-                        .HasForeignKey("PharmacyHeadId");
+                        .HasForeignKey("PheadId");
                 });
 
@@ -390 +387 @@
                     b.HasOne("FarmatikoData.Models.PharmacyHead", "Head")
                         .WithMany()
-                        .HasForeignKey("HeadId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("HeadId");
 
                     b.HasOne("FarmatikoData.Models.Pharmacy", "Pharmacy")
                         .WithMany()
-                        .HasForeignKey("PharmacyId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
+                        .HasForeignKey("PharmacyId");
                 });
 #pragma warning restore 612, 618

FarmatikoData/Models/Pharmacy.cs

@@ -31 +31 @@
             this.WorkAllTime = WorkAllTime;
         }
-        public int PheadId { get; set; }
+        public int? PheadId { get; set; }
         public PharmacyHead PharmacyHead { get; set; }
     }

FarmatikoData/Models/RequestPharmacyHead.cs

@@ -1 +1 @@
 using FarmatikoData.Base;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -13 +14 @@
         {
         }
-        [Required]
-        [JsonPropertyName("PharmacyHead")]
+        
+        [JsonProperty("PharmacyHead")]
         public PharmacyHead Head { get; set; }
-        [Required]
-        [JsonPropertyName("Pharmacy")]
+        
+        [JsonProperty("Pharmacy")]
         public Pharmacy Pharmacy { get; set; }