Merge branch 'dev' into update-WebStatus

Author: dsrodenas

cli-linux/build-bits-linux.sh

@@ -3,7 +3,8 @@
 declare -x path=$1
 
 if [ -z "$path" ]; then 
-    $path="$(pwd)/../src"; 
+    $path="$(pwd)/../src";
+    echo -e "\e[33mNo path passed. Will use $path"
 fi
 
 declare -a projectList=(
@@ -30,9 +31,9 @@ do
     echo -e "\e[33m\tRemoving old publish output"
     pushd $path/$project
     rm -rf obj/Docker/publish
-    echo -e "\e[33m\tRestoring project"
+    echo -e "\e[33m\tRestoring project $project"
     dotnet restore
-    echo -e "\e[33m\tBuilding and publishing projects"
+    echo -e "\e[33m\tBuilding and publishing $project"
     dotnet publish -o obj/Docker/publish
     popd
 done

docker-compose-external.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 services:
   sql.data:

docker-compose.ci.build.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 services:
   ci-build:

docker-compose.nobuild.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 services:
   basket.api:

docker-compose.override.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '2.1'
 
 # The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine. 
 # The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: 

docker-compose.prod.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '2.1'
 
 # The Production docker-compose file has to have the external/real IPs or DNS names for the services 
 # The ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: 

docker-compose.vs.debug.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '2.1'
 
 services:
   basket.api:

docker-compose.vs.release.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '2.1'
 
 services:
   basket.api:

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '2.1'
 
 services:
   graceperiodmanager:

src/Services/Catalog/Catalog.API/Controllers/PicController.cs

@@ -22,19 +22,32 @@ public PicController(IHostingEnvironment env,
             _catalogContext = catalogContext;
         }
 
-        [HttpGet("{filename}")]
+        [HttpGet("{id}")]
         // GET: /<controller>/
-        public IActionResult GetImage(string filename)
+        public async Task<IActionResult> GetImage(int id)
         {
-            var webRoot = _env.WebRootPath;
-            var path = Path.Combine(webRoot, filename);
+            if (id <= 0)
+            {
+                return BadRequest();
+            }
 
-            string imageFileExtension = Path.GetExtension(filename);
-            string mimetype = GetImageMimeTypeFromImageFileExtension(imageFileExtension);
+            var item = await _catalogContext.CatalogItems
+                .SingleOrDefaultAsync(ci => ci.Id == id);
+
+            if (item != null)
+            {
+                var webRoot = _env.WebRootPath;
+                var path = Path.Combine(webRoot, item.PictureFileName);
 
-            var buffer = System.IO.File.ReadAllBytes(path);
+                string imageFileExtension = Path.GetExtension(item.PictureFileName);
+                string mimetype = GetImageMimeTypeFromImageFileExtension(imageFileExtension);
+
+                var buffer = System.IO.File.ReadAllBytes(path);
+
+                return File(buffer, mimetype);
+            }
 
-            return File(buffer, mimetype);
+            return NotFound();
         }
 
         private string GetImageMimeTypeFromImageFileExtension(string extension)
@@ -43,29 +56,29 @@ private string GetImageMimeTypeFromImageFileExtension(string extension)
 
             switch (extension)
             {
-                case "png":
+                case ".png":
                     mimetype = "image/png";
                     break;
-                case "gif":
+                case ".gif":
                     mimetype = "image/gif";
                     break;
-                case "jpg":
-                case "jpeg":
+                case ".jpg":
+                case ".jpeg":
                     mimetype = "image/jpeg";
                     break;
-                case "bmp":
+                case ".bmp":
                     mimetype = "image/bmp";
                     break;
-                case "tiff":
+                case ".tiff":
                     mimetype = "image/tiff";
                     break;
-                case "wmf":
+                case ".wmf":
                     mimetype = "image/wmf";
                     break;
-                case "jp2":
+                case ".jp2":
                     mimetype = "image/jp2";
                     break;
-                case "svg":
+                case ".svg":
                     mimetype = "image/svg+xml";
                     break;
                 default: