Merge branch 'master' of https://github.com/Microsoft/sql-server-samples

Author: uc-msft

…p/Controllers/FrontEndViewsController.cs …Controllers/FrontEndController.Static.cssamples/databases/wide-world-importers/wwi-app/Controllers/FrontEndViewsController.cs renamed to samples/databases/wide-world-importers/wwi-app/Controllers/FrontEndController.Static.cs samples/databases/wide-world-importers/wwi-app/Controllers/FrontEndViewsController.cs renamed to samples/databases/wide-world-importers/wwi-app/Controllers/FrontEndController.Static.cs

@@ -1,5 +1,4 @@
-
-using Belgrade.SqlClient;
+using Belgrade.SqlClient;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using MsSql.RestApi;
@@ -20,7 +19,7 @@ public ODataController(ICommand sqlCommandService)
         }
 
 
-		TableSpec salesorders = new TableSpec(schema: "WebApi", table: "SalesOrders", columns: "OrderID,OrderDate,CustomerPurchaseOrderNumber,ExpectedDeliveryDate,PickingCompletedWhen,CustomerID,CustomerName,PhoneNumber,FaxNumber,WebsiteURL,DeliveryLocation,SalesPerson,SalesPersonPhone,SalesPersonEmail");
+		TableSpec salesorders = new TableSpec("WebApi","SalesOrders", "OrderID,OrderDate,CustomerPurchaseOrderNumber,ExpectedDeliveryDate,PickingCompletedWhen,CustomerID,CustomerName,PhoneNumber,FaxNumber,WebsiteURL,DeliveryLocation,SalesPerson,SalesPersonPhone,SalesPersonEmail");
 
 		[HttpGet]
         public async Task SalesOrders(int? id)

samples/databases/wide-world-importers/wwi-app/Controllers/ODataController.cs

@@ -6,7 +6,6 @@
 	var json = o["ApiModel"].ToString();
 	TableDef[] config = Newtonsoft.Json.JsonConvert.DeserializeObject<TableDef[]>(json);
 #>
-
 using Belgrade.SqlClient;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

samples/databases/wide-world-importers/wwi-app/Controllers/ODataController.tt

