Revert "Removed unused using, Reorganized using, moved the class to separate file, removed commented code in Catalog.API"

This reverts commit 34241c4306.

src/Services/Basket/Basket.FunctionalTests/Base/BasketTestStartup.cs

@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Builder;
+using System;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.eShopOnContainers.Services.Basket.API;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System;
 
 namespace Basket.FunctionalTests.Base
 {

src/Services/Catalog/Catalog.API/CatalogSettings.cs

@@ -1,15 +1,12 @@
 namespace Microsoft.eShopOnContainers.Services.Catalog.API
 {
-
     public class CatalogSettings
     {
-        public string PicBaseUrl { get; set; }
+        public string PicBaseUrl { get;set;}
 
         public string EventBusConnection { get; set; }
 
         public bool UseCustomizationData { get; set; }
-
-        public bool AzureStorageEnabled { get; set; }
+	public bool AzureStorageEnabled { get; set; }
     }
-
 }

src/Services/Catalog/Catalog.API/Extensions/CatalogItemExtensions.cs

@@ -1,4 +1,9 @@
-namespace Microsoft.eShopOnContainers.Services.Catalog.API.Model
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.Services.Catalog.API.Model
 {
     public static class CatalogItemExtensions
     {

src/Services/Catalog/Catalog.API/Extensions/HostExtensions.cs

@@ -1,10 +1,13 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Polly;
-using System;
 using System.Data.SqlClient;
 
 namespace Catalog.API.Extensions

src/Services/Catalog/Catalog.API/Extensions/WebHostExtensions.cs

@@ -1,11 +1,11 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
+using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Polly;
-using System;
 using System.Data.SqlClient;
+using Microsoft.AspNetCore.Hosting;
 
 namespace Catalog.API.Extensions
 {

src/Services/Catalog/Catalog.API/Grpc/CatalogService.cs

@@ -1,15 +1,16 @@
-using CatalogApi;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using CatalogApi;
 using Grpc.Core;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.eShopOnContainers.Services.Catalog.API;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
+using Microsoft.eShopOnContainers.Services.Catalog.API.ViewModel;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using static CatalogApi.Catalog;
 
 namespace Catalog.API.Grpc

src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs

@@ -1,9 +1,9 @@
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure
 {
-    using EntityConfigurations;
     using Microsoft.EntityFrameworkCore;
-    using Microsoft.EntityFrameworkCore.Design;
+    using EntityConfigurations;
     using Model;
+    using Microsoft.EntityFrameworkCore.Design;
 
     public class CatalogContext : DbContext
     {

src/Services/Catalog/Catalog.API/IntegrationEvents/CatalogIntegrationEventService.cs

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
 using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Services;
@@ -6,6 +7,7 @@ using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Utilities
 using Microsoft.eShopOnContainers.Services.Catalog.API;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
 using Microsoft.Extensions.Logging;
+using Serilog.Context;
 using System;
 using System.Data.Common;
 using System.Threading.Tasks;

src/Services/Catalog/Catalog.API/IntegrationEvents/EventHandling/OrderStatusChangedToAwaitingValidationIntegrationEventHandler.cs

@@ -1,15 +1,15 @@
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.EventHandling
 {
     using BuildingBlocks.EventBus.Abstractions;
+    using System.Threading.Tasks;
     using BuildingBlocks.EventBus.Events;
-    using global::Catalog.API.IntegrationEvents;
     using Infrastructure;
-    using IntegrationEvents.Events;
-    using Microsoft.Extensions.Logging;
-    using Serilog.Context;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Threading.Tasks;
+    using global::Catalog.API.IntegrationEvents;
+    using IntegrationEvents.Events;
+    using Serilog.Context;
+    using Microsoft.Extensions.Logging;
 
     public class OrderStatusChangedToAwaitingValidationIntegrationEventHandler : 
         IIntegrationEventHandler<OrderStatusChangedToAwaitingValidationIntegrationEvent>

src/Services/Catalog/Catalog.API/IntegrationEvents/EventHandling/OrderStatusChangedToPaidIntegrationEventHandler.cs

@@ -1,11 +1,11 @@
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.EventHandling
 {
     using BuildingBlocks.EventBus.Abstractions;
+    using System.Threading.Tasks;
     using Infrastructure;
     using Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.Events;
     using Microsoft.Extensions.Logging;
     using Serilog.Context;
-    using System.Threading.Tasks;
 
     public class OrderStatusChangedToPaidIntegrationEventHandler : 
         IIntegrationEventHandler<OrderStatusChangedToPaidIntegrationEvent>

src/Services/Catalog/Catalog.API/IntegrationEvents/Events/OrderStatusChangedToAwaitingValidationIntegrationEvent.cs

@@ -16,4 +16,15 @@
         }
     }
 
+    public class OrderStockItem
+    {
+        public int ProductId { get; }
+        public int Units { get; }
+
+        public OrderStockItem(int productId, int units)
+        {
+            ProductId = productId;
+            Units = units;
+        }
+    }
 }

src/Services/Catalog/Catalog.API/IntegrationEvents/Events/OrderStockItem.cs

@@ -1,14 +0,0 @@
-namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.Events
-{
-    public class OrderStockItem
-    {
-        public int ProductId { get; }
-        public int Units { get; }
-
-        public OrderStockItem(int productId, int units)
-        {
-            ProductId = productId;
-            Units = units;
-        }
-    }
-}

src/Services/Catalog/Catalog.API/Program.cs

@@ -1,4 +1,5 @@
-using Catalog.API.Extensions;
+using Autofac.Extensions.DependencyInjection;
+using Catalog.API.Extensions;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
@@ -11,7 +12,9 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Serilog;
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 
 namespace Microsoft.eShopOnContainers.Services.Catalog.API

src/Services/Catalog/Catalog.API/Proto/catalog.proto

@@ -1,69 +1,60 @@
 syntax = "proto3";
 
+/* >>
+import "google/api/annotations.proto";
+<< */
+
+
 package CatalogApi;
 
 message CatalogItemRequest {
 	int32 id = 1;
 }
-
 message CatalogItemsRequest {
 	string ids = 1;
-
 	int32 pageSize = 2;
-	
 	int32 pageIndex = 3;
 }
 
 message CatalogItemResponse {
 	int32 id = 1;
-	
 	string name = 2;
-    
-	string description=3;
-    
-	double price=4;
-    
-	string picture_file_name=5;
-    
-	string picture_uri=6;
-    
-	CatalogType catalog_type=8;
-    
-	CatalogBrand catalog_brand=10;
-    
-	int32 available_stock=11;
-    
-	int32 restock_threshold=12;
-    
-	int32 max_stock_threshold=13;
-    
-	bool on_reorder=14;
+    string description=3;
+    double price=4;
+    string picture_file_name=5;
+    string picture_uri=6;
+    CatalogType catalog_type=8;
+    CatalogBrand catalog_brand=10;
+    int32 available_stock=11;
+    int32 restock_threshold=12;
+    int32 max_stock_threshold=13;
+    bool on_reorder=14;
 }
 
 message CatalogBrand {
 	int32 id = 1;
-	
 	string name = 2;
 }
 
 message CatalogType {
 	int32 id = 1;
-	
 	string type = 2;
 }
 
 message PaginatedItemsResponse {
 	int32 pageIndex = 1;
-	
 	int32 pageSize = 2;
-	
 	int64 count = 3;
-	
 	repeated CatalogItemResponse data = 4;
 }
 
 service Catalog {
-  rpc GetItemById (CatalogItemRequest) returns (CatalogItemResponse) {}
-
+  rpc GetItemById (CatalogItemRequest) returns (CatalogItemResponse) {
+   /* >>
+  	option (google.api.http) = {
+        get: "/api/v1/catalog/items/{id}"
+      };
+	<< */
+	}
   rpc GetItemsByIds (CatalogItemsRequest) returns (PaginatedItemsResponse) {}
 }

src/Services/Catalog/Catalog.API/Startup.cs

@@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.ServiceBus;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ;