Changeset 63d885e for FarmatikoData/FarmatikoRepo/PandemicRepository.cs

Timestamp:

08/07/20 11:01:25 (5 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

5d02859

Parents:

ee137aa (diff), c406ae5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/farmatiko

File:

• FarmatikoData/FarmatikoRepo/PandemicRepository.cs (modified) (1 diff)

FarmatikoData/FarmatikoRepo/PandemicRepository.cs

@@ -22 +22 @@
         public IQueryable<Pandemic> GetAll()
         {
-            return _context.Pandemics.OrderBy(x => x.Name);
+            return _context.Pandemics.Select(x => new Pandemic
+            {
+                Name = x.Name,
+                TotalMK = x.TotalMK,
+                ActiveMK = x.ActiveMK,
+                DeathsMK = x.DeathsMK,
+                NewMK = x.NewMK,
+                TotalGlobal = x.TotalGlobal,
+                DeathsGlobal = x.DeathsGlobal,
+                ActiveGlobal = x.ActiveGlobal
+            }).OrderBy(x => x.Name);
         }
 
         public void Remove(Pandemic pandemic)
         {
-            _context.Pandemics.Remove(pandemic);
-            _context.SaveChangesAsync();
+            var Pandem = _context.Pandemics.Where(x => x.Name.Equals(pandemic.Name)).FirstOrDefault();
+            if (Pandem != null)
+            {
+                _context.Pandemics.Remove(Pandem);
+                _context.SaveChangesAsync();
+            }
         }
     }