@@ -20,7 +20,6 @@ public async Task SalesOrders()
         {
             await this
 				.Table(salesorders)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -29,7 +28,6 @@ public async Task PurchaseOrders()
         {
             await this
 				.Table(purchaseorders)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -38,7 +36,6 @@ public async Task Invoices()
         {
             await this
 				.Table(invoices)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -47,7 +44,6 @@ public async Task CustomerTransactions()
         {
             await this
 				.Table(customertransactions)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -56,7 +52,6 @@ public async Task SupplierTransactions()
         {
             await this
 				.Table(suppliertransactions)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -65,7 +60,6 @@ public async Task Customers()
         {
             await this
 				.Table(customers)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -74,7 +68,6 @@ public async Task Suppliers()
         {
             await this
 				.Table(suppliers)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -83,7 +76,6 @@ public async Task Countries()
         {
             await this
 				.Table(countries)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -92,7 +84,6 @@ public async Task Cities()
         {
             await this
 				.Table(cities)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -101,7 +92,6 @@ public async Task StateProvinces()
         {
             await this
 				.Table(stateprovinces)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 
@@ -110,7 +100,6 @@ public async Task StockItems()
         {
             await this
 				.Table(stockitems)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 																		    }

samples/databases/wide-world-importers/wwi-app/Controllers/TableController.cs

@@ -30,7 +30,6 @@ namespace wwi_app.Controllers
         {
             await this
 				.Table(<#= t.Table.ToLower() #>)
-				//.OnError(e => { this.Response.Body.Dispose(); throw e; })
 				.Process(this.sqlQuery);
         }
 <# } #>

samples/databases/wide-world-importers/wwi-app/Controllers/TableController.tt

@@ -10,6 +10,9 @@
     <EmbeddedResource Remove="wwwroot\public\**" />
     <None Remove="wwwroot\public\**" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Remove="wwwroot\OData.tt" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="2.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.3" />
@@ -24,6 +27,12 @@
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="wwwroot\OData.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>OData.yaml</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <ItemGroup>
     <None Update="Controllers\ODataController.tt">
       <LastGenOutput>ODataController.cs</LastGenOutput>
@@ -55,4 +64,11 @@
     <Folder Include="wwwroot\lib\nvd3-new\" />
     <Folder Include="wwwroot\lib\nvd3\" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Update="wwwroot\OData.yaml">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>OData.tt</DependentUpon>
+    </Content>
+  </ItemGroup>
 </Project>

samples/databases/wide-world-importers/wwi-app/wwi-app.csproj

@@ -17,7 +17,7 @@ info:
   license:
     name: "Apache 2.0"
     url: "http://www.apache.org/licenses/LICENSE-2.0.html"
-host: "localhost:64958"
+host: "localhost:64959"
 basePath: "/OData"
 tags:
 <# foreach(var t in config) {#>
@@ -36,21 +36,23 @@ paths:
     get:
       tags:
       - "<#= t.Table #>"
-      summary: "Find information about <#= t.Table #>"
-      description: "Multiple status values can be provided with comma separated strings"
+      summary: "Provides information about <#= t.Table #> using OData protocol."
+      description: "Enables querying <#= t.Table #> information using OData parameters."
       operationId: "<#= t.Table #>"
       produces:
       - "application/json"
       parameters:
       - name: "$select"
         in: "query"
-        description: "Selecting the properties that should be returned by service"
+        description: "Selecting the <#= t.Table #> properties that should be returned by service."
         required: false
         type: "array"
         items:
           type: "string"
-          enum:<# foreach(var c in t.ODataColumns.Split(',')) {#>
-            - "<#= c #>"<# } #>
+          enum:
+<# foreach(var c in t.ODataColumns.Split(',')) {#>
+            - "<#= c #>"
+<# } #>
         collectionFormat: "multi"
       - name: "$orderby"
         in: "query"
@@ -59,29 +61,31 @@ paths:
         type: "array"
         items:
           type: "string"
-          enum:<# foreach(var c in t.ODataColumns.Split(',')) {#>
+          enum:
+<# foreach(var c in t.ODataColumns.Split(',')) {#>
             - "<#= c #>"
             - "<#= c #> asc"
-            - "<#= c #> desc"<# } #>
+            - "<#= c #> desc"
+<# } #>
         collectionFormat: "multi"
       - name: "$top"
         in: "query"
-        description: "Selecting the properties that should be returned by service"
+        description: "Selecting the  <#= t.Table #> properties that should be returned by the API."
         required: false
         type: "integer"
       - name: "$skip"
         in: "query"
-        description: "Selecting the properties that should be returned by service"
+        description: "Specify number of  <#= t.Table #> records that should be skipped."
         required: false
         type: "integer"
       - name: "$apply"
         in: "query"
-        description: "aggregation function that should be applied on the results"
+        description: "Aggregation function that should be applied on the results."
         required: false
         type: "string"
       - name: "$filter"
         in: "query"
-        description: "Condition that returned items must satisfy"
+        description: "Condition that returned  <#= t.Table #> items must satisfy. It can contain and, or, not logical operators and lt, le, gt, ge, ne, eq relational operators."
         required: false
         type: "string"
       responses:
@@ -90,12 +94,13 @@ paths:
         400:
           description: "The OData request is not valid"
         500:
-          description: "Cannot process request"<# } #>
+          description: "OData service cannot process request"<# } #>
 <#+
 	public class TableDef { 
 		public string Schema {get; set;}
 		public string Table {get; set;}
 		public string ODataColumns {get; set;}
 		public bool IsReadOnly {get; set;}
 	}
+
 #>