Changeset 0c48bbb

Timestamp:

07/21/20 12:05:35 (4 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

333cdac, 92a1f41

Parents:

dba4ca9 (diff), f33b0d4 (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
Updates

Files:

• Farmatiko/Startup.cs (modified) (2 diffs)
• Farmatiko/appsettings.json (modified) (1 diff)
• FarmatikoData/Base/BaseEntity.cs (added)
• FarmatikoData/Migrations/20200720165322_Initial Migration.Designer.cs (added)
• FarmatikoData/Migrations/20200720165322_Initial Migration.cs (added)
• FarmatikoData/Migrations/FarmatikoDataContextModelSnapshot.cs (added)
• FarmatikoData/Models/HealthFacilities.cs (modified) (1 diff)
• FarmatikoData/Models/HealthcareWorkers.cs (modified) (1 diff)
• FarmatikoData/Models/Medicine.cs (modified) (1 diff)
• FarmatikoData/Models/MedicineList.cs (modified) (2 diffs)
• FarmatikoData/Models/Pandemic.cs (modified) (1 diff)
• FarmatikoData/Models/Pharmacy.cs (modified) (1 diff)
• FarmatikoData/Models/PharmacyHead.cs (modified) (1 diff)

Farmatiko/Startup.cs

@@ -1 +1 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
 using Microsoft.AspNetCore.SpaServices.AngularCli;
 using Microsoft.Extensions.Configuration;
@@ -30 +29 @@
             });
             var connectionString = Configuration.GetSection("ConnectionStrings").GetValue<string>("FarmatikoConnection");
-            services.AddEntityFrameworkNpgsql().AddDbContext<FarmatikoDataContext>(opt => opt.UseNpgsql(connectionString));
+
+            services.AddEntityFrameworkNpgsql().AddDbContext<FarmatikoDataContext>(opt => {
+                opt.UseNpgsql(connectionString);
+            });
 
         }

Farmatiko/appsettings.json

@@ -1 +1 @@
 {
   "ConnectionStrings": {
-    "FarmatikoConnection": "User ID=postgres;Password=@@Farmatiko@@.;database=FarmatikoDb;Integrated Security=true; Pooling=true;"
+    "FarmatikoConnection": "Host=localhost;User ID=postgres;Password=@@Postgres@@.;database=FarmatikoDb;Integrated Security=true; Pooling=true;"
   },
   "Logging": {

FarmatikoData/Models/HealthFacilities.cs

@@ -3 +3 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text;
+using FarmatikoData.Base;
 using Microsoft.EntityFrameworkCore;
 
 namespace FarmatikoData.Models
 {
-    public class HealthFacilities
+    public class HealthFacilities : BaseEntity
     {
         public HealthFacilities() { }

FarmatikoData/Models/HealthcareWorkers.cs

@@ -3 +3 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text;
+using FarmatikoData.Base;
 using Microsoft.EntityFrameworkCore;
 
 namespace FarmatikoData.Models
 {
-    public class HealthcareWorkers
+    public class HealthcareWorkers : BaseEntity
     {
         public HealthcareWorkers() { }

FarmatikoData/Models/Medicine.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Text;
+using FarmatikoData.Base;
 using Microsoft.EntityFrameworkCore;
 
 namespace FarmatikoData.Models
 {
-    public class Medicine
+    public class Medicine : BaseEntity
     {
         public Medicine() { }

FarmatikoData/Models/MedicineList.cs

@@ -1 +1 @@
 using System.Collections.Generic;
+using FarmatikoData.Base;
 using FarmatikoData.Models;
 using Microsoft.EntityFrameworkCore;
@@ -5 +6 @@
 namespace FarmatikoData.Models
 {
-    public class MedicineList
+    public class MedicineList : BaseEntity
     {
-        public Medicine Medicines { get; set; }
+        public Medicine Medicine { get; set; }
         public bool HasMedicine { get; set; }
         public ICollection<Medicine> MedicinesList { get; set; }

FarmatikoData/Models/Pandemic.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Text;
+using FarmatikoData.Base;
 using Microsoft.EntityFrameworkCore;
 
 namespace FarmatikoData.Models
 {
-    public class Pandemic
+    public class Pandemic : BaseEntity
     {
         public Pandemic() { }

FarmatikoData/Models/Pharmacy.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Text;
+using FarmatikoData.Base;
 using Microsoft.EntityFrameworkCore;
 
 namespace FarmatikoData.Models
 {
-    public class Pharmacy
+    public class Pharmacy : BaseEntity
     {
         public Pharmacy() { }
+        [Required]
         public string Name { get; set; }
+        [Required]
         public string Location { get; set; }
+        [Required]
         public string Address { get; set; }
         public bool WorkAllTime { get; set; }

FarmatikoData/Models/PharmacyHead.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Text;
+using FarmatikoData.Base;
 using Microsoft.EntityFrameworkCore;
 
 namespace FarmatikoData.Models
 {
-    public class PharmacyHead
+    public class PharmacyHead : BaseEntity
     {
         public MedicineList PharmacyMedicines { get; set; }