Handled NULL columns and some missing columns in views.

Author: jovanpop-msft

samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/WebApi/Stored Procedures/UpdateCustomerTransactionFromJson.sql

@@ -4,13 +4,13 @@ AS BEGIN
 	SET QUOTED_IDENTIFIER ON;
 	UPDATE Sales.CustomerTransactions SET
 			TransactionTypeID = ISNULL(json.TransactionTypeID, Sales.CustomerTransactions.TransactionTypeID),
-			PaymentMethodID = ISNULL(json.PaymentMethodID, Sales.CustomerTransactions.PaymentMethodID),
+			PaymentMethodID = json.PaymentMethodID,
 			TransactionDate = ISNULL(json.TransactionDate, Sales.CustomerTransactions.TransactionDate),
 			AmountExcludingTax = ISNULL(json.AmountExcludingTax, Sales.CustomerTransactions.AmountExcludingTax),
 			TaxAmount = ISNULL(json.TaxAmount, Sales.CustomerTransactions.TaxAmount),
 			TransactionAmount = ISNULL(json.TransactionAmount, Sales.CustomerTransactions.TransactionAmount),
 			OutstandingBalance = ISNULL(json.OutstandingBalance, Sales.CustomerTransactions.OutstandingBalance),
-			FinalizationDate = ISNULL(json.FinalizationDate, Sales.CustomerTransactions.FinalizationDate),
+			FinalizationDate = json.FinalizationDate,
 			LastEditedBy = @UserID
 		FROM OPENJSON(@CustomerTransaction)
 			WITH (

samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/WebApi/Stored Procedures/UpdatePurchaseOrderFromJson.sql

@@ -1,12 +1,12 @@
 CREATE PROCEDURE [WebApi].[UpdatePurchaseOrderFromJson](@PurchaseOrder NVARCHAR(MAX), @PurchaseOrderID int, @UserID int)
 WITH EXECUTE AS OWNER
 AS BEGIN	UPDATE Purchasing.PurchaseOrders SET
-				SupplierID = ISNULL(json.SupplierID,Purchasing.PurchaseOrders.SupplierID),
+				SupplierID = json.SupplierID,
 				OrderDate = ISNULL(json.OrderDate,Purchasing.PurchaseOrders.OrderDate),
 				DeliveryMethodID = ISNULL(json.DeliveryMethodID,Purchasing.PurchaseOrders.DeliveryMethodID),
 				ContactPersonID = ISNULL(json.ContactPersonID,Purchasing.PurchaseOrders.ContactPersonID),
-				ExpectedDeliveryDate = ISNULL(json.ExpectedDeliveryDate,Purchasing.PurchaseOrders.ExpectedDeliveryDate),
-				SupplierReference = ISNULL(json.SupplierReference,Purchasing.PurchaseOrders.SupplierReference),
+				ExpectedDeliveryDate = json.ExpectedDeliveryDate,
+				SupplierReference = json.SupplierReference,
 				IsOrderFinalized = ISNULL(json.IsOrderFinalized,Purchasing.PurchaseOrders.IsOrderFinalized)
 			FROM OPENJSON(@PurchaseOrder)
 				WITH (

samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/WebApi/Stored Procedures/UpdateSpecialDealFromJson.sql

@@ -1,17 +1,17 @@
 CREATE PROCEDURE [WebApi].[UpdateSpecialDealFromJson](@SpecialDeal NVARCHAR(MAX), @SpecialDealID int, @UserID int)
 WITH EXECUTE AS OWNER
 AS BEGIN	UPDATE Sales.SpecialDeals SET
-				StockItemID = ISNULL(json.StockItemID,Sales.SpecialDeals.StockItemID),
-				CustomerID = ISNULL(json.CustomerID,Sales.SpecialDeals.CustomerID),
-				BuyingGroupID = ISNULL(json.BuyingGroupID,Sales.SpecialDeals.BuyingGroupID),
-				CustomerCategoryID = ISNULL(json.CustomerCategoryID,Sales.SpecialDeals.CustomerCategoryID),
-				StockGroupID = ISNULL(json.StockGroupID,Sales.SpecialDeals.StockGroupID),
+				StockItemID = json.StockItemID,
+				CustomerID = json.CustomerID,
+				BuyingGroupID = json.BuyingGroupID,
+				CustomerCategoryID = json.CustomerCategoryID,
+				StockGroupID = json.StockGroupID,
 				DealDescription = ISNULL(json.DealDescription,Sales.SpecialDeals.DealDescription),
 				StartDate = ISNULL(json.StartDate,Sales.SpecialDeals.StartDate),
 				EndDate = ISNULL(json.EndDate,Sales.SpecialDeals.EndDate),
-				DiscountAmount = ISNULL(json.DiscountAmount,Sales.SpecialDeals.DiscountAmount),
-				DiscountPercentage = ISNULL(json.DiscountPercentage,Sales.SpecialDeals.DiscountPercentage),
-				UnitPrice = ISNULL(json.UnitPrice,Sales.SpecialDeals.UnitPrice),
+				DiscountAmount = json.DiscountAmount,
+				DiscountPercentage = json.DiscountPercentage,
+				UnitPrice = json.UnitPrice,
 				LastEditedBy = @UserID
 			FROM OPENJSON(@SpecialDeal)
 				WITH (

samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/WebApi/Stored Procedures/UpdateSupplierTransactionFromJson.sql

@@ -5,8 +5,8 @@ AS BEGIN
 	UPDATE Purchasing.SupplierTransactions SET
 			SupplierID = ISNULL(json.SupplierID,Purchasing.SupplierTransactions.SupplierID),
 			TransactionTypeID = ISNULL(json.TransactionTypeID,Purchasing.SupplierTransactions.TransactionTypeID),
-			PurchaseOrderID = ISNULL(json.PurchaseOrderID,Purchasing.SupplierTransactions.PurchaseOrderID),
-			PaymentMethodID = ISNULL(json.PaymentMethodID,Purchasing.SupplierTransactions.PaymentMethodID),
+			PurchaseOrderID = json.PurchaseOrderID,
+			PaymentMethodID = json.PaymentMethodID,
 			SupplierInvoiceNumber = ISNULL(json.SupplierInvoiceNumber,Purchasing.SupplierTransactions.SupplierInvoiceNumber),
 			TransactionDate = ISNULL(json.TransactionDate,Purchasing.SupplierTransactions.TransactionDate),
 			AmountExcludingTax = ISNULL(json.AmountExcludingTax,Purchasing.SupplierTransactions.AmountExcludingTax),

samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/WebApi/Views/PurchaseOrders.sql

@@ -1,7 +1,7 @@
 CREATE   VIEW [WebApi].[PurchaseOrders]
 AS
 SELECT	o.PurchaseOrderID, o.OrderDate, o.ExpectedDeliveryDate, o.SupplierReference, o.IsOrderFinalized,
-		dm.DeliveryMethodName, o.SupplierID,
+		dm.DeliveryMethodName, o.DeliveryMethodID, o.SupplierID,
 		ContactName = c.FullName, ContactPhone = c.PhoneNumber, ContactFax = c.FaxNumber, ContactEmail = c.EmailAddress 
 FROM	Purchasing.PurchaseOrders o
 		INNER JOIN Application.People c

samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/WebApi/Views/Suppliers.sql

@@ -18,11 +18,13 @@ SELECT s.SupplierID,
 		s.PostalAddressLine2,
 		s.PostalPostalCode,
 		s.PaymentDays,
+		s.SupplierCategoryID,
 	   DeliveryLocation = JSON_QUERY((SELECT 
 				[type] = 'Feature',
 				[geometry.type] = 'Point',
 				[geometry.coordinates] = JSON_QUERY(CONCAT('[',s.DeliveryLocation.Long,',',s.DeliveryLocation.Lat ,']')),
 				[properties.DeliveryMethod] = dm.DeliveryMethodName,
+				[properties.DeliveryMethodID] = s.DeliveryMethodID,
 				[properties.City] = c.CityName,
 				[properties.Province] = sp.StateProvinceName,
 				[properties.Territory] = sp.SalesTerritory