Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivatePropertiesAPI

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedOwner.cs

@@ -33,6 +33,18 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
             else BankingDetails = new DetailedBankDetails();
         }
 
+        public DetailedOwner(Agent agent)
+        {
+            Id = agent.Id;
+            Name = agent.Name;
+            Surname = agent.Surname;
+            EmailAddress = agent.Email;
+            CellNumber = agent.CellNumber;
+            LandlineNumber = agent.Telephone;
+            Address = new DetailedAddress();
+            BankingDetails = new DetailedBankDetails();
+        }
+
         public int Id { get; set; }
         public string Name { get; set; }
         public string Surname { get; set; }

UnivateProperties_API/Migrations/20191018124608_NewPropertyProperties.cs

@@ -6,26 +6,26 @@ namespace UnivateProperties_API.Migrations
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.AddColumn<string>(
-                name: "Video",
-                table: "Properties",
-                nullable: true);
+            //migrationBuilder.AddColumn<string>(
+            //    name: "Video",
+            //    table: "Properties",
+            //    nullable: true);
 
-            migrationBuilder.AddColumn<string>(
-                name: "VirtualTour",
-                table: "Properties",
-                nullable: true);
+            //migrationBuilder.AddColumn<string>(
+            //    name: "VirtualTour",
+            //    table: "Properties",
+            //    nullable: true);
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.DropColumn(
-                name: "Video",
-                table: "Properties");
+            //migrationBuilder.DropColumn(
+            //    name: "Video",
+            //    table: "Properties");
 
-            migrationBuilder.DropColumn(
-                name: "VirtualTour",
-                table: "Properties");
+            //migrationBuilder.DropColumn(
+            //    name: "VirtualTour",
+            //    table: "Properties");
         }
     }
 }

UnivateProperties_API/Repository/Users/IndividualRepository.cs

@@ -48,7 +48,20 @@ namespace UnivateProperties_API.Repository.Users
 
         public DetailedOwner GetIndividual(int id)
         {
-            return new DetailedOwner(_dbContext.Individuals.FirstOrDefault(x => x.UserId == id));
+            var item = _dbContext.Individuals.FirstOrDefault(x => x.UserId == id);
+            if(item != null)
+            {
+                return new DetailedOwner(item);
+            }
+            else
+            {
+                var aItem = _dbContext.Agents.FirstOrDefault(x => x.UserId == id);
+                if(aItem != null)
+                {
+                    return new DetailedOwner(aItem);
+                }
+            }
+            return new DetailedOwner();
         }
 
         public void Insert(Individual item)