Finished getting database stuff

Author: Mitchell Marsh

3DPrintingBlockchainMarket/Controllers/AddModelController.cs

@@ -35,18 +35,23 @@ public AddModelController(IObjectModelService iobs,
         /// </summary>
         /// <param name="files">Filename must be the unique returned ID of the addition confirmaiton</param>
         /// <returns></returns>
-        public async Task<JsonResult> UploadModelsAsync(List<IFormFile> files)
+        [HttpPost]
+        public async Task<JsonResult> UploadModelsAsync()
         {
-
+            var files = HttpContext.Request.Form.Files;
             long size = files.Sum(f => f.Length);
             // full path to file in temp location
-            var filePath = Path.GetTempFileName();
-
+            Dictionary<string,string> TempFiles = new Dictionary<string, string>();
+            
+            
             foreach (var formFile in files)
             {
+                var filePath = Path.GetTempFileName();
+                TempFiles.Add(filePath, formFile.FileName);
+
                 if (formFile.Length > 0)
                 {
-                    using (var stream = new FileStream(filePath, FileMode.Create))
+                    using (var stream = new FileStream(filePath, FileMode.OpenOrCreate))
                     {
                         await formFile.CopyToAsync(stream);
                     }
@@ -56,10 +61,11 @@ public async Task<JsonResult> UploadModelsAsync(List<IFormFile> files)
             List<string> FailedFiles = new List<string>();
             //List of all added objects
             List<string> AddedModelPics = new List<string>();
-            foreach (var file in Directory.GetFiles(filePath))
+            
+            foreach (var file in TempFiles.Keys)
             {
                 //Remove the filepath
-                string FileNameWithExt = file.Remove(0, file.LastIndexOf('/'));
+                string FileNameWithExt = TempFiles[file];
                 //remove the file extension 
                 string FileName = FileNameWithExt.Remove(FileNameWithExt.Length - 4);
                 using (var stream = new FileStream(file, FileMode.Open))
@@ -79,7 +85,7 @@ public async Task<JsonResult> UploadModelsAsync(List<IFormFile> files)
                         case FileUploadType.JPG:
                             {
                                 string pic = AddPictureRepresentation(stream, FileName);
-                                if(String.IsNullOrEmpty(pic)){ AddedModelPics.Add(pic); } else{ FailedFiles.Add(FileName); }
+                                if(!String.IsNullOrEmpty(pic)){ AddedModelPics.Add(pic); } else{ FailedFiles.Add(FileName); }
                                 break;
                             }
                         default:
@@ -138,7 +144,7 @@ private bool Add3DModelToFile(Stream stream, string FileName)
         {
 
             //Add object to the database
-            ObjectModel obj = _ObjectModelService.Get(FileName);
+            ObjectModel obj = _ObjectModelService.Get(Guid.Parse(FileName));
             if (obj == null) return false;
             else
             { // The file is a valid object.. verify the proper user is uploading the file
@@ -198,7 +204,7 @@ private string AddPictureRepresentation(Stream stream, string FileName)
             System.IO.File.WriteAllBytes(FilePath, inMem.ToArray());
             return FilePath;
         }
-        public JsonResult ConfirmValidModel(UploadModelJson model)
+        public JsonResult ConfirmValidModel([FromBody]UploadModelJson model)
         {
             if(String.IsNullOrEmpty(model.model_license_id)||
                 String.IsNullOrEmpty(model.name) ||
@@ -234,6 +240,7 @@ public JsonResult ConfirmValidModel(UploadModelJson model)
         public FileUploadType FindFileType(Stream fileStream, string FileNameWithExtension)
         {
             string ext = FileNameWithExtension.Remove(0, FileNameWithExtension.Length - 3).ToUpper();
+            //return FileUploadType.STL; // Temporary
             switch(ext)
             {
                 case "PNG":

3DPrintingBlockchainMarket/Controllers/HomeController.cs

@@ -20,8 +20,10 @@ public HomeController(IEmailSender es)
         }
         public JsonResult Index()
         {
-            //_EmailSender.SendModelConfirmationAsync("mitchell@marshhome.net");
-            return Json(new { result = "yes"});
+            UploadModelJson model = new UploadModelJson()
+            {  description = "Container", model_license_id = "40C03B2D-370D-45B9-9BCC-015DB1FF90B6", name = "Bottle Container", pricing_unit_of_measure_id = "USD", tags = new List<string>() { "Bottle","Container","4 Pack","Pack","Beer","Holder" }, token_price = .10m  };
+
+            return Json(model);
         }
 
         public JsonResult About()

3DPrintingBlockchainMarket/Controllers/ModelInfoController.cs

@@ -0,0 +1,82 @@
+using _3DPrintingBlockchainMarket.Models;
+using _3DPrintingBlockchainMarket.Models.Json;
+using _3DPrintingBlockchainMarket.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace _3DPrintingBlockchainMarket.Controllers
+{
+    public class ModelInfoController : Controller
+    {
+        private ILicenseService _LicService { get; }
+        private IObjectModelService _ObjectModelService { get; }
+
+        public ModelInfoController(IObjectModelService ioms, ILicenseService ils)
+        {
+            _LicService = ils;
+            _ObjectModelService = ioms;
+        }
+
+        //Get All Licenses
+        public JsonResult GetAllLicenses()
+        {
+            List<ModelLicenseJson> result = new List<ModelLicenseJson>();
+            foreach(var ml in _LicService.GetAll<ModelLicense>())
+            {
+                result.Add(new ModelLicenseJson(ml));
+            }
+            return Json(result);
+        }
+        /// <summary>
+        /// Return the top 20 of the result list for tags
+        /// </summary>
+        /// <param name="tags"></param>
+        /// <returns></returns>
+        public JsonResult SearchItems(params string[] tags)
+        {
+            //get All by browse search request
+            List<ModelObjectJson> result = new List<ModelObjectJson>();
+            foreach(var res in _ObjectModelService.Search(tags))
+            {
+                //return the picture link as well
+                result.Add(new ModelObjectJson(res, Url.Content(Path.Combine("wwwroot", "images", "ObjectImages", res.IdObjectModel + ".png"))));
+            }
+            return Json(result);
+        }
+        
+        public JsonResult ItemDrilldown(Guid object_model_id)
+        {
+            var obj = _ObjectModelService.Get(object_model_id);
+            if (obj == null) return Json(new { result = "Failure", reason = "No Object was found" });
+            else
+            {
+                ModelObjectJson result = new ModelObjectJson(obj, Url.Content(Path.Combine("wwwroot", "images", "ObjectImages", obj.IdObjectModel + ".png")));
+                return Json(result);
+            }
+        }
+
+        [HttpGet]
+        [Authorize]
+        public IActionResult GetModelFile(Guid object_model_id)
+        {
+            //Grab the model
+            if (System.IO.File.Exists(Path.Combine("UploadedModles", "User", object_model_id + ".stl")))
+            {
+                using (FileStream fs = new FileStream(Path.Combine("UploadedModles", "User", object_model_id + ".stl"), FileMode.Open))
+                {
+                    return File(fs, "application/octet-stream");
+                }
+            }
+            else return NotFound();
+        }
+
+        //GetAllInfoForItem
+        //Drilldown for the item. + 3D model for render purposes?
+    }
+}

3DPrintingBlockchainMarket/Controllers/TransactionController.cs

@@ -1,18 +1,48 @@
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Security.Cryptography;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace _3DPrintingBlockchainMarket.Controllers
 {
     public class TransactionController : Controller
     {
+        private string BlockChainPath = Path.Combine("Blockchain", "block-chain.bin");
         public TransactionController()
         {
 
         }
 
+        public bool WriteTransaction(Guid objectModel_id, string User_id)
+        {
+            TcpClient client = new TcpClient();
+
+            IPEndPoint serverEndPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), 3000);
+
+            client.Connect(serverEndPoint);
+
+            NetworkStream clientStream = client.GetStream();
+
+            ASCIIEncoding encoder = new ASCIIEncoding();
+            byte[] buffer = encoder.GetBytes(objectModel_id.ToString() + ";" + User_id);
 
+            clientStream.Write(buffer, 0, buffer.Length);
+            clientStream.Flush();
+            return true;
+        }
+
+
+       
     }
+
+
+    
 }

3DPrintingBlockchainMarket/Models/Json/ModelLicenseJson.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace _3DPrintingBlockchainMarket.Models.Json
+{
+    public class ModelLicenseJson
+    {
+        public ModelLicenseJson(ModelLicense model)
+        {
+            id_license = model.IdLicense;
+            name = model.Name;
+            description = model.Description;
+            date_valid_until = model.DateValidUnil;
+        }
+        public Guid id_license { get; set; }
+        public string name { get; set; }
+        public string description { get; set; }
+        public DateTime? date_valid_until { get; set; }
+    }
+}

3DPrintingBlockchainMarket/Models/Json/ModelObjectJsons.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace _3DPrintingBlockchainMarket.Models.Json
+{
+    public class ModelObjectJson
+    {
+        public ModelObjectJson(ObjectModel model, string picture_url)
+        {
+            id_object_model = model.IdObjectModel;
+            name = model.Name;
+            download_count = model.DownloadCount;
+            object_tags = model.ObjectTags;
+            token_price = model.TokenPrice;
+            model_licence = new ModelLicenseJson(model.ModelLicense);
+            pricing_unit_of_measure = model.PricingUnitOfMeaureId;
+
+        }
+        public Guid id_object_model { get; set; }
+        public string name { get; set; }
+        public int download_count { get; set; }
+        public string object_tags { get; set; }
+        public decimal? token_price { get; set; } 
+        public ModelLicenseJson model_licence { get; set; }
+        public string pricing_unit_of_measure { get; set; }
+        public string picture_url { get; set; }
+    }
+}

3DPrintingBlockchainMarket/Services/ApplicationModelServices.cs

@@ -1,6 +1,7 @@
 using _3DPrintingBlockchainMarket.Data;
 using _3DPrintingBlockchainMarket.Models;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,14 +13,37 @@ namespace _3DPrintingBlockchainMarket.Services
     /// Create the Database service for the Object model type using the base implementaiton
     /// </summary>
     public interface IObjectModelService : IBasicService<ObjectModel>
+    {
+        List<ObjectModel> Search(params string[] tags);
+    }
+    public interface ILicenseService : IBasicService<ModelLicense>
     {
 
     }
+
+    public class LicenseService : BasicServiceImplementation<ModelLicense> , ILicenseService
+    {
+        public LicenseService(ApplicationDbContext ctx, UserManager<ApplicationUser> um) : base(ctx, um)
+        {
+
+        }
+    }
     public class ObjectModelService : BasicServiceImplementation<ObjectModel> ,IObjectModelService
     {
         public ObjectModelService(ApplicationDbContext ctx, UserManager<ApplicationUser> um) : base(ctx, um)
         {
 
         }
+
+        public List<ObjectModel> Search(params string[] tags)
+        {
+            List<ObjectModel> res = new List<ObjectModel>();
+            foreach (var u in tags)
+            {
+                res.AddRange(_context.ObjectModel.Include(e => e.PricingUnitOfMeaure).Include(e => e.ModelLicense).Where(e => e.ObjectTags.Contains(u)));
+                if (res.Count > 20) break;
+            }
+            return res;
+        }
     }
 }

3DPrintingBlockchainMarket/Startup.cs

@@ -38,6 +38,7 @@ public void ConfigureServices(IServiceCollection services)
             // Add application services.
             services.AddTransient<IEmailSender, EmailSender>();
 
+            services.AddScoped<ILicenseService, LicenseService>();
             services.AddScoped<IObjectModelService, ObjectModelService>();
 
             services.AddMvc();