From e53450d1c78d34e207f5fa2758ea1a7e37686dc4 Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Wed, 3 Aug 2016 13:37:20 +0300 Subject: [PATCH 01/24] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D0=B0=D0=BB=20mongo=20=D0=BF=D0=BE=D0=B4=20=D0=BD=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=B4=D1=80?= =?UTF-8?q?=D0=B0=D0=B9=D0=B2=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DB/Interfaces/IProjectRepository.cs | 1 + DB/MongoClientFactory.cs | 20 +++--- DB/Repositories/DBCommentRepository.cs | 12 ++-- DB/Repositories/DBImageRepository.cs | 44 ++++++------- DB/Repositories/DBProjectRepository.cs | 85 ++++++++++++++------------ WebApp/Web.config | 3 +- 6 files changed, 79 insertions(+), 86 deletions(-) diff --git a/DB/Interfaces/IProjectRepository.cs b/DB/Interfaces/IProjectRepository.cs index 06b2026..35d431c 100644 --- a/DB/Interfaces/IProjectRepository.cs +++ b/DB/Interfaces/IProjectRepository.cs @@ -14,6 +14,7 @@ public interface IProjectRepository void DeleteAll(); void DeleteCommentFromProject(ObjectId projectId, ObjectId commentId); void DeleteImageFromProject(ObjectId projectId, ObjectId imageId); + void DeleteProjectFromProject(ObjectId rootProjectId, ObjectId deletedProjectId); Project AddProject(Project project); Project GetProjectById(ObjectId id); List GetAllProject(); diff --git a/DB/MongoClientFactory.cs b/DB/MongoClientFactory.cs index 6e17037..a774e0d 100644 --- a/DB/MongoClientFactory.cs +++ b/DB/MongoClientFactory.cs @@ -12,21 +12,19 @@ namespace DB { public class MongoClientFactory { - public static MongoUrl GetMongoUrl() + public static MongoClient GetMongoClient() { - return new MongoUrl(ConfigurationManager.AppSettings.Get("MONGOLAB_URI")); + var dbConnectionString = System.Configuration.ConfigurationManager.AppSettings["DB"]; + if (!String.IsNullOrEmpty(dbConnectionString)) + { + return new MongoClient(dbConnectionString); + } + return new MongoClient(); } - public static MongoServer GetMongoServer() - { - var client = new MongoClient(GetMongoUrl()); - var server = client.GetServer(); - return server; - } - public static MongoDatabase GetMongoDatabase() + public static IMongoDatabase GetMongoDatabase(String name = "mongodb") { - var database = GetMongoServer().GetDatabase(GetMongoUrl().DatabaseName); - return database; + return GetMongoClient().GetDatabase(name); } } } diff --git a/DB/Repositories/DBCommentRepository.cs b/DB/Repositories/DBCommentRepository.cs index c9e16e7..c4f9db6 100644 --- a/DB/Repositories/DBCommentRepository.cs +++ b/DB/Repositories/DBCommentRepository.cs @@ -14,7 +14,7 @@ namespace DB.Repositories { public class DBCommentRepository : ICommentRepository { - private readonly MongoCollection _commentCollection; + private readonly IMongoCollection _commentCollection; public DBCommentRepository() { @@ -23,21 +23,21 @@ public DBCommentRepository() } public void DeleteById(ObjectId id) { - _commentCollection.Remove(Query.EQ("_id", id)); + _commentCollection.DeleteOne(c => c.Id.Equals(id)); } public void DeleteAll() { - _commentCollection.RemoveAll(); + _commentCollection.DeleteMany(c => true); } public Comment AddComment(Comment comment) { - _commentCollection.Insert(comment); + _commentCollection.InsertOne(comment); return comment; } public List GetAll() { - return _commentCollection.FindAll().ToList(); + return _commentCollection.AsQueryable().ToList(); } public Comment GetCommentById(ObjectId id) @@ -47,7 +47,7 @@ public Comment GetCommentById(ObjectId id) } public List GetCommentsByIds(List ids) { - return _commentCollection.FindAll().Where(item => ids.Contains(item.Id)).ToList(); + return _commentCollection.AsQueryable().Where(item => ids.Contains(item.Id)).ToList(); } } } diff --git a/DB/Repositories/DBImageRepository.cs b/DB/Repositories/DBImageRepository.cs index 81d7fc2..a35b086 100644 --- a/DB/Repositories/DBImageRepository.cs +++ b/DB/Repositories/DBImageRepository.cs @@ -14,7 +14,7 @@ namespace DB.Repositories { public class DBImageRepository : IImageRepository { - private readonly MongoCollection _imageCollection; + private readonly IMongoCollection _imageCollection; public DBImageRepository() { @@ -23,30 +23,34 @@ public DBImageRepository() } public void DeleteAll() { - _imageCollection.RemoveAll(); + _imageCollection.DeleteMany(prop => true); } public void DeleteById(ObjectId id) { - _imageCollection.Remove(Query.EQ("_id", id)); + _imageCollection.DeleteOne(prop => prop.Id.Equals(id)); } public void DeleteCommentFromImage(ObjectId imageId, ObjectId commentId) { - var image = _imageCollection.AsQueryable().FirstOrDefault(i => i.Id.Equals(imageId)); - _imageCollection.Remove(Query.EQ("_id", imageId)); - image.Comments.Remove(commentId); - _imageCollection.Insert(image); + var list = _imageCollection.AsQueryable().FirstOrDefault(p => p.Id.Equals(imageId)).Comments; + list.Remove(commentId); + var filter = Builders.Filter.Eq("_Id", imageId); + var update = Builders.Update + .Set("Comments", list) + .CurrentDate("lastModified"); + var result = _imageCollection.UpdateOne(filter, update); } public void AddCommentToImage(ObjectId newComments, ObjectId idImage) { - var image = _imageCollection.AsQueryable().FirstOrDefault(im => im.Id.Equals(idImage)); - _imageCollection.Remove(Query.EQ("Id", idImage)); - image.Comments.Add(newComments); - _imageCollection.Insert(image); + var filter = Builders.Filter.Eq("_Id", idImage); + var update = Builders.Update + .AddToSet("Projects", newComments) + .CurrentDate("lastModified"); + var result = _imageCollection.UpdateOne(filter, update); } public Image AddImage(Image image) { - _imageCollection.Insert(image); + _imageCollection.InsertOne(image); return image; } @@ -62,21 +66,7 @@ public Image GetImageById(ObjectId id) } public List GetImagesByIds(List ids) { - var list = _imageCollection.FindAll().ToList(); - HashSet id = new HashSet(); - foreach (ObjectId i in ids) - { - id.Add(i); - } - var images = new List(); - foreach (Image i in list) - { - if (id.Contains(i.Id)) - { - images.Add(i); - } - } - return images; + return _imageCollection.AsQueryable().Where(i => ids.Contains(i.Id)).ToList(); } } } diff --git a/DB/Repositories/DBProjectRepository.cs b/DB/Repositories/DBProjectRepository.cs index b144120..4c8263e 100644 --- a/DB/Repositories/DBProjectRepository.cs +++ b/DB/Repositories/DBProjectRepository.cs @@ -14,7 +14,7 @@ namespace DB.Repositories { public class DBProjectRepository : IProjectRepository { - private readonly MongoCollection _projectCollection; + private readonly IMongoCollection _projectCollection; public DBProjectRepository() { @@ -23,37 +23,53 @@ public DBProjectRepository() } public void DeleteById(ObjectId id) { - _projectCollection.Remove(Query.EQ("_id", id)); + _projectCollection.DeleteOne(prop => true); } public void DeleteAll() { - _projectCollection.RemoveAll(); + _projectCollection.DeleteMany(p => p.Id.Equals(p.Id)); } public void DeleteCommentFromProject(ObjectId projectId, ObjectId commentId) { - var project = _projectCollection.AsQueryable().FirstOrDefault(p=>p.Id.Equals(projectId)); - _projectCollection.Remove(Query.EQ("_id", projectId)); - project.Comments.Remove(commentId); - _projectCollection.Insert(project); + var list = _projectCollection.AsQueryable().FirstOrDefault(p => p.Id.Equals(projectId)).Comments; + list.Remove(commentId); + var filter = Builders.Filter.Eq("_Id", projectId); + var update = Builders.Update + .Set("Comments",list) + .CurrentDate("lastModified"); + var result = _projectCollection.UpdateOne(filter, update); + } + public void DeleteProjectFromProject(ObjectId rootProjectId, ObjectId deletedProjectId) + { + var list = _projectCollection.AsQueryable().FirstOrDefault(p => p.Id.Equals(rootProjectId)).Projects; + list.Remove(deletedProjectId); + var filter = Builders.Filter.Eq("_Id", rootProjectId); + var update = Builders.Update + .Set("Projects", list) + .CurrentDate("lastModified"); + var result = _projectCollection.UpdateOne(filter, update); } public void DeleteImageFromProject(ObjectId projectId, ObjectId imageId) { - var project = _projectCollection.AsQueryable().FirstOrDefault(p => p.Id.Equals(projectId)); - _projectCollection.Remove(Query.EQ("_id", projectId)); - project.Images.Remove(imageId); - _projectCollection.Insert(project); + var list = _projectCollection.AsQueryable().FirstOrDefault(p => p.Id.Equals(projectId)).Images; + list.Remove(imageId); + var filter = Builders.Filter.Eq("_Id", projectId); + var update = Builders.Update + .Set("Images", list) + .CurrentDate("lastModified"); + var result = _projectCollection.UpdateOne(filter, update); } public Project AddProject(Project project) { - _projectCollection.Insert(project); + _projectCollection.InsertOne(project); return project; } public List GetAllProject() { //ToDo delete this bad method - return _projectCollection.FindAll().ToList(); + return _projectCollection.AsQueryable().ToList(); } public Project GetProjectById(ObjectId id) @@ -63,45 +79,34 @@ public Project GetProjectById(ObjectId id) public void AddProjectToProject(ObjectId newProject, ObjectId iDRootProject) { - var project = _projectCollection.AsQueryable().FirstOrDefault(im => im.Id.Equals(iDRootProject)); - _projectCollection.Remove(Query.EQ("_id", iDRootProject)); - project.Comments.Add(newProject); - _projectCollection.Insert(project); + var filter = Builders.Filter.Eq("_Id", iDRootProject); + var update = Builders.Update + .AddToSet("Projects", newProject) + .CurrentDate("lastModified"); + var result = _projectCollection.UpdateOne(filter, update); } public void AddImageToProject(ObjectId newImage, ObjectId iDProject) { - var project = _projectCollection.AsQueryable().FirstOrDefault(im => im.Id.Equals(iDProject)); - _projectCollection.Remove(Query.EQ("_id", iDProject)); - project.Comments.Add(newImage); - _projectCollection.Insert(project); + var filter = Builders.Filter.Eq("_Id", iDProject); + var update = Builders.Update + .AddToSet("Images", newImage) + .CurrentDate("lastModified"); + var result = _projectCollection.UpdateOne(filter, update); } public void AddCommentToProject(ObjectId newComment, ObjectId iDProject) { - var project = _projectCollection.AsQueryable().FirstOrDefault(im => im.Id.Equals(iDProject)); - _projectCollection.Remove(Query.EQ("_id", iDProject)); - project.Comments.Add(newComment); - _projectCollection.Insert(project); + var filter = Builders.Filter.Eq("_Id", iDProject); + var update = Builders.Update + .AddToSet("Comments", newComment) + .CurrentDate("lastModified"); + var result = _projectCollection.UpdateOne(filter, update); } public List GetProjectsByIds(List ids) { - var list = _projectCollection.FindAll().ToList(); - HashSet id = new HashSet(); - foreach (ObjectId i in ids) - { - id.Add(i); - } - var projects = new List(); - foreach (Project p in list) - { - if (id.Contains(p.Id)) - { - projects.Add(p); - } - } - return projects; + return _projectCollection.AsQueryable().Where(p => ids.Contains(p.Id)).ToList(); } } } diff --git a/WebApp/Web.config b/WebApp/Web.config index 00779b1..00ad1f5 100644 --- a/WebApp/Web.config +++ b/WebApp/Web.config @@ -12,9 +12,8 @@ - + - @@ -43,7 +43,9 @@ + + diff --git a/WebApp/WebApp.csproj b/WebApp/WebApp.csproj index ef08f68..bdb1622 100644 --- a/WebApp/WebApp.csproj +++ b/WebApp/WebApp.csproj @@ -73,12 +73,25 @@ + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + True + + + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll + True + + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll + True + @@ -184,6 +197,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -207,6 +249,7 @@ + @@ -215,6 +258,26 @@ + + + + + + + + + + + + + + + + + + + + SettingsSingleFileGenerator diff --git a/WebApp/packages.config b/WebApp/packages.config index 426df07..e84c56a 100644 --- a/WebApp/packages.config +++ b/WebApp/packages.config @@ -12,6 +12,11 @@ + + + + + From 1d65188f409298b2ec549b9b9eb3380d53c55450 Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Sat, 6 Aug 2016 13:55:43 +0300 Subject: [PATCH 07/24] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20Co?= =?UTF-8?q?mmentLogic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ControllersLogic/ControllersLogic.csproj | 69 ++++++++++++++++++ ControllersLogic/Interfaces/ICommentLogic.cs | 17 +++++ ControllersLogic/Logic/CommentLogic.cs | 73 ++++++++++++++++++++ ControllersLogic/Properties/AssemblyInfo.cs | 36 ++++++++++ ControllersLogic/packages.config | 4 ++ Ease-L.sln | 6 ++ WebApp/App_Start/RouteConfig.cs | 2 + WebApp/Controllers/CommentApiController.cs | 50 ++++++++++++++ WebApp/Controllers/CommentController.cs | 55 ++++----------- WebApp/Global.asax.cs | 5 +- WebApp/WebApp.csproj | 5 ++ 11 files changed, 280 insertions(+), 42 deletions(-) create mode 100644 ControllersLogic/ControllersLogic.csproj create mode 100644 ControllersLogic/Interfaces/ICommentLogic.cs create mode 100644 ControllersLogic/Logic/CommentLogic.cs create mode 100644 ControllersLogic/Properties/AssemblyInfo.cs create mode 100644 ControllersLogic/packages.config create mode 100644 WebApp/Controllers/CommentApiController.cs diff --git a/ControllersLogic/ControllersLogic.csproj b/ControllersLogic/ControllersLogic.csproj new file mode 100644 index 0000000..dd9a053 --- /dev/null +++ b/ControllersLogic/ControllersLogic.csproj @@ -0,0 +1,69 @@ + + + + + Debug + AnyCPU + {89FC8B31-B22A-40DD-981E-89A86D96BE34} + Library + Properties + ControllersLogic + ControllersLogic + v4.5.2 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\MongoDB.Bson.2.2.4\lib\net45\MongoDB.Bson.dll + True + + + + + + + + + + + + + + + + + + {4841ab80-72fd-4f53-bb68-28b111786669} + DB + + + + + + + + + \ No newline at end of file diff --git a/ControllersLogic/Interfaces/ICommentLogic.cs b/ControllersLogic/Interfaces/ICommentLogic.cs new file mode 100644 index 0000000..3dffc66 --- /dev/null +++ b/ControllersLogic/Interfaces/ICommentLogic.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using DB.Models; + +namespace ControllersLogic.Interfaces +{ + public interface ICommentLogic + { + String AddComment(String text, String name); + List GetAllComment(); + CommentWithoutObjectId GetById(String id); + CommentWithoutObjectId UpdateById(String id, String name, String text); + } +} diff --git a/ControllersLogic/Logic/CommentLogic.cs b/ControllersLogic/Logic/CommentLogic.cs new file mode 100644 index 0000000..3e8da3e --- /dev/null +++ b/ControllersLogic/Logic/CommentLogic.cs @@ -0,0 +1,73 @@ +using ControllersLogic.Interfaces; +using DB.Interfaces; +using DB.Models; +using MongoDB.Bson; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ControllerLogic +{ + public class CommentLogic: ICommentLogic + { + private static ICommentRepository _commentRepository = new DB.Repositories.DBCommentRepository(); + public String AddComment(String text, String name) + { + Comment comment = new Comment(); + comment.Text = text; + comment.CreationelData = DateTime.UtcNow; + comment.Name = name; + comment.Version = 1; + var id = _commentRepository.AddComment(comment).Id.ToString(); + return id; + } + public List GetAllComment() + { + var comments = CommentWithoutObjectId.CommentsToCommentWithoutObjectId(_commentRepository.GetAll()); + return comments; + } + public CommentWithoutObjectId GetById(String id) + { + var objectId = new ObjectId(); + if (!ObjectId.TryParse(id, out objectId)) + { + return null; + } + if (objectId == null) + { + return null; + } + var comment = CommentWithoutObjectId.CommentToCommentWithoutObjectId(_commentRepository.GetCommentById(objectId)); + if (comment == null) + { + return null; + } + return comment; + } + public CommentWithoutObjectId UpdateById(String id, String name, String text) + { + var objectId = new ObjectId(); + if (!ObjectId.TryParse(id, out objectId)) + { + return null; + } + if (objectId == null) + { + return null; + } + var comment = _commentRepository.GetCommentById(objectId); + if (comment == null) + { + return null; + } + comment.Name = name; + comment.Text = text; + comment.Version++; + _commentRepository.DeleteById(objectId); + _commentRepository.AddComment(comment); + return CommentWithoutObjectId.CommentToCommentWithoutObjectId(comment); + } + } +} diff --git a/ControllersLogic/Properties/AssemblyInfo.cs b/ControllersLogic/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..6f17cac --- /dev/null +++ b/ControllersLogic/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("ControllersLogic")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ControllersLogic")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("89fc8b31-b22a-40dd-981e-89a86d96be34")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ControllersLogic/packages.config b/ControllersLogic/packages.config new file mode 100644 index 0000000..d778025 --- /dev/null +++ b/ControllersLogic/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Ease-L.sln b/Ease-L.sln index 567f240..88e077c 100644 --- a/Ease-L.sln +++ b/Ease-L.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApp", "WebApp\WebApp.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DB", "DB\DB.csproj", "{4841AB80-72FD-4F53-BB68-28B111786669}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControllersLogic", "ControllersLogic\ControllersLogic.csproj", "{89FC8B31-B22A-40DD-981E-89A86D96BE34}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ Global {4841AB80-72FD-4F53-BB68-28B111786669}.Debug|Any CPU.Build.0 = Debug|Any CPU {4841AB80-72FD-4F53-BB68-28B111786669}.Release|Any CPU.ActiveCfg = Release|Any CPU {4841AB80-72FD-4F53-BB68-28B111786669}.Release|Any CPU.Build.0 = Release|Any CPU + {89FC8B31-B22A-40DD-981E-89A86D96BE34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89FC8B31-B22A-40DD-981E-89A86D96BE34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89FC8B31-B22A-40DD-981E-89A86D96BE34}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89FC8B31-B22A-40DD-981E-89A86D96BE34}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/WebApp/App_Start/RouteConfig.cs b/WebApp/App_Start/RouteConfig.cs index 103aa9a..a480d83 100644 --- a/WebApp/App_Start/RouteConfig.cs +++ b/WebApp/App_Start/RouteConfig.cs @@ -12,6 +12,8 @@ public class RouteConfig public static void RegisterRoutes(RouteCollection routes) { routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); + + routes.MapMvcAttributeRoutes(); routes.MapRoute( name: "Default", diff --git a/WebApp/Controllers/CommentApiController.cs b/WebApp/Controllers/CommentApiController.cs new file mode 100644 index 0000000..0ab9a9a --- /dev/null +++ b/WebApp/Controllers/CommentApiController.cs @@ -0,0 +1,50 @@ +using ControllerLogic; +using ControllersLogic.Interfaces; +using DB.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Http; + +namespace WebApp.Controllers +{ + public class CommentApiController : ApiController + { + private static ICommentLogic _commentLogic = new CommentLogic(); + + [HttpPost, Route("api/Comment")] + public String AddComment(String text, String name) + { + return _commentLogic.AddComment(text, name); + } + + [HttpGet, Route("api/Comment")] + public List GetAllComment() + { + return _commentLogic.GetAllComment(); + } + + [HttpGet, Route("api/Comment/id{id}")] + public CommentWithoutObjectId GetById(String id) + { + var comment = _commentLogic.GetById(id); + if (comment == null) + { + throw new Exception("Bad id"); + } + return comment; + } + + [HttpPut, Route("Comment/id{id}")] + public CommentWithoutObjectId UpdateById(String id, String name, String text) + { + var comment = _commentLogic.UpdateById(id, name, text); + if (comment == null) + { + throw new Exception("Bad id"); + } + return comment; + } + } +} \ No newline at end of file diff --git a/WebApp/Controllers/CommentController.cs b/WebApp/Controllers/CommentController.cs index 0583210..43cd2ac 100644 --- a/WebApp/Controllers/CommentController.cs +++ b/WebApp/Controllers/CommentController.cs @@ -7,71 +7,44 @@ using System.Web.Mvc; using MongoDB.Bson; using System.Configuration; +using ControllerLogic; +using ControllersLogic.Interfaces; namespace WebApp.Controllers { public class CommentController : Controller { - private DB.Interfaces.ICommentRepository _commentRepository = new DB.Repositories.DBCommentRepository(); + private static ICommentLogic _commentLogic = new CommentLogic(); + [HttpPost, Route("Comment")] public JsonResult AddComment(String text, String name) - { - Comment comment = new Comment(); - comment.Text = text; - comment.CreationelData = DateTime.UtcNow; - comment.Name = name; - comment.Version = 1; - var id = _commentRepository.AddComment(comment).Id.ToString(); - return Json(new { Result = id }, JsonRequestBehavior.AllowGet); + { + return Json(new { Result = _commentLogic.AddComment(text, name) }, JsonRequestBehavior.AllowGet); } [HttpGet, Route("Comment/id{id}")] public JsonResult GetById(String id) { - var objectId = new ObjectId(); - if (!ObjectId.TryParse(id, out objectId)) - { - return Json(new { Result = "Bad id it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (objectId == null) - { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); - } - var comments = CommentWithoutObjectId.CommentToCommentWithoutObjectId(_commentRepository.GetCommentById(objectId)); - if (comments == null) + var comment = _commentLogic.GetById(id); + if(comment == null) { return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); } - return Json(comments, JsonRequestBehavior.AllowGet); + return Json(comment, JsonRequestBehavior.AllowGet); } [HttpGet, Route("Comment")] - public JsonResult Index() + public JsonResult GetAllComment() { - var comments = CommentWithoutObjectId.CommentsToCommentWithoutObjectId(_commentRepository.GetAll()); - return Json(comments, JsonRequestBehavior.AllowGet); + return Json(_commentLogic.GetAllComment(), JsonRequestBehavior.AllowGet); } [HttpPut, Route("Comment/id{id}")] public JsonResult UpdateById(String id, String name, String text) { - var objectId = new ObjectId(); - if (!ObjectId.TryParse(id, out objectId)) - { - return Json(new { Result = "Bad id it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (objectId == null) - { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); - } - var comment = _commentRepository.GetCommentById(objectId); - if (comment == null) + var comment = _commentLogic.UpdateById(id, name, text); + if(comment == null) { return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); } - comment.Name = name; - comment.Text = text; - comment.Version++; - _commentRepository.DeleteById(objectId); - _commentRepository.AddComment(comment); - return Json(CommentWithoutObjectId.CommentToCommentWithoutObjectId(comment), JsonRequestBehavior.AllowGet); + return Json(comment, JsonRequestBehavior.AllowGet); } } diff --git a/WebApp/Global.asax.cs b/WebApp/Global.asax.cs index 49b2841..44cac9d 100644 --- a/WebApp/Global.asax.cs +++ b/WebApp/Global.asax.cs @@ -2,9 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Web; +using System.Web.Http; using System.Web.Mvc; using System.Web.Optimization; using System.Web.Routing; +using WebApp.App_Start; namespace WebApp { @@ -13,7 +15,8 @@ public class MvcApplication : System.Web.HttpApplication protected void Application_Start() { AreaRegistration.RegisterAllAreas(); - FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters); + FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters); + GlobalConfiguration.Configure(WebApiConfig.Register); RouteConfig.RegisterRoutes(RouteTable.Routes); BundleConfig.RegisterBundles(BundleTable.Bundles); } diff --git a/WebApp/WebApp.csproj b/WebApp/WebApp.csproj index bdb1622..a0182c6 100644 --- a/WebApp/WebApp.csproj +++ b/WebApp/WebApp.csproj @@ -228,6 +228,7 @@ + @@ -344,6 +345,10 @@ + + {89fc8b31-b22a-40dd-981e-89a86d96be34} + ControllersLogic + {4841ab80-72fd-4f53-bb68-28b111786669} DB From b3551f15cc2b61cefff8d5cb956ed9d74851e361 Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Sat, 6 Aug 2016 21:04:46 +0300 Subject: [PATCH 08/24] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20Im?= =?UTF-8?q?ageLogic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ControllersLogic/ControllersLogic.csproj | 11 ++ ControllersLogic/Interfaces/IImageLogic.cs | 22 +++ ControllersLogic/Logic/ImageLogic.cs | 150 +++++++++++++++++++++ ControllersLogic/packages.config | 2 + WebApp/Controllers/ImageApiController.cs | 57 ++++++++ WebApp/Controllers/ImageController.cs | 140 ++----------------- WebApp/WebApp.csproj | 1 + 7 files changed, 257 insertions(+), 126 deletions(-) create mode 100644 ControllersLogic/Interfaces/IImageLogic.cs create mode 100644 ControllersLogic/Logic/ImageLogic.cs create mode 100644 WebApp/Controllers/ImageApiController.cs diff --git a/ControllersLogic/ControllersLogic.csproj b/ControllersLogic/ControllersLogic.csproj index dd9a053..4204cc3 100644 --- a/ControllersLogic/ControllersLogic.csproj +++ b/ControllersLogic/ControllersLogic.csproj @@ -30,12 +30,21 @@ 4 + + ..\packages\CloudinaryDotNet.1.0.24\lib\net40\CloudinaryDotNet.dll + True + ..\packages\MongoDB.Bson.2.2.4\lib\net45\MongoDB.Bson.dll True + + ..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll + True + + @@ -45,7 +54,9 @@ + + diff --git a/ControllersLogic/Interfaces/IImageLogic.cs b/ControllersLogic/Interfaces/IImageLogic.cs new file mode 100644 index 0000000..e8fe6d5 --- /dev/null +++ b/ControllersLogic/Interfaces/IImageLogic.cs @@ -0,0 +1,22 @@ +using DB.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Web; + +namespace ControllersLogic.Interfaces +{ + public interface IImageLogic + { + String AddCommentToImage(String simageId, String text, String name); + String AddImage(String url, String name); + String DeleteCommentFromImage(String idImage, String idComment); + String DownloadImage(HttpPostedFileBase uploadImage); + List GetAllImage(); + ImageWithoutObjectId GetById(String id); + List GetCommentFromImage(String simageId); + ImageWithoutObjectId UpdateById(String id, String name, String url); + } +} diff --git a/ControllersLogic/Logic/ImageLogic.cs b/ControllersLogic/Logic/ImageLogic.cs new file mode 100644 index 0000000..011d6c8 --- /dev/null +++ b/ControllersLogic/Logic/ImageLogic.cs @@ -0,0 +1,150 @@ +using ControllersLogic.Interfaces; +using DB.Interfaces; +using DB.Models; +using MongoDB.Bson; +using System; +using System.Collections.Generic; +using System.IO; +using System.Web; + +namespace ControllersLogic.Logic +{ + public class ImageLogic : IImageLogic + { + private IImageRepository _imageRepository = new DB.Repositories.DBImageRepository(); + private ICommentRepository _commentRepository = new DB.Repositories.DBCommentRepository(); + + public String AddCommentToImage(String simageId, String text, String name) + { + Comment comment = new Comment(); + comment.Text = text; + comment.CreationelData = DateTime.UtcNow; + comment.Name = name; + comment.Version = 1; + var commentId = _commentRepository.AddComment(comment).Id; + var imageId = new ObjectId(); + if (!ObjectId.TryParse(simageId, out imageId)) + { + return "Bad id it's not objectId"; + } + if (_imageRepository.GetImageById(imageId) == null) + { + return "Bad id image"; + } + _imageRepository.AddCommentToImage(commentId, imageId); + return commentId.ToString(); + } + public String AddImage(String url, String name) + { + Image image = new Image(); + image.Url = url; + image.Version = 1; + image.Name = name; + image.CreationelData = DateTime.UtcNow; + var id = _imageRepository.AddImage(image).Id.ToString(); + return id; + } + public String DeleteCommentFromImage(String idImage, String idComment) + { + var objectIdImage = new ObjectId(); + var objectIdComment = new ObjectId(); + if (!ObjectId.TryParse(idImage, out objectIdImage)) + { + return "Bad image id"; + } + if (!ObjectId.TryParse(idComment, out objectIdComment)) + { + return "Bad comment id"; + } + if (_imageRepository.GetImageById(objectIdImage) == null) + { + return "Bad image id, not found in DB"; + } + _imageRepository.DeleteCommentFromImage(objectIdImage, objectIdComment); + _commentRepository.DeleteById(objectIdComment); + return "OK"; + } + public String DownloadImage(HttpPostedFileBase uploadImage) + { + if (uploadImage != null) + { + string fileName = Path.GetFileName(uploadImage.FileName); + var input = uploadImage.InputStream; + CloudinaryDotNet.Account account = new CloudinaryDotNet.Account("hzvwvtbls", "482455376217895", "bXPz-CiQrEjZp4xqSV8UK_nfI2c"); + CloudinaryDotNet.Cloudinary cloudinary = new CloudinaryDotNet.Cloudinary(account); + CloudinaryDotNet.Actions.ImageUploadParams uploadParams = new CloudinaryDotNet.Actions.ImageUploadParams() + { + File = new CloudinaryDotNet.Actions.FileDescription(fileName, input) + }; + CloudinaryDotNet.Actions.ImageUploadResult uploadResult = cloudinary.Upload(uploadParams); + string url = cloudinary.Api.UrlImgUp.BuildUrl(String.Format("{0}.{1}", uploadResult.PublicId, uploadResult.Format)); + return url; + } + else + { + return "Bad file"; + } + } + public List GetAllImage() + { + var images = ImageWithoutObjectId.ImagesToImageWithoutObjectId(_imageRepository.GetAllImage()); + return images; + } + public ImageWithoutObjectId GetById(String id) + { + var objectId = new ObjectId(); + if (!ObjectId.TryParse(id, out objectId)) + { + throw new Exception("Bad id it's not objectId"); + } + if (objectId == null || _imageRepository.GetImageById(objectId) == null) + { + throw new Exception("Bad id"); + } + var image = ImageWithoutObjectId.ImageToImageWithoutObjectId(_imageRepository.GetImageById(objectId)); + if (image == null) + { + throw new Exception("Bad id"); + } + return image; + } + public List GetCommentFromImage(String simageId) + { + var imageId = new ObjectId(); + if (!ObjectId.TryParse(simageId, out imageId)) + { + throw new Exception("Bad id it's not objectId"); + } + var image = _imageRepository.GetImageById(imageId); + if (image == null) + { + throw new Exception("Bad id image, this image don't found in DB"); + } + var comments = CommentWithoutObjectId.CommentsToCommentWithoutObjectId(_commentRepository.GetCommentsByIds(image.Comments)); + return comments; + } + public ImageWithoutObjectId UpdateById(String id, String name, String url) + { + var objectId = new ObjectId(); + if (!ObjectId.TryParse(id, out objectId)) + { + throw new Exception("Bad id it's not objectId"); + } + if (objectId == null) + { + throw new Exception("Bad id"); + } + var image = _imageRepository.GetImageById(objectId); + if (image == null) + { + throw new Exception("Bad id"); + } + image.Url = url; + image.Version++; + image.Name = name; + _imageRepository.DeleteById(objectId); + _imageRepository.AddImage(image); + return ImageWithoutObjectId.ImageToImageWithoutObjectId(image); + } + } +} diff --git a/ControllersLogic/packages.config b/ControllersLogic/packages.config index d778025..a6059cc 100644 --- a/ControllersLogic/packages.config +++ b/ControllersLogic/packages.config @@ -1,4 +1,6 @@  + + \ No newline at end of file diff --git a/WebApp/Controllers/ImageApiController.cs b/WebApp/Controllers/ImageApiController.cs new file mode 100644 index 0000000..2a0f677 --- /dev/null +++ b/WebApp/Controllers/ImageApiController.cs @@ -0,0 +1,57 @@ +using ControllersLogic.Interfaces; +using ControllersLogic.Logic; +using DB.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Http; + +namespace WebApp.Controllers +{ + public class ImageApiController + { + private IImageLogic _imageLogic = new ImageLogic(); + + [HttpPost, Route("api/Image/id{simageId}/comment")] + public String AddCommentToImage(String simageId, String text, String name) + { + return _imageLogic.AddCommentToImage(simageId, text, name); + } + [HttpPost, Route("api/Image")] + public String AddImage(String url, String name) + { + return _imageLogic.AddImage(url, name); + } + [HttpDelete, Route("api/Image/id{idImage}/comment/id{idComment}")] + public String DeleteCommentFromImage(String idImage, String idComment) + { + return _imageLogic.DeleteCommentFromImage(idImage, idComment); + } + [HttpPost, Route("api/Image/Download")] + public String DownloadImage(HttpPostedFileBase uploadImage) + { + return _imageLogic.DownloadImage(uploadImage); + } + [HttpGet, Route("api/Image/id{id}")] + public ImageWithoutObjectId GetById(String id) + { + return _imageLogic.GetById(id); + } + [HttpGet, Route("api/Image/id{simageId}/comment")] + public List GetCommentFromImage(String simageId) + { + return _imageLogic.GetCommentFromImage(simageId); + } + [HttpGet, Route("api/Image")] + public List index() + { + return _imageLogic.GetAllImage(); + } + [HttpPut, Route("api/Image/id{id}")] + public ImageWithoutObjectId UpdateById(String id, String name, String url) + { + return _imageLogic.UpdateById(id, name, url); + } + } +} \ No newline at end of file diff --git a/WebApp/Controllers/ImageController.cs b/WebApp/Controllers/ImageController.cs index 4800460..6bb9122 100644 --- a/WebApp/Controllers/ImageController.cs +++ b/WebApp/Controllers/ImageController.cs @@ -1,170 +1,58 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Web; using System.Web.Mvc; -using DB.Interfaces; using DB.Models; using MongoDB.Bson; -using MongoDB.Bson.IO; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using System.Web.Helpers; using System.IO; +using ControllersLogic.Logic; +using ControllersLogic.Interfaces; namespace WebApp.Controllers { public class ImageController:Controller { - private IImageRepository _imageRepository = new DB.Repositories.DBImageRepository(); - private ICommentRepository _commentRepository = new DB.Repositories.DBCommentRepository(); + private IImageLogic _imageLogic = new ImageLogic(); [HttpPost, Route("Image/id{simageId}/comment")] public JsonResult AddCommentToImage(String simageId, String text, String name) - { - Comment comment = new Comment(); - comment.Text = text; - comment.CreationelData = DateTime.UtcNow; - comment.Name = name; - comment.Version = 1; - var commentId = _commentRepository.AddComment(comment).Id; - var imageId = new ObjectId(); - if (!ObjectId.TryParse(simageId, out imageId)) - { - return Json(new { Result = "Bad id it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (_imageRepository.GetImageById(imageId) == null) - { - var result = new { Result = "Bad id image" }; - return Json(result, JsonRequestBehavior.AllowGet); - } - _imageRepository.AddCommentToImage(commentId, imageId); - return Json(new { Result = commentId.ToString() }, JsonRequestBehavior.AllowGet); + { + return Json(new { Result = _imageLogic.AddCommentToImage(simageId, text, name) }, JsonRequestBehavior.AllowGet); } [HttpPost, Route("Image")] public JsonResult AddImage(String url, String name) - { - DB.Models.Image image = new DB.Models.Image(); - image.Url = url; - image.Version = 1; - image.Name = name; - image.CreationelData = DateTime.UtcNow; - var id = _imageRepository.AddImage(image).Id.ToString(); - return Json(new { Result = id }, JsonRequestBehavior.AllowGet); + { + return Json(new { Result = _imageLogic.AddImage(url, name) }, JsonRequestBehavior.AllowGet); } [HttpDelete, Route("Image/id{idImage}/comment/id{idComment}")] public JsonResult DeleteCommentFromImage(String idImage, String idComment) { - var objectIdImage = new ObjectId(); - var objectIdComment = new ObjectId(); - if(!ObjectId.TryParse(idImage, out objectIdImage)) - { - return Json(new { Result = "Bad image id" }, JsonRequestBehavior.AllowGet); - } - if(!ObjectId.TryParse(idComment, out objectIdComment)) - { - return Json(new { Result = "Bad comment id" }, JsonRequestBehavior.AllowGet); - } - if(_imageRepository.GetImageById(objectIdImage) == null) - { - return Json(new { Result = "Bad image id, not found in DB" }, JsonRequestBehavior.AllowGet); - } - _imageRepository.DeleteCommentFromImage(objectIdImage, objectIdComment); - _commentRepository.DeleteById(objectIdComment); - return Json(new { Result = "OK" }, JsonRequestBehavior.AllowGet); + return Json(new { Result = _imageLogic.DeleteCommentFromImage(idImage,idComment)}, JsonRequestBehavior.AllowGet); } [HttpPost, Route("Image/Download")] public JsonResult DownloadImage(HttpPostedFileBase uploadImage) { - if (uploadImage != null) { - string fileName = Path.GetFileName(uploadImage.FileName); - var input = uploadImage.InputStream; - CloudinaryDotNet.Account account = new CloudinaryDotNet.Account("hzvwvtbls", "482455376217895", "bXPz-CiQrEjZp4xqSV8UK_nfI2c"); - CloudinaryDotNet.Cloudinary cloudinary = new CloudinaryDotNet.Cloudinary(account); - CloudinaryDotNet.Actions.ImageUploadParams uploadParams = new CloudinaryDotNet.Actions.ImageUploadParams() - { - File = new CloudinaryDotNet.Actions.FileDescription(fileName, input) - }; - CloudinaryDotNet.Actions.ImageUploadResult uploadResult = cloudinary.Upload(uploadParams); - string url = cloudinary.Api.UrlImgUp.BuildUrl(String.Format("{0}.{1}", uploadResult.PublicId, uploadResult.Format)); - return Json(new { Result = url }, JsonRequestBehavior.AllowGet); - } - else - { - return Json(new { Result = "Bad file" }, JsonRequestBehavior.AllowGet); - } + return Json(new { Result = _imageLogic.DownloadImage(uploadImage), JsonRequestBehavior.AllowGet }); } [HttpGet, Route("Image/id{id}")] public JsonResult GetById(String id) { - var objectId = new ObjectId(); - if (!ObjectId.TryParse(id, out objectId)) - { - return Json(new { Result = "Bad id it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (objectId == null) - { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); - } - if (_imageRepository.GetImageById(objectId) == null) - { - var result = new List(); - result.Add(new { Result = "Bad id" }); - return Json(result, JsonRequestBehavior.AllowGet); - } - var images = ImageWithoutObjectId.ImageToImageWithoutObjectId(_imageRepository.GetImageById(objectId)); - if (images == null) - { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); - } - return Json(images, JsonRequestBehavior.AllowGet); + return Json(new { Result = _imageLogic.GetById(id), JsonRequestBehavior.AllowGet }); } [HttpGet, Route("Image/id{simageId}/comment")] public JsonResult GetCommentFromImage(String simageId) { - var imageId = new ObjectId(); - if (!ObjectId.TryParse(simageId, out imageId)) - { - return Json(new { Result = "Bad id it's not objectId" }, JsonRequestBehavior.AllowGet); - } - var image = _imageRepository.GetImageById(imageId); - if (image == null) - { - return Json(new { Result = "Bad id image, this image don't found in DB" }, JsonRequestBehavior.AllowGet); - } - - var movies = CommentWithoutObjectId.CommentsToCommentWithoutObjectId(_commentRepository.GetCommentsByIds(image.Comments)); - return Json(movies, JsonRequestBehavior.AllowGet); + return Json(_imageLogic.GetCommentFromImage(simageId), JsonRequestBehavior.AllowGet); } [HttpGet, Route("Image")] public JsonResult Index() { - var images = ImageWithoutObjectId.ImagesToImageWithoutObjectId(_imageRepository.GetAllImage()); - return Json(images, JsonRequestBehavior.AllowGet); + return Json(_imageLogic.GetAllImage(), JsonRequestBehavior.AllowGet); } [HttpPut, Route("Image/id{id}")] public JsonResult UpdateById(String id, String name, String url) - { - var objectId = new ObjectId(); - if (!ObjectId.TryParse(id, out objectId)) - { - return Json(new { Result = "Bad id it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (objectId == null) - { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); - } - var image = _imageRepository.GetImageById(objectId); - if (image == null) - { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); - } - image.Url = url; - image.Version++; - image.Name = name; - _imageRepository.DeleteById(objectId); - _imageRepository.AddImage(image); - return Json(ImageWithoutObjectId.ImageToImageWithoutObjectId(image), JsonRequestBehavior.AllowGet); + { + return Json(_imageLogic.UpdateById(id, name, url), JsonRequestBehavior.AllowGet); } } } \ No newline at end of file diff --git a/WebApp/WebApp.csproj b/WebApp/WebApp.csproj index a0182c6..dca003e 100644 --- a/WebApp/WebApp.csproj +++ b/WebApp/WebApp.csproj @@ -230,6 +230,7 @@ + From e8ff500573a091be6fb0c8c53d002234eba8e0d4 Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Sun, 7 Aug 2016 11:37:34 +0300 Subject: [PATCH 09/24] =?UTF-8?q?=D0=9D=D0=B0=D0=BF=D0=B8=D1=81=D0=B0?= =?UTF-8?q?=D0=BB=20ProjectLogic=20=D0=B8=20=D0=BD=D0=B5=D0=BC=D0=BD=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=20=D0=BD=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=80=D1=8F=D0=B4=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ControllersLogic/ControllersLogic.csproj | 2 + ControllersLogic/Interfaces/IProjectLogic.cs | 23 ++ ControllersLogic/Logic/CommentLogic.cs | 12 +- ControllersLogic/Logic/ProjectLogic.cs | 237 ++++++++++++++++++ WebApp/Controllers/CommentController.cs | 22 +- ...ntroller.cs => CommentWebApiController.cs} | 14 +- WebApp/Controllers/ImageController.cs | 28 ++- ...Controller.cs => ImageWebApiController.cs} | 2 +- WebApp/Controllers/ProjectController.cs | 215 +++------------- WebApp/Controllers/ProjectWebApiController.cs | 80 ++++++ WebApp/Views/Home/About.cshtml | 7 - WebApp/Views/Home/Index.cshtml | 8 +- WebApp/Views/Home/Project.cshtml | 17 -- WebApp/Views/Shared/_Layout.cshtml | 1 + WebApp/WebApp.csproj | 7 +- 15 files changed, 431 insertions(+), 244 deletions(-) create mode 100644 ControllersLogic/Interfaces/IProjectLogic.cs create mode 100644 ControllersLogic/Logic/ProjectLogic.cs rename WebApp/Controllers/{CommentApiController.cs => CommentWebApiController.cs} (76%) rename WebApp/Controllers/{ImageApiController.cs => ImageWebApiController.cs} (97%) create mode 100644 WebApp/Controllers/ProjectWebApiController.cs delete mode 100644 WebApp/Views/Home/About.cshtml delete mode 100644 WebApp/Views/Home/Project.cshtml diff --git a/ControllersLogic/ControllersLogic.csproj b/ControllersLogic/ControllersLogic.csproj index 4204cc3..83cfc9a 100644 --- a/ControllersLogic/ControllersLogic.csproj +++ b/ControllersLogic/ControllersLogic.csproj @@ -55,8 +55,10 @@ + + diff --git a/ControllersLogic/Interfaces/IProjectLogic.cs b/ControllersLogic/Interfaces/IProjectLogic.cs new file mode 100644 index 0000000..51f2b30 --- /dev/null +++ b/ControllersLogic/Interfaces/IProjectLogic.cs @@ -0,0 +1,23 @@ +using DB.Models; +using System; +using System.Collections.Generic; + +namespace ControllersLogic.Interfaces +{ + public interface IProjectLogic + { + String AddCommentToProject(String text, String name, String sprojectId); + String AddImageToProject(String url, String name, String sprojectId); + String AddProject(String name); + String AddProjectToProject(String sidRoot, String name); + String DeleteById(String id); + String DeleteCommentFromProject(String projectId, String commentId); + String DeleteImageFromProject(String projectId, String imageId); + List GetAllProjects(); + ProjectWithoutObjectId GetById(String id); + List GetCommentsFormProject(String sidRoot); + List GetImagesFormProject(String sidRoot); + List GetPtojectsFormProject(String sidRoot); + ProjectWithoutObjectId UpdateById(String id, String name); + } +} diff --git a/ControllersLogic/Logic/CommentLogic.cs b/ControllersLogic/Logic/CommentLogic.cs index 3e8da3e..095f94a 100644 --- a/ControllersLogic/Logic/CommentLogic.cs +++ b/ControllersLogic/Logic/CommentLogic.cs @@ -33,16 +33,16 @@ public CommentWithoutObjectId GetById(String id) var objectId = new ObjectId(); if (!ObjectId.TryParse(id, out objectId)) { - return null; + throw new Exception("This isn't objectId"); } if (objectId == null) { - return null; + throw new Exception("Bad id"); } var comment = CommentWithoutObjectId.CommentToCommentWithoutObjectId(_commentRepository.GetCommentById(objectId)); if (comment == null) { - return null; + throw new Exception("Bad id"); } return comment; } @@ -51,16 +51,16 @@ public CommentWithoutObjectId UpdateById(String id, String name, String text) var objectId = new ObjectId(); if (!ObjectId.TryParse(id, out objectId)) { - return null; + throw new Exception("This isn't objectId"); } if (objectId == null) { - return null; + throw new Exception("Bad id"); } var comment = _commentRepository.GetCommentById(objectId); if (comment == null) { - return null; + throw new Exception("Bad id"); } comment.Name = name; comment.Text = text; diff --git a/ControllersLogic/Logic/ProjectLogic.cs b/ControllersLogic/Logic/ProjectLogic.cs new file mode 100644 index 0000000..170a3a4 --- /dev/null +++ b/ControllersLogic/Logic/ProjectLogic.cs @@ -0,0 +1,237 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ControllersLogic.Interfaces; +using DB.Interfaces; +using DB.Repositories; +using DB.Models; +using MongoDB.Bson; + +namespace ControllersLogic.Logic +{ + public class ProjectLogic : IProjectLogic + { + private IProjectRepository _projectRepository = new DBProjectRepository(); + private IImageRepository _imageRepository = new DBImageRepository(); + private ICommentRepository _commentRepository = new DBCommentRepository(); + + public String AddCommentToProject(String text, String name, String sprojectId) + { + var projectId = new ObjectId(); + if (!ObjectId.TryParse(sprojectId, out projectId)) + { + return "Bad id it's not objectId"; + } + if (_projectRepository.GetProjectById(projectId) == null) + { + return "Bad id it's not found in DB" ; + } + Comment comment = new Comment(); + comment.Text = text; + comment.CreationelData = DateTime.UtcNow; + comment.Name = name; + comment.Version = 1; + var commentId = _commentRepository.AddComment(comment).Id; + _projectRepository.AddCommentToProject(commentId, projectId); + return commentId.ToString(); + } + public String AddImageToProject(String url, String name, String sprojectId) + { + var projectId = new ObjectId(); + if (!ObjectId.TryParse(sprojectId, out projectId)) + { + return "Bad id it's not objectId"; + } + if (_projectRepository.GetProjectById(projectId) == null) + { + return "Bad id it's not found in DB"; + } + Image image = new Image(); + image.Url = url; + image.Version = 1; + image.Name = name; + image.CreationelData = DateTime.UtcNow; + var imageId = _imageRepository.AddImage(image).Id; + _projectRepository.AddImageToProject(imageId, projectId); + return imageId.ToString(); + } + public String AddProject(String name) + { + Project project = new Project(); + project.Name = name; + project.Version = 1; + project.CreationelData = DateTime.UtcNow; + var id = _projectRepository.AddProject(project).Id; + return id.ToString(); + } + public String AddProjectToProject(String sidRoot, String name) + { + var idRoot = new ObjectId(); + if (!ObjectId.TryParse(sidRoot, out idRoot)) + { + return "Bad id it's not objectId"; + } + if (_projectRepository.GetProjectById(idRoot) == null) + { + return "Bad id it's not found in DB" ; + } + Project project = new Project(); + project.Name = name; + project.Version = 1; + project.CreationelData = DateTime.UtcNow; + var idNew = _projectRepository.AddProject(project).Id; + _projectRepository.AddProjectToProject(idNew, idRoot); + return idNew.ToString(); + } + public String DeleteById(String id) + { + var objectId = new ObjectId(); + if (!ObjectId.TryParse(id, out objectId)) + { + return "Bad id it's not objectId" ; + } + if (objectId == null) + { + return "Bad id"; + } + if (_projectRepository.GetProjectById(objectId) == null) + { + return "Bad id"; + } + _projectRepository.DeleteById(objectId); + return "OK"; + } + public String DeleteCommentFromProject(String projectId, String commentId) + { + var objectIdProject = new ObjectId(); + var objectIdComment = new ObjectId(); + if (!ObjectId.TryParse(projectId, out objectIdProject)) + { + return "Bad id project it's not objectId"; + } + if (!ObjectId.TryParse(commentId, out objectIdComment)) + { + return "Bad id coomment it's not objectId"; + } + if (_projectRepository.GetProjectById(objectIdProject) == null) + { + return "Bad id"; + } + _projectRepository.DeleteCommentFromProject(objectIdProject, objectIdComment); + _commentRepository.DeleteById(objectIdComment); + return "OK"; + } + public String DeleteImageFromProject(String projectId, String imageId) + { + var objectIdProject = new ObjectId(); + var objectIdImage = new ObjectId(); + if (!ObjectId.TryParse(projectId, out objectIdProject)) + { + return "Bad id project it's not objectId"; + } + if (!ObjectId.TryParse(imageId, out objectIdImage)) + { + return "Bad id image it's not objectId"; + } + if (_projectRepository.GetProjectById(objectIdProject) == null) + { + return "Bad id"; + } + _projectRepository.DeleteImageFromProject(objectIdProject, objectIdImage); + _imageRepository.DeleteById(objectIdImage); + return "OK"; + } + public List GetAllProjects() + { + var projects = ProjectWithoutObjectId.ProjectsToProjectWithoutObjectId(_projectRepository.GetAllProject()); + return projects; + } + public ProjectWithoutObjectId GetById(String id) + { + var objectId = new ObjectId(); + if (!ObjectId.TryParse(id, out objectId)) + { + throw new Exception("Bad id it's not objectId"); + } + if (objectId == null) + { + throw new Exception("Bad id"); + } + var project = ProjectWithoutObjectId.ProjectToProjectWithoutObjectId(_projectRepository.GetProjectById(objectId)); + if (project == null) + { + throw new Exception("Bad id"); + } + return project; + } + public List GetCommentsFormProject(String sidRoot) + { + var idRoot = new ObjectId(); + if (!ObjectId.TryParse(sidRoot, out idRoot)) + { + throw new Exception("Bad id it's not objectId"); + } + var project = _projectRepository.GetProjectById(idRoot); + if (project == null) + { + throw new Exception("Bad id it's not found in DB"); + } + var comments = CommentWithoutObjectId.CommentsToCommentWithoutObjectId(_commentRepository.GetCommentsByIds(project.Comments)); + return comments; + } + public List GetImagesFormProject(String sidRoot) + { + var idRoot = new ObjectId(); + if (!ObjectId.TryParse(sidRoot, out idRoot)) + { + throw new Exception("Bad id it's not objectId" ); + } + var project = _projectRepository.GetProjectById(idRoot); + if (project == null) + { + throw new Exception("Bad id it's not found in DB"); + } + var images = ImageWithoutObjectId.ImagesToImageWithoutObjectId(_imageRepository.GetImagesByIds(project.Images)); + return images; + } + public List GetPtojectsFormProject(String sidRoot) + { + var idRoot = new ObjectId(); + if (!ObjectId.TryParse(sidRoot, out idRoot)) + { + throw new Exception("Bad id it's not objectId"); + } + var project = _projectRepository.GetProjectById(idRoot); + if (project == null) + { + throw new Exception("Bad id it's not found in DB"); + } + var projects = ProjectWithoutObjectId.ProjectsToProjectWithoutObjectId(_projectRepository.GetProjectsByIds(project.Projects)); + return projects; + } + public ProjectWithoutObjectId UpdateById(String id, String name) + { + var objectId = new ObjectId(); + if (!ObjectId.TryParse(id, out objectId)) + { + throw new Exception("Bad id it's not objectId"); + } + if (objectId == null) + { + throw new Exception("Bad id"); + } + var project = _projectRepository.GetProjectById(objectId); + if (project == null) + { + throw new Exception("Bad id"); + } + project.Name = name; + project.Version++; + _projectRepository.DeleteById(objectId); + _projectRepository.AddProject(project); + return ProjectWithoutObjectId.ProjectToProjectWithoutObjectId(project); + } + } +} diff --git a/WebApp/Controllers/CommentController.cs b/WebApp/Controllers/CommentController.cs index 43cd2ac..11ac417 100644 --- a/WebApp/Controllers/CommentController.cs +++ b/WebApp/Controllers/CommentController.cs @@ -24,28 +24,30 @@ public JsonResult AddComment(String text, String name) [HttpGet, Route("Comment/id{id}")] public JsonResult GetById(String id) { - var comment = _commentLogic.GetById(id); - if(comment == null) + try { + return Json(_commentLogic.GetById(id), JsonRequestBehavior.AllowGet); + } + catch (Exception e) { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); + return Json(e.ToString() , JsonRequestBehavior.AllowGet); } - return Json(comment, JsonRequestBehavior.AllowGet); } [HttpGet, Route("Comment")] - public JsonResult GetAllComment() + public JsonResult Index() { return Json(_commentLogic.GetAllComment(), JsonRequestBehavior.AllowGet); } [HttpPut, Route("Comment/id{id}")] public JsonResult UpdateById(String id, String name, String text) { - var comment = _commentLogic.UpdateById(id, name, text); - if(comment == null) + try + { + return Json(_commentLogic.UpdateById(id, name, text), JsonRequestBehavior.AllowGet); + } + catch (Exception e) { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); + return Json(e.ToString() , JsonRequestBehavior.AllowGet); } - return Json(comment, JsonRequestBehavior.AllowGet); } - } } \ No newline at end of file diff --git a/WebApp/Controllers/CommentApiController.cs b/WebApp/Controllers/CommentWebApiController.cs similarity index 76% rename from WebApp/Controllers/CommentApiController.cs rename to WebApp/Controllers/CommentWebApiController.cs index 0ab9a9a..3ac5860 100644 --- a/WebApp/Controllers/CommentApiController.cs +++ b/WebApp/Controllers/CommentWebApiController.cs @@ -9,7 +9,7 @@ namespace WebApp.Controllers { - public class CommentApiController : ApiController + public class CommentWebApiController : ApiController { private static ICommentLogic _commentLogic = new CommentLogic(); @@ -29,21 +29,13 @@ public List GetAllComment() public CommentWithoutObjectId GetById(String id) { var comment = _commentLogic.GetById(id); - if (comment == null) - { - throw new Exception("Bad id"); - } return comment; } - [HttpPut, Route("Comment/id{id}")] + [HttpPut, Route("api/Comment/id{id}")] public CommentWithoutObjectId UpdateById(String id, String name, String text) { - var comment = _commentLogic.UpdateById(id, name, text); - if (comment == null) - { - throw new Exception("Bad id"); - } + var comment = _commentLogic.UpdateById(id, name, text); return comment; } } diff --git a/WebApp/Controllers/ImageController.cs b/WebApp/Controllers/ImageController.cs index 6bb9122..839b066 100644 --- a/WebApp/Controllers/ImageController.cs +++ b/WebApp/Controllers/ImageController.cs @@ -12,7 +12,7 @@ namespace WebApp.Controllers { public class ImageController:Controller { - private IImageLogic _imageLogic = new ImageLogic(); + private static IImageLogic _imageLogic = new ImageLogic(); [HttpPost, Route("Image/id{simageId}/comment")] public JsonResult AddCommentToImage(String simageId, String text, String name) @@ -37,12 +37,24 @@ public JsonResult DownloadImage(HttpPostedFileBase uploadImage) [HttpGet, Route("Image/id{id}")] public JsonResult GetById(String id) { - return Json(new { Result = _imageLogic.GetById(id), JsonRequestBehavior.AllowGet }); + try { + return Json(new { Result = _imageLogic.GetById(id), JsonRequestBehavior.AllowGet }); + } + catch (Exception e) + { + return Json(e.ToString(), JsonRequestBehavior.AllowGet); + } } [HttpGet, Route("Image/id{simageId}/comment")] public JsonResult GetCommentFromImage(String simageId) { - return Json(_imageLogic.GetCommentFromImage(simageId), JsonRequestBehavior.AllowGet); + try { + return Json(_imageLogic.GetCommentFromImage(simageId), JsonRequestBehavior.AllowGet); + } + catch (Exception e) + { + return Json(e.ToString(), JsonRequestBehavior.AllowGet); + } } [HttpGet, Route("Image")] public JsonResult Index() @@ -51,8 +63,14 @@ public JsonResult Index() } [HttpPut, Route("Image/id{id}")] public JsonResult UpdateById(String id, String name, String url) - { - return Json(_imageLogic.UpdateById(id, name, url), JsonRequestBehavior.AllowGet); + { + try { + return Json(_imageLogic.UpdateById(id, name, url), JsonRequestBehavior.AllowGet); + } + catch (Exception e) + { + return Json(e.ToString(), JsonRequestBehavior.AllowGet); + } } } } \ No newline at end of file diff --git a/WebApp/Controllers/ImageApiController.cs b/WebApp/Controllers/ImageWebApiController.cs similarity index 97% rename from WebApp/Controllers/ImageApiController.cs rename to WebApp/Controllers/ImageWebApiController.cs index 2a0f677..44dd14f 100644 --- a/WebApp/Controllers/ImageApiController.cs +++ b/WebApp/Controllers/ImageWebApiController.cs @@ -9,7 +9,7 @@ namespace WebApp.Controllers { - public class ImageApiController + public class ImageWebApiController:ApiController { private IImageLogic _imageLogic = new ImageLogic(); diff --git a/WebApp/Controllers/ProjectController.cs b/WebApp/Controllers/ProjectController.cs index ab8c6f0..5c65fc4 100644 --- a/WebApp/Controllers/ProjectController.cs +++ b/WebApp/Controllers/ProjectController.cs @@ -1,265 +1,116 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Web; using System.Web.Mvc; using MongoDB.Bson; using DB.Models; -using System.Web.Helpers; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using DB.Interfaces; +using ControllersLogic.Interfaces; +using ControllersLogic.Logic; namespace WebApp.Controllers { public class ProjectController : Controller { - private IProjectRepository _projectRepository = new DB.Repositories.DBProjectRepository(); - private IImageRepository _imageRepository = new DB.Repositories.DBImageRepository(); - private ICommentRepository _commentRepository = new DB.Repositories.DBCommentRepository(); + private IProjectLogic _projectLogic = new ProjectLogic(); [HttpPost, Route("Project/id{sprojectId}/Comment")] public JsonResult AddCommentToProject(String text, String name, String sprojectId) { - var projectId = new ObjectId(); - if (!ObjectId.TryParse(sprojectId, out projectId)) - { - var result = new { Result = "Bad id it's not objectId" }; - return Json(result, JsonRequestBehavior.AllowGet); - } - if (_projectRepository.GetProjectById(projectId) == null) - { - var result = new { Result = "Bad id it's not found in DB" }; - return Json(result, JsonRequestBehavior.AllowGet); - } - Comment comment = new Comment(); - comment.Text = text; - comment.CreationelData = DateTime.UtcNow; - comment.Name = name; - comment.Version = 1; - var commentId = _commentRepository.AddComment(comment).Id; - _projectRepository.AddCommentToProject(commentId, projectId); - return Json(new { Result = commentId.ToString() }, JsonRequestBehavior.AllowGet); + return Json(new { Result = _projectLogic.AddCommentToProject(text, name, sprojectId) }, JsonRequestBehavior.AllowGet); } [HttpPost, Route("Project/id{sprojectId}/Image")] public JsonResult AddImageToProject(String url, String name, String sprojectId) - { - var projectId = new ObjectId(); - if (!ObjectId.TryParse(sprojectId, out projectId)) - { - var result = new { Result = "Bad id it's not objectId" }; - return Json(result, JsonRequestBehavior.AllowGet); - } - if (_projectRepository.GetProjectById(projectId) == null) - { - var result = new { Result = "Bad id it's not found in DB" }; - return Json(result, JsonRequestBehavior.AllowGet); - } - Image image = new Image(); - image.Url = url; - image.Version = 1; - image.Name = name; - image.CreationelData = DateTime.UtcNow; - var imageId = _imageRepository.AddImage(image).Id; - _projectRepository.AddImageToProject(imageId, projectId); - return Json(new { Result = imageId.ToString() }, JsonRequestBehavior.AllowGet); + { + return Json(new { Result = _projectLogic.AddImageToProject(url, name, sprojectId) }, JsonRequestBehavior.AllowGet); } [HttpPost, Route("Project")] public JsonResult AddProject(String name) { - Project project = new Project(); - project.Name = name; - project.Version = 1; - project.CreationelData = DateTime.UtcNow; - var id = _projectRepository.AddProject(project).Id.ToString(); - return Json(new { Result = id }, JsonRequestBehavior.AllowGet); + return Json(new { Result = _projectLogic.AddProject(name) }, JsonRequestBehavior.AllowGet); } [HttpPost, Route("Project/id{sidRoot}/project")] public JsonResult AddProjectToProject(String sidRoot, String name) { - var idRoot = new ObjectId(); - if (!ObjectId.TryParse(sidRoot, out idRoot)) - { - var result = new { Result = "Bad id it's not objectId" }; - return Json(result, JsonRequestBehavior.AllowGet); - } - if (_projectRepository.GetProjectById(idRoot) == null) - { - var result = new { Result = "Bad id it's not found in DB" }; - return Json(result, JsonRequestBehavior.AllowGet); - } - Project project = new Project(); - project.Name = name; - project.Version = 1; - project.CreationelData = DateTime.UtcNow; - var idNew = _projectRepository.AddProject(project).Id; - _projectRepository.AddProjectToProject(idNew, idRoot); - return Json(new { Result = idNew.ToString() }, JsonRequestBehavior.AllowGet); + return Json(new { Result = _projectLogic.AddProjectToProject(sidRoot, name) }, JsonRequestBehavior.AllowGet); } [HttpDelete, Route("Project/id{id}")] public JsonResult DeleteById(String id) { - var objectId = new ObjectId(); - if (!ObjectId.TryParse(id, out objectId)) - { - return Json(new { Result = "Bad id it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (objectId == null) - { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); - } - if (_projectRepository.GetProjectById(objectId) == null) - { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); - } - _projectRepository.DeleteById(objectId); - return Json(new { Result = "OK" }, JsonRequestBehavior.AllowGet); + return Json(new { Result = _projectLogic.DeleteById(id) }, JsonRequestBehavior.AllowGet); } [HttpDelete, Route("Project/id{projectId}/comment/id{commentId}")] public JsonResult DeleteCommentFromProject(String projectId, String commentId) { - var objectIdProject = new ObjectId(); - var objectIdComment = new ObjectId(); - if (!ObjectId.TryParse(projectId, out objectIdProject)) - { - return Json(new { Result = "Bad id project it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (!ObjectId.TryParse(commentId, out objectIdComment)) - { - return Json(new { Result = "Bad id coomment it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (_projectRepository.GetProjectById(objectIdProject) == null) - { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); - } - _projectRepository.DeleteCommentFromProject(objectIdProject, objectIdComment); - _commentRepository.DeleteById(objectIdComment); - return Json(new { Result = "OK" }, JsonRequestBehavior.AllowGet); + return Json(new { Result = _projectLogic.DeleteCommentFromProject(projectId, commentId)}, JsonRequestBehavior.AllowGet); } [HttpDelete, Route("Project/id{projectId}/image/id{imageId}")] public JsonResult DeleteImageFromProject(String projectId, String imageId) { - var objectIdProject = new ObjectId(); - var objectIdImage = new ObjectId(); - if (!ObjectId.TryParse(projectId, out objectIdProject)) - { - return Json(new { Result = "Bad id project it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (!ObjectId.TryParse(imageId, out objectIdImage)) - { - return Json(new { Result = "Bad id image it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (_projectRepository.GetProjectById(objectIdProject) == null) - { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); - } - _projectRepository.DeleteImageFromProject(objectIdProject, objectIdImage); - _imageRepository.DeleteById(objectIdImage); - return Json(new { Result = "OK" }, JsonRequestBehavior.AllowGet); + return Json(new { Result = _projectLogic.DeleteImageFromProject(projectId, imageId) }, JsonRequestBehavior.AllowGet); } [HttpGet, Route("Project/id{id}")] public JsonResult GetById(String id) { - var objectId = new ObjectId(); - if (!ObjectId.TryParse(id, out objectId)) + try { - return Json(new { Result = "Bad id it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (objectId == null) - { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); + return Json(new { Result = _projectLogic.GetById(id) }, JsonRequestBehavior.AllowGet); } - var project = ProjectWithoutObjectId.ProjectToProjectWithoutObjectId(_projectRepository.GetProjectById(objectId)); - if (project == null) + catch (Exception e) { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); + return Json(new { Result = e.ToString() }, JsonRequestBehavior.AllowGet); } - return Json(project, JsonRequestBehavior.AllowGet); } [HttpGet, Route("Project/id{sidRoot}/Comment")] public JsonResult GetCommentsFormProject(String sidRoot) { - var idRoot = new ObjectId(); - if (!ObjectId.TryParse(sidRoot, out idRoot)) + try { - var result = new List(); - result.Add(new { Result = "Bad id it's not objectId" }); - return Json(result, JsonRequestBehavior.AllowGet); + return Json(_projectLogic.GetCommentsFormProject(sidRoot), JsonRequestBehavior.AllowGet); } - var project = _projectRepository.GetProjectById(idRoot); - if (project == null) + catch (Exception e) { - var result = new List(); - result.Add(new { Result = "Bad id it's not found in DB" }); - return Json(result, JsonRequestBehavior.AllowGet); + return Json(new { Result = e.ToString() }, JsonRequestBehavior.AllowGet); } - var movies = CommentWithoutObjectId.CommentsToCommentWithoutObjectId(_commentRepository.GetCommentsByIds(project.Comments)); - return Json(movies, JsonRequestBehavior.AllowGet); } [HttpGet, Route("Project/id{sidRoot}/Image")] public JsonResult GetImagesFormProject(String sidRoot) { - var idRoot = new ObjectId(); - if (!ObjectId.TryParse(sidRoot, out idRoot)) + try { - var result = new List(); - result.Add(new { Result = "Bad id it's not objectId" }); - return Json(result, JsonRequestBehavior.AllowGet); + return Json(_projectLogic.GetImagesFormProject(sidRoot), JsonRequestBehavior.AllowGet); } - var project = _projectRepository.GetProjectById(idRoot); - if (project == null) + catch (Exception e) { - var result = new List(); - result.Add(new { Result = "Bad id it's not found in DB" }); - return Json(result, JsonRequestBehavior.AllowGet); + return Json(new { Result = e.ToString() }, JsonRequestBehavior.AllowGet); } - var movies = ImageWithoutObjectId.ImagesToImageWithoutObjectId(_imageRepository.GetImagesByIds(project.Images)); - return Json(movies, JsonRequestBehavior.AllowGet); } [HttpGet, Route("Project/id{sidRoot}/Project")] public JsonResult GetPtojectsFormProject(String sidRoot) { - var idRoot = new ObjectId(); - if (!ObjectId.TryParse(sidRoot, out idRoot)) - { - return Json(new { Result = "Bad id it's not objectId" }, JsonRequestBehavior.AllowGet); + try + { + return Json(_projectLogic.GetPtojectsFormProject(sidRoot), JsonRequestBehavior.AllowGet); } - var project = _projectRepository.GetProjectById(idRoot); - if (project == null) + catch (Exception e) { - return Json(new { Result = "Bad id it's not found in DB" }, JsonRequestBehavior.AllowGet); + return Json(new { Result = e.ToString() }, JsonRequestBehavior.AllowGet); } - var movies = ProjectWithoutObjectId.ProjectsToProjectWithoutObjectId(_projectRepository.GetProjectsByIds(project.Projects)); - return Json(movies, JsonRequestBehavior.AllowGet); } [HttpGet, Route("Project")] public JsonResult Index() { - var projects = ProjectWithoutObjectId.ProjectsToProjectWithoutObjectId(_projectRepository.GetAllProject()); - return Json(projects, JsonRequestBehavior.AllowGet); + return Json(_projectLogic.GetAllProjects(), JsonRequestBehavior.AllowGet); } [HttpPut, Route("Project/id{id}")] public JsonResult UpdateById(String id, String name) { - var objectId = new ObjectId(); - if (!ObjectId.TryParse(id, out objectId)) - { - return Json(new { Result = "Bad id it's not objectId" }, JsonRequestBehavior.AllowGet); - } - if (objectId == null) + try { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); + return Json(_projectLogic.UpdateById(id, name), JsonRequestBehavior.AllowGet); } - var project = _projectRepository.GetProjectById(objectId); - if (project == null) + catch (Exception e) { - return Json(new { Result = "Bad id" }, JsonRequestBehavior.AllowGet); + return Json(new { Result = e.ToString() }, JsonRequestBehavior.AllowGet); } - project.Name = name; - project.Version++; - _projectRepository.DeleteById(objectId); - _projectRepository.AddProject(project); - return Json(ProjectWithoutObjectId.ProjectToProjectWithoutObjectId(project), JsonRequestBehavior.AllowGet); } } } \ No newline at end of file diff --git a/WebApp/Controllers/ProjectWebApiController.cs b/WebApp/Controllers/ProjectWebApiController.cs new file mode 100644 index 0000000..51be8d4 --- /dev/null +++ b/WebApp/Controllers/ProjectWebApiController.cs @@ -0,0 +1,80 @@ +using System.Web.Http; +using System; +using ControllersLogic.Interfaces; +using ControllersLogic.Logic; +using DB.Models; +using System.Collections.Generic; + +namespace WebApp.Controllers +{ + public class ProjectWebApiController:ApiController + { + private IProjectLogic _projectLogic = new ProjectLogic(); + + [HttpPost, Route("api/Project/id{sprojectId}/Comment")] + public String AddCommentToProject(String text, String name, String sprojectId) + { + return _projectLogic.AddCommentToProject(text, name, sprojectId); + } + [HttpPost, Route("api/Project/id{sprojectId}/Image")] + public String AddImageToProject(String url, String name, String sprojectId) + { + return _projectLogic.AddImageToProject(url, name, sprojectId); + } + [HttpPost, Route("api/Project")] + public String AddProject(String name) + { + return _projectLogic.AddProject(name); + } + [HttpPost, Route("api/Project/id{sidRoot}/project")] + public String AddProjectToProject(String sidRoot, String name) + { + return _projectLogic.AddProjectToProject(sidRoot, name); + } + [HttpDelete, Route("api/Project/id{id}")] + public String DeleteById(String id) + { + return _projectLogic.DeleteById(id); + } + [HttpDelete, Route("api/Project/id{projectId}/comment/id{commentId}")] + public String DeleteCommentFromProject(String projectId, String commentId) + { + return _projectLogic.DeleteCommentFromProject(projectId, commentId); + } + [HttpDelete, Route("api/Project/id{projectId}/image/id{imageId}")] + public String DeleteImageFromProject(String projectId, String imageId) + { + return _projectLogic.DeleteImageFromProject(projectId, imageId); + } + [HttpGet, Route("api/Project/id{id}")] + public ProjectWithoutObjectId GetById(String id) + { + return _projectLogic.GetById(id); + } + [HttpGet, Route("api/Project/id{sidRoot}/Comment")] + public List GetCommentsFormProject(String sidRoot) + { + return _projectLogic.GetCommentsFormProject(sidRoot); + } + [HttpGet, Route("api/Project/id{sidRoot}/Image")] + public List GetImagesFormProject(String sidRoot) + { + return _projectLogic.GetImagesFormProject(sidRoot); + } + [HttpGet, Route("api/Project/id{sidRoot}/Project")] + public List GetPtojectsFormProject(String sidRoot) + { + return _projectLogic.GetPtojectsFormProject(sidRoot); + } + [HttpGet, Route("api/Project")] + public List Index() + { + return _projectLogic.GetAllProjects(); + } + [HttpPut, Route("api/Project/id{id}")] + public ProjectWithoutObjectId UpdateById(String id, String name) + { + return _projectLogic.UpdateById(id, name); + } + } +} \ No newline at end of file diff --git a/WebApp/Views/Home/About.cshtml b/WebApp/Views/Home/About.cshtml deleted file mode 100644 index 4b2d9e8..0000000 --- a/WebApp/Views/Home/About.cshtml +++ /dev/null @@ -1,7 +0,0 @@ -@{ - ViewBag.Title = "About"; -} -

@ViewBag.Title.

-

@ViewBag.Message

- -

Use this area to provide additional information.

diff --git a/WebApp/Views/Home/Index.cshtml b/WebApp/Views/Home/Index.cshtml index d682633..e4b4930 100644 --- a/WebApp/Views/Home/Index.cshtml +++ b/WebApp/Views/Home/Index.cshtml @@ -50,7 +50,7 @@
  • /project/id{id}/project -

    Получить все подпроекты к проекта

    +

    Получить все подпроекты к проекта

  • /project/id{id}/project @@ -59,6 +59,12 @@
  • /project/id{id}/image

    Получить все картинки из корня проекта

    +
  • /project/id{id}/image diff --git a/WebApp/Views/Home/Project.cshtml b/WebApp/Views/Home/Project.cshtml deleted file mode 100644 index 0f4327e..0000000 --- a/WebApp/Views/Home/Project.cshtml +++ /dev/null @@ -1,17 +0,0 @@ -@{ - ViewBag.Title = "Contact"; -} -

    @ViewBag.Title.

    -

    @ViewBag.Message

    - -
    - One Microsoft Way
    - Redmond, WA 98052-6399
    - P: - 425.555.0100 -
    - -
    - Support: Support@example.com
    - Marketing: Marketing@example.com -
    \ No newline at end of file diff --git a/WebApp/Views/Shared/_Layout.cshtml b/WebApp/Views/Shared/_Layout.cshtml index 8549837..f81c784 100644 --- a/WebApp/Views/Shared/_Layout.cshtml +++ b/WebApp/Views/Shared/_Layout.cshtml @@ -18,6 +18,7 @@ @Html.ActionLink("Ease-L", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" }) + @Html.ActionLink("Documentation", "Index", "Help", new { area = "" }, new { @class = "navbar-brand" })
      diff --git a/WebApp/WebApp.csproj b/WebApp/WebApp.csproj index dca003e..cc43df7 100644 --- a/WebApp/WebApp.csproj +++ b/WebApp/WebApp.csproj @@ -228,12 +228,13 @@ - + - + + Global.asax @@ -308,8 +309,6 @@ - - From 7c2512a72a35c9e4c86ca6995628de3fe62afcab Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Sun, 7 Aug 2016 15:36:20 +0300 Subject: [PATCH 10/24] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B3=D0=B5?= =?UTF-8?q?=D0=BD=D0=B5=D1=80=D0=B8=D1=80=D1=83=D0=B5=D0=BC=D1=83=D1=8E=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebApp/App_Data/XmlDocument.xml | 674 ++++++++++++++++++ WebApp/App_Start/RouteConfig.cs | 4 +- WebApp/App_Start/WebApiConfig.cs | 4 +- .../HelpPage/App_Start/HelpPageConfig.cs | 1 + WebApp/Controllers/CommentWebApiController.cs | 26 +- WebApp/Controllers/ImageWebApiController.cs | 60 +- WebApp/Controllers/ProjectWebApiController.cs | 83 ++- WebApp/WebApp.csproj | 1 + 8 files changed, 832 insertions(+), 21 deletions(-) create mode 100644 WebApp/App_Data/XmlDocument.xml diff --git a/WebApp/App_Data/XmlDocument.xml b/WebApp/App_Data/XmlDocument.xml new file mode 100644 index 0000000..228033a --- /dev/null +++ b/WebApp/App_Data/XmlDocument.xml @@ -0,0 +1,674 @@ + + + + WebApp + + + + + Generates an URI-friendly ID for the . E.g. "Get-Values-id_name" instead of "GetValues/{id}?name={name}" + + The . + The ID as a string. + + + + Use this class to customize the Help Page. + For example you can set a custom to supply the documentation + or you can provide the samples for the requests/responses. + + + + + The controller that will handle requests for the help page. + + + + + Sets the documentation provider for help page. + + The . + The documentation provider. + + + + Sets the objects that will be used by the formatters to produce sample requests/responses. + + The . + The sample objects. + + + + Sets the sample request directly for the specified media type and action. + + The . + The sample request. + The media type. + Name of the controller. + Name of the action. + + + + Sets the sample request directly for the specified media type and action with parameters. + + The . + The sample request. + The media type. + Name of the controller. + Name of the action. + The parameter names. + + + + Sets the sample request directly for the specified media type of the action. + + The . + The sample response. + The media type. + Name of the controller. + Name of the action. + + + + Sets the sample response directly for the specified media type of the action with specific parameters. + + The . + The sample response. + The media type. + Name of the controller. + Name of the action. + The parameter names. + + + + Sets the sample directly for all actions with the specified media type. + + The . + The sample. + The media type. + + + + Sets the sample directly for all actions with the specified type and media type. + + The . + The sample. + The media type. + The parameter type or return type of an action. + + + + Specifies the actual type of passed to the in an action. + The help page will use this information to produce more accurate request samples. + + The . + The type. + Name of the controller. + Name of the action. + + + + Specifies the actual type of passed to the in an action. + The help page will use this information to produce more accurate request samples. + + The . + The type. + Name of the controller. + Name of the action. + The parameter names. + + + + Specifies the actual type of returned as part of the in an action. + The help page will use this information to produce more accurate response samples. + + The . + The type. + Name of the controller. + Name of the action. + + + + Specifies the actual type of returned as part of the in an action. + The help page will use this information to produce more accurate response samples. + + The . + The type. + Name of the controller. + Name of the action. + The parameter names. + + + + Gets the help page sample generator. + + The . + The help page sample generator. + + + + Sets the help page sample generator. + + The . + The help page sample generator. + + + + Gets the model description generator. + + The configuration. + The + + + + Gets the model that represents an API displayed on the help page. The model is initialized on the first call and cached for subsequent calls. + + The . + The ID. + + An + + + + + Describes a type model. + + + + + Generates model descriptions for given types. + + + + + Use this attribute to change the name of the generated for a type. + + + + + The model that represents an API displayed on the help page. + + + + + Initializes a new instance of the class. + + + + + Gets or sets the that describes the API. + + + + + Gets or sets the collection that describes the URI parameters for the API. + + + + + Gets or sets the documentation for the request. + + + + + Gets or sets the that describes the request body. + + + + + Gets the request body parameter descriptions. + + + + + Gets or sets the that describes the resource. + + + + + Gets the resource property descriptions. + + + + + Gets the sample requests associated with the API. + + + + + Gets the sample responses associated with the API. + + + + + Gets the error messages associated with this model. + + + + + This class will generate the samples for the help page. + + + + + Initializes a new instance of the class. + + + + + Gets CLR types that are used as the content of or . + + + + + Gets the objects that are used directly as samples for certain actions. + + + + + Gets the objects that are serialized as samples by the supported formatters. + + + + + Gets factories for the objects that the supported formatters will serialize as samples. Processed in order, + stopping when the factory successfully returns a non- object. + + + Collection includes just initially. Use + SampleObjectFactories.Insert(0, func) to provide an override and + SampleObjectFactories.Add(func) to provide a fallback. + + + + Gets the request body samples for a given . + + The . + The samples keyed by media type. + + + + Gets the response body samples for a given . + + The . + The samples keyed by media type. + + + + Gets the request or response body samples. + + The . + The value indicating whether the sample is for a request or for a response. + The samples keyed by media type. + + + + Search for samples that are provided directly through . + + Name of the controller. + Name of the action. + The parameter names. + The CLR type. + The formatter. + The media type. + The value indicating whether the sample is for a request or for a response. + The sample that matches the parameters. + + + + Gets the sample object that will be serialized by the formatters. + First, it will look at the . If no sample object is found, it will try to create + one using (which wraps an ) and other + factories in . + + The type. + The sample object. + + + + Resolves the actual type of passed to the in an action. + + The . + The type. + + + + Resolves the type of the action parameter or return value when or is used. + + The . + Name of the controller. + Name of the action. + The parameter names. + The value indicating whether the sample is for a request or a response. + The formatters. + + + + Writes the sample object using formatter. + + The formatter. + The value. + The type. + Type of the media. + + + + + This is used to identify the place where the sample should be applied. + + + + + Creates a new based on media type. + + The media type. + + + + Creates a new based on media type and CLR type. + + The media type. + The CLR type. + + + + Creates a new based on , controller name, action name and parameter names. + + The . + Name of the controller. + Name of the action. + The parameter names. + + + + Creates a new based on media type, , controller name, action name and parameter names. + + The media type. + The . + Name of the controller. + Name of the action. + The parameter names. + + + + Gets the name of the controller. + + + The name of the controller. + + + + + Gets the name of the action. + + + The name of the action. + + + + + Gets the media type. + + + The media type. + + + + + Gets the parameter names. + + + + + Gets the . + + + + + This represents an image sample on the help page. There's a display template named ImageSample associated with this class. + + + + + Initializes a new instance of the class. + + The URL of an image. + + + + This represents an invalid sample on the help page. There's a display template named InvalidSample associated with this class. + + + + + This class will create an object of a given type and populate it with sample data. + + + + + Generates an object for a given type. The type needs to be public, have a public default constructor and settable public properties/fields. Currently it supports the following types: + Simple types: , , , , , etc. + Complex types: POCO types. + Nullables: . + Arrays: arrays of simple types or complex types. + Key value pairs: + Tuples: , , etc + Dictionaries: or anything deriving from . + Collections: , , , , , or anything deriving from or . + Queryables: , . + + The type. + An object of the given type. + + + + Indicates whether the sample is used for request or response + + + + + This represents a preformatted text sample on the help page. There's a display template named TextSample associated with this class. + + + + + A custom that reads the API documentation from an XML documentation file. + + + + + Initializes a new instance of the class. + + The physical path to XML document. + + + + Make new comment. + + Text + Name + Return id new comment + + + + Get all comments + + all comments + + + + Get comment by id + + Id + + + + + Update comment by id + + Id + New name + New text + New Comment + + + + Add comment to image + + Image id + Comment text + Comment name + Id new comment + + + + Make new image + + Image url + Name + Id new image + + + + Delete comment from image + + Imgae id + Comment id + Result + + + + Download image for getting url + + Uploded image, HttpPostedFileBase + Image url + + + + Get all image + + List image + + + + Get image by id + + Id + Image + + + + Get comments from image + + Image id + List comments + + + + Update image + + Id + New name + New url + New Image + + + + Add new comment to project + + Text + Name + Project id + Id new project + + + + Add new image to ptoject + + Image url + Name + Project id + Id new image + + + + Add new project + + Name + Id new project + + + + Add new project into ptoject + + Id root project + Name new project + Id new project + + + + Delete project by id + + Deleted project id + Result + + + + GetAllProject + + List project + + + + Delete comment from project + + Project id + Comment id + Result + + + + Delete image from project + + Project id + Image id + Result + + + + Get project by id + + Id + Project + + + + Get comment from project + + Id project + List id comments + + + + Get image from project + + Id project + List id images + + + + Get project from project + + Id root project + List id projects + + + + Update project by id + + Id + New name + New project + + + diff --git a/WebApp/App_Start/RouteConfig.cs b/WebApp/App_Start/RouteConfig.cs index a480d83..431d5a3 100644 --- a/WebApp/App_Start/RouteConfig.cs +++ b/WebApp/App_Start/RouteConfig.cs @@ -4,6 +4,7 @@ using System.Web; using System.Web.Mvc; using System.Web.Routing; +using WebApp.Areas.HelpPage; namespace WebApp { @@ -13,8 +14,7 @@ public static void RegisterRoutes(RouteCollection routes) { routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); - routes.MapMvcAttributeRoutes(); - + routes.MapMvcAttributeRoutes(); routes.MapRoute( name: "Default", url: "{controller}/{action}/{id}", diff --git a/WebApp/App_Start/WebApiConfig.cs b/WebApp/App_Start/WebApiConfig.cs index 6b68e62..c451248 100644 --- a/WebApp/App_Start/WebApiConfig.cs +++ b/WebApp/App_Start/WebApiConfig.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Net.Http.Headers; using System.Web; using System.Web.Http; +using WebApp.Areas.HelpPage; namespace WebApp.App_Start { @@ -14,7 +16,7 @@ public static void Register(HttpConfiguration config) // Web API routes config.MapHttpAttributeRoutes(); - + config.Formatters.JsonFormatter.SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/html")); config.Routes.MapHttpRoute( name: "DefaultApi", routeTemplate: "api/{controller}/{id}", diff --git a/WebApp/Areas/HelpPage/App_Start/HelpPageConfig.cs b/WebApp/Areas/HelpPage/App_Start/HelpPageConfig.cs index 7a7bf52..841188a 100644 --- a/WebApp/Areas/HelpPage/App_Start/HelpPageConfig.cs +++ b/WebApp/Areas/HelpPage/App_Start/HelpPageConfig.cs @@ -55,6 +55,7 @@ public static void Register(HttpConfiguration config) // Extend the following to use a preset object directly as the sample for all actions that support a media // type, regardless of the body parameter or return type. The lines below avoid display of binary content. // The BsonMediaTypeFormatter (if available) is not used to serialize the TextSample object. + config.SetDocumentationProvider(new XmlDocumentationProvider(HttpContext.Current.Server.MapPath("~/App_Data/XmlDocument.xml"))); config.SetSampleForMediaType( new TextSample("Binary JSON content. See http://bsonspec.org for details."), new MediaTypeHeaderValue("application/bson")); diff --git a/WebApp/Controllers/CommentWebApiController.cs b/WebApp/Controllers/CommentWebApiController.cs index 3ac5860..c0d68ba 100644 --- a/WebApp/Controllers/CommentWebApiController.cs +++ b/WebApp/Controllers/CommentWebApiController.cs @@ -12,26 +12,44 @@ namespace WebApp.Controllers public class CommentWebApiController : ApiController { private static ICommentLogic _commentLogic = new CommentLogic(); - + /// + /// Make new comment. + /// + /// Text + /// Name + /// Return id new comment [HttpPost, Route("api/Comment")] public String AddComment(String text, String name) { return _commentLogic.AddComment(text, name); } - + /// + /// Get all comments + /// + /// all comments [HttpGet, Route("api/Comment")] public List GetAllComment() { return _commentLogic.GetAllComment(); } - + /// + /// Get comment by id + /// + /// Id + /// [HttpGet, Route("api/Comment/id{id}")] public CommentWithoutObjectId GetById(String id) { var comment = _commentLogic.GetById(id); return comment; } - + /// + /// Update comment by id + /// + /// Id + /// New name + /// New text + /// New Comment [HttpPut, Route("api/Comment/id{id}")] public CommentWithoutObjectId UpdateById(String id, String name, String text) { diff --git a/WebApp/Controllers/ImageWebApiController.cs b/WebApp/Controllers/ImageWebApiController.cs index 44dd14f..d57b606 100644 --- a/WebApp/Controllers/ImageWebApiController.cs +++ b/WebApp/Controllers/ImageWebApiController.cs @@ -12,42 +12,86 @@ namespace WebApp.Controllers public class ImageWebApiController:ApiController { private IImageLogic _imageLogic = new ImageLogic(); - + /// + /// Add comment to image + /// + /// Image id + /// Comment text + /// Comment name + /// Id new comment [HttpPost, Route("api/Image/id{simageId}/comment")] public String AddCommentToImage(String simageId, String text, String name) { return _imageLogic.AddCommentToImage(simageId, text, name); } + /// + /// Make new image + /// + /// Image url + /// Name + /// Id new image [HttpPost, Route("api/Image")] public String AddImage(String url, String name) { return _imageLogic.AddImage(url, name); } + /// + /// Delete comment from image + /// + /// Imgae id + /// Comment id + /// Result [HttpDelete, Route("api/Image/id{idImage}/comment/id{idComment}")] public String DeleteCommentFromImage(String idImage, String idComment) { return _imageLogic.DeleteCommentFromImage(idImage, idComment); } + /// + /// Download image for getting url + /// + /// Uploded image, HttpPostedFileBase + /// Image url [HttpPost, Route("api/Image/Download")] public String DownloadImage(HttpPostedFileBase uploadImage) { return _imageLogic.DownloadImage(uploadImage); } + /// + /// Get all image + /// + /// List image + [HttpGet, Route("api/Image")] + public List GetAllImage() + { + return _imageLogic.GetAllImage(); + } + /// + /// Get image by id + /// + /// Id + /// Image [HttpGet, Route("api/Image/id{id}")] public ImageWithoutObjectId GetById(String id) { return _imageLogic.GetById(id); } + /// + /// Get comments from image + /// + /// Image id + /// List comments [HttpGet, Route("api/Image/id{simageId}/comment")] - public List GetCommentFromImage(String simageId) + public List GetCommentsFromImage(String simageId) { return _imageLogic.GetCommentFromImage(simageId); - } - [HttpGet, Route("api/Image")] - public List index() - { - return _imageLogic.GetAllImage(); - } + } + /// + /// Update image + /// + /// Id + /// New name + /// New url + /// New Image [HttpPut, Route("api/Image/id{id}")] public ImageWithoutObjectId UpdateById(String id, String name, String url) { diff --git a/WebApp/Controllers/ProjectWebApiController.cs b/WebApp/Controllers/ProjectWebApiController.cs index 51be8d4..24d98d0 100644 --- a/WebApp/Controllers/ProjectWebApiController.cs +++ b/WebApp/Controllers/ProjectWebApiController.cs @@ -10,67 +10,138 @@ namespace WebApp.Controllers public class ProjectWebApiController:ApiController { private IProjectLogic _projectLogic = new ProjectLogic(); - + /// + /// Add new comment to project + /// + /// Text + /// Name + /// Project id + /// Id new project [HttpPost, Route("api/Project/id{sprojectId}/Comment")] public String AddCommentToProject(String text, String name, String sprojectId) { return _projectLogic.AddCommentToProject(text, name, sprojectId); } + /// + /// Add new image to ptoject + /// + /// Image url + /// Name + /// Project id + /// Id new image [HttpPost, Route("api/Project/id{sprojectId}/Image")] public String AddImageToProject(String url, String name, String sprojectId) { return _projectLogic.AddImageToProject(url, name, sprojectId); } + /// + /// Add new project + /// + /// Name + /// Id new project [HttpPost, Route("api/Project")] public String AddProject(String name) { return _projectLogic.AddProject(name); } + /// + /// Add new project into ptoject + /// + /// Id root project + /// Name new project + /// Id new project [HttpPost, Route("api/Project/id{sidRoot}/project")] public String AddProjectToProject(String sidRoot, String name) { return _projectLogic.AddProjectToProject(sidRoot, name); } + /// + /// Delete project by id + /// + /// Deleted project id + /// Result [HttpDelete, Route("api/Project/id{id}")] public String DeleteById(String id) { return _projectLogic.DeleteById(id); } + /// + /// GetAllProject + /// + /// List project + [HttpGet, Route("api/Project")] + public List GetAllProject() + { + return _projectLogic.GetAllProjects(); + } + /// + /// Delete comment from project + /// + /// Project id + /// Comment id + /// Result [HttpDelete, Route("api/Project/id{projectId}/comment/id{commentId}")] public String DeleteCommentFromProject(String projectId, String commentId) { return _projectLogic.DeleteCommentFromProject(projectId, commentId); } + /// + /// Delete image from project + /// + /// Project id + /// Image id + /// Result [HttpDelete, Route("api/Project/id{projectId}/image/id{imageId}")] public String DeleteImageFromProject(String projectId, String imageId) { return _projectLogic.DeleteImageFromProject(projectId, imageId); } + /// + /// Get project by id + /// + /// Id + /// Project [HttpGet, Route("api/Project/id{id}")] public ProjectWithoutObjectId GetById(String id) { return _projectLogic.GetById(id); } + /// + /// Get comment from project + /// + /// Id project + /// List id comments [HttpGet, Route("api/Project/id{sidRoot}/Comment")] public List GetCommentsFormProject(String sidRoot) { return _projectLogic.GetCommentsFormProject(sidRoot); } + /// + /// Get image from project + /// + /// Id project + /// List id images [HttpGet, Route("api/Project/id{sidRoot}/Image")] public List GetImagesFormProject(String sidRoot) { return _projectLogic.GetImagesFormProject(sidRoot); } + /// + /// Get project from project + /// + /// Id root project + /// List id projects [HttpGet, Route("api/Project/id{sidRoot}/Project")] public List GetPtojectsFormProject(String sidRoot) { return _projectLogic.GetPtojectsFormProject(sidRoot); } - [HttpGet, Route("api/Project")] - public List Index() - { - return _projectLogic.GetAllProjects(); - } + /// + /// Update project by id + /// + /// Id + /// New name + /// New project [HttpPut, Route("api/Project/id{id}")] public ProjectWithoutObjectId UpdateById(String id, String name) { diff --git a/WebApp/WebApp.csproj b/WebApp/WebApp.csproj index cc43df7..f63bec4 100644 --- a/WebApp/WebApp.csproj +++ b/WebApp/WebApp.csproj @@ -34,6 +34,7 @@ DEBUG;TRACE prompt 4 + App_Data/XmlDocument.xml pdbonly From ec28ad4e52ce746612b12f425d06e150b2d927da Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Sun, 7 Aug 2016 16:55:53 +0300 Subject: [PATCH 11/24] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=20=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5?= =?UTF-8?q?=D1=80=D0=B6=D0=BA=D1=83=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9?= =?UTF-8?q?=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ControllersLogic/Interfaces/IImageLogic.cs | 1 + ControllersLogic/Logic/ImageLogic.cs | 33 +++++++++++++++++++-- DB/Interfaces/IImageRepository.cs | 1 + DB/Models/Image.cs | 3 +- DB/Repositories/DBImageRepository.cs | 5 ++++ DB/Repositories/DBProjectRepository.cs | 2 +- WebApp/App_Data/XmlDocument.xml | 8 +++++ WebApp/Controllers/ImageController.cs | 4 +-- WebApp/Controllers/ImageWebApiController.cs | 11 +++++++ 9 files changed, 61 insertions(+), 7 deletions(-) diff --git a/ControllersLogic/Interfaces/IImageLogic.cs b/ControllersLogic/Interfaces/IImageLogic.cs index e8fe6d5..7d7c350 100644 --- a/ControllersLogic/Interfaces/IImageLogic.cs +++ b/ControllersLogic/Interfaces/IImageLogic.cs @@ -16,6 +16,7 @@ public interface IImageLogic String DownloadImage(HttpPostedFileBase uploadImage); List GetAllImage(); ImageWithoutObjectId GetById(String id); + ImageWithoutObjectId GetByIdAndVersion(String id, int version); List GetCommentFromImage(String simageId); ImageWithoutObjectId UpdateById(String id, String name, String url); } diff --git a/ControllersLogic/Logic/ImageLogic.cs b/ControllersLogic/Logic/ImageLogic.cs index 011d6c8..cff98d5 100644 --- a/ControllersLogic/Logic/ImageLogic.cs +++ b/ControllersLogic/Logic/ImageLogic.cs @@ -41,8 +41,11 @@ public String AddImage(String url, String name) image.Version = 1; image.Name = name; image.CreationelData = DateTime.UtcNow; - var id = _imageRepository.AddImage(image).Id.ToString(); - return id; + var id = _imageRepository.AddImage(image).Id; + image.StartId = id.ToString(); + _imageRepository.DeleteById(id); + _imageRepository.AddImage(image); + return id.ToString(); } public String DeleteCommentFromImage(String idImage, String idComment) { @@ -97,7 +100,7 @@ public ImageWithoutObjectId GetById(String id) { throw new Exception("Bad id it's not objectId"); } - if (objectId == null || _imageRepository.GetImageById(objectId) == null) + if (objectId == null) { throw new Exception("Bad id"); } @@ -108,6 +111,24 @@ public ImageWithoutObjectId GetById(String id) } return image; } + public ImageWithoutObjectId GetByIdAndVersion(String id, int version) + { + var objectId = new ObjectId(); + if (!ObjectId.TryParse(id, out objectId)) + { + throw new Exception("Bad id it's not objectId"); + } + if (objectId == null) + { + throw new Exception("Bad id"); + } + var image = ImageWithoutObjectId.ImageToImageWithoutObjectId(_imageRepository.GetImageByIdAndVersion(objectId, version)); + if (image == null) + { + throw new Exception("Bad id"); + } + return image; + } public List GetCommentFromImage(String simageId) { var imageId = new ObjectId(); @@ -135,15 +156,21 @@ public ImageWithoutObjectId UpdateById(String id, String name, String url) throw new Exception("Bad id"); } var image = _imageRepository.GetImageById(objectId); + Image prev_image = image; if (image == null) { throw new Exception("Bad id"); } image.Url = url; image.Version++; + prev_image.Version--; image.Name = name; + image.StartId = id; _imageRepository.DeleteById(objectId); _imageRepository.AddImage(image); + prev_image.Id = new ObjectId(); + prev_image.StartId = id; + _imageRepository.AddImage(prev_image); return ImageWithoutObjectId.ImageToImageWithoutObjectId(image); } } diff --git a/DB/Interfaces/IImageRepository.cs b/DB/Interfaces/IImageRepository.cs index 0c1538f..703ecd9 100644 --- a/DB/Interfaces/IImageRepository.cs +++ b/DB/Interfaces/IImageRepository.cs @@ -15,6 +15,7 @@ public interface IImageRepository void DeleteCommentFromImage(ObjectId imageId, ObjectId commentId); Image AddImage(Image image); Image GetImageById(ObjectId id); + Image GetImageByIdAndVersion(ObjectId id, int version); List GetAllImage(); void AddCommentToImage(ObjectId newComments, ObjectId idImage); List GetImagesByIds(List ids); diff --git a/DB/Models/Image.cs b/DB/Models/Image.cs index 4550518..781c1f1 100644 --- a/DB/Models/Image.cs +++ b/DB/Models/Image.cs @@ -11,6 +11,7 @@ public class Image:BaseEntity { public List Comments { get; set; } public String Url { get; set; } + public String StartId { get; set; } public Image() { this.Comments = new List(); @@ -36,7 +37,7 @@ public static ImageWithoutObjectId ImageToImageWithoutObjectId(Image image) Url = image.Url, Version = image.Version, Name = image.Name, - Id = image.Id.ToString(), + Id = image.StartId, CreationelData = image.CreationelData, Comments = new List()}; if (image.Comments != null) diff --git a/DB/Repositories/DBImageRepository.cs b/DB/Repositories/DBImageRepository.cs index 2cd8adb..f630db9 100644 --- a/DB/Repositories/DBImageRepository.cs +++ b/DB/Repositories/DBImageRepository.cs @@ -64,6 +64,11 @@ public Image GetImageById(ObjectId id) { return _imageCollection.AsQueryable().FirstOrDefault(im => im.Id.Equals(id)); } + public Image GetImageByIdAndVersion(ObjectId id, int version) + { + return _imageCollection.AsQueryable().FirstOrDefault(im => im.Id.Equals(id) && im.Version.Equals(version)); + } + public List GetImagesByIds(List ids) { return _imageCollection.AsQueryable().Where(i => ids.Contains(i.Id)).ToList(); diff --git a/DB/Repositories/DBProjectRepository.cs b/DB/Repositories/DBProjectRepository.cs index 26d7fbc..ace5345 100644 --- a/DB/Repositories/DBProjectRepository.cs +++ b/DB/Repositories/DBProjectRepository.cs @@ -27,7 +27,7 @@ public void DeleteById(ObjectId id) } public void DeleteAll() { - _projectCollection.DeleteMany(p => p.Id.Equals(p.Id)); + _projectCollection.DeleteMany(p => true); } public void DeleteCommentFromProject(ObjectId projectId, ObjectId commentId) diff --git a/WebApp/App_Data/XmlDocument.xml b/WebApp/App_Data/XmlDocument.xml index 228033a..2ebb9ce 100644 --- a/WebApp/App_Data/XmlDocument.xml +++ b/WebApp/App_Data/XmlDocument.xml @@ -556,6 +556,14 @@ Id Image + + + Get image by id and version + + Id + Version + Image + Get comments from image diff --git a/WebApp/Controllers/ImageController.cs b/WebApp/Controllers/ImageController.cs index 839b066..9c5f98c 100644 --- a/WebApp/Controllers/ImageController.cs +++ b/WebApp/Controllers/ImageController.cs @@ -32,13 +32,13 @@ public JsonResult DeleteCommentFromImage(String idImage, String idComment) [HttpPost, Route("Image/Download")] public JsonResult DownloadImage(HttpPostedFileBase uploadImage) { - return Json(new { Result = _imageLogic.DownloadImage(uploadImage), JsonRequestBehavior.AllowGet }); + return Json(new { Result = _imageLogic.DownloadImage(uploadImage) }, JsonRequestBehavior.AllowGet ); } [HttpGet, Route("Image/id{id}")] public JsonResult GetById(String id) { try { - return Json(new { Result = _imageLogic.GetById(id), JsonRequestBehavior.AllowGet }); + return Json(new { Result = _imageLogic.GetById(id) }, JsonRequestBehavior.AllowGet ); } catch (Exception e) { diff --git a/WebApp/Controllers/ImageWebApiController.cs b/WebApp/Controllers/ImageWebApiController.cs index d57b606..c8004c5 100644 --- a/WebApp/Controllers/ImageWebApiController.cs +++ b/WebApp/Controllers/ImageWebApiController.cs @@ -76,6 +76,17 @@ public ImageWithoutObjectId GetById(String id) return _imageLogic.GetById(id); } /// + /// Get image by id and version + /// + /// Id + /// Version + /// Image + [HttpGet, Route("api/Image/id{id}/{version}")] + public ImageWithoutObjectId GetByIdAndVersion(String id, int version) + { + return _imageLogic.GetByIdAndVersion(id, version); + } + /// /// Get comments from image /// /// Image id From 0e8afc911209d00334163e849dae4e802771e572 Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Sun, 7 Aug 2016 17:23:50 +0300 Subject: [PATCH 12/24] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=BB=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ControllersLogic/Logic/ImageLogic.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ControllersLogic/Logic/ImageLogic.cs b/ControllersLogic/Logic/ImageLogic.cs index cff98d5..21b55a1 100644 --- a/ControllersLogic/Logic/ImageLogic.cs +++ b/ControllersLogic/Logic/ImageLogic.cs @@ -156,14 +156,13 @@ public ImageWithoutObjectId UpdateById(String id, String name, String url) throw new Exception("Bad id"); } var image = _imageRepository.GetImageById(objectId); - Image prev_image = image; + Image prev_image = _imageRepository.GetImageById(objectId); if (image == null) { throw new Exception("Bad id"); } image.Url = url; image.Version++; - prev_image.Version--; image.Name = name; image.StartId = id; _imageRepository.DeleteById(objectId); From 3217d540f91088e1b3f302ba48ac78f9ee4cf0f9 Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Sun, 7 Aug 2016 17:30:15 +0300 Subject: [PATCH 13/24] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BA=D1=83=20=D0=BF=D0=BE?= =?UTF-8?q?=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=B8=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B2=D1=82=D0=BE=D1=80=D0=BE=D0=B3=D0=BE=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BB=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DB/Repositories/DBImageRepository.cs | 2 +- WebApp/Controllers/ImageController.cs | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/DB/Repositories/DBImageRepository.cs b/DB/Repositories/DBImageRepository.cs index f630db9..7e9cee8 100644 --- a/DB/Repositories/DBImageRepository.cs +++ b/DB/Repositories/DBImageRepository.cs @@ -66,7 +66,7 @@ public Image GetImageById(ObjectId id) } public Image GetImageByIdAndVersion(ObjectId id, int version) { - return _imageCollection.AsQueryable().FirstOrDefault(im => im.Id.Equals(id) && im.Version.Equals(version)); + return _imageCollection.AsQueryable().FirstOrDefault(im => im.StartId.Equals(id) && im.Version.Equals(version)); } public List GetImagesByIds(List ids) diff --git a/WebApp/Controllers/ImageController.cs b/WebApp/Controllers/ImageController.cs index 9c5f98c..5827f02 100644 --- a/WebApp/Controllers/ImageController.cs +++ b/WebApp/Controllers/ImageController.cs @@ -45,6 +45,18 @@ public JsonResult GetById(String id) return Json(e.ToString(), JsonRequestBehavior.AllowGet); } } + [HttpGet, Route("Image/id{id}/{version}")] + public JsonResult GetByIdAndVersion(String id, int version) + { + try + { + return Json(new { Result = _imageLogic.GetByIdAndVersion(id, version) }, JsonRequestBehavior.AllowGet); + } + catch (Exception e) + { + return Json(e.ToString(), JsonRequestBehavior.AllowGet); + } + } [HttpGet, Route("Image/id{simageId}/comment")] public JsonResult GetCommentFromImage(String simageId) { From 6da8790ef37e3eca1152e40c81398baceb46a727 Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Mon, 8 Aug 2016 13:19:21 +0300 Subject: [PATCH 14/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=20=D1=81=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20?= =?UTF-8?q?=D0=BA=20=D1=81=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DB/Repositories/DBImageRepository.cs | 8 ++++-- DB/Repositories/DBProjectRepository.cs | 26 ++++++++++++++----- WebApp/Controllers/CommentWebApiController.cs | 4 +-- WebApp/Controllers/ImageController.cs | 4 +-- WebApp/Controllers/ImageWebApiController.cs | 9 +++---- WebApp/Controllers/ProjectController.cs | 2 +- WebApp/Controllers/ProjectWebApiController.cs | 10 +++---- 7 files changed, 39 insertions(+), 24 deletions(-) diff --git a/DB/Repositories/DBImageRepository.cs b/DB/Repositories/DBImageRepository.cs index 7e9cee8..f370c8d 100644 --- a/DB/Repositories/DBImageRepository.cs +++ b/DB/Repositories/DBImageRepository.cs @@ -41,11 +41,15 @@ public void DeleteCommentFromImage(ObjectId imageId, ObjectId commentId) } public void AddCommentToImage(ObjectId newComments, ObjectId idImage) { - var filter = Builders.Filter.Eq("_Id", idImage); + /*var filter = Builders.Filter.Eq("_Id", idImage); var update = Builders.Update .AddToSet("Comments", newComments) .CurrentDate("lastModified"); - var result = _imageCollection.UpdateOne(filter, update); + var result = _imageCollection.UpdateOne(filter, update);*/ + var image = GetImageById(idImage); + DeleteById(idImage); + image.Comments.Add(newComments); + AddImage(image); } public Image AddImage(Image image) diff --git a/DB/Repositories/DBProjectRepository.cs b/DB/Repositories/DBProjectRepository.cs index ace5345..da9f2a0 100644 --- a/DB/Repositories/DBProjectRepository.cs +++ b/DB/Repositories/DBProjectRepository.cs @@ -77,31 +77,43 @@ public Project GetProjectById(ObjectId id) return _projectCollection.AsQueryable().FirstOrDefault(p => p.Id.Equals(id)); } - public void AddProjectToProject(ObjectId newProject, ObjectId iDRootProject) + public void AddProjectToProject(ObjectId newProject, ObjectId idRootProject) { - var filter = Builders.Filter.Eq("_Id", iDRootProject); + /*var filter = Builders.Filter.Eq("_Id", idRootProject); var update = Builders.Update .AddToSet("Projects", newProject) .CurrentDate("lastModified"); - var result = _projectCollection.UpdateOne(filter, update); + var result = _projectCollection.UpdateOne(filter, update);*/ + var project = GetProjectById(idRootProject); + DeleteById(idRootProject); + project.Projects.Add(newProject); + AddProject(project); } public void AddImageToProject(ObjectId newImage, ObjectId iDProject) { - var filter = Builders.Filter.Eq("_Id", iDProject); + /*var filter = Builders.Filter.Eq("_Id", iDProject); var update = Builders.Update .AddToSet("Images", newImage) .CurrentDate("lastModified"); - var result = _projectCollection.UpdateOne(filter, update); + var result = _projectCollection.UpdateOne(filter, update);*/ + var project = GetProjectById(iDProject); + DeleteById(iDProject); + project.Projects.Add(newImage); + AddProject(project); } public void AddCommentToProject(ObjectId newComment, ObjectId iDProject) { - var filter = Builders.Filter.Eq("_Id", iDProject); + /*var filter = Builders.Filter.Eq("_Id", iDProject); var update = Builders.Update .AddToSet("Comments", newComment) .CurrentDate("lastModified"); - var result = _projectCollection.UpdateOne(filter, update); + var result = _projectCollection.UpdateOne(filter, update);*/ + var project = GetProjectById(iDProject); + DeleteById(iDProject); + project.Projects.Add(newComment); + AddProject(project); } public List GetProjectsByIds(List ids) diff --git a/WebApp/Controllers/CommentWebApiController.cs b/WebApp/Controllers/CommentWebApiController.cs index c0d68ba..f007a60 100644 --- a/WebApp/Controllers/CommentWebApiController.cs +++ b/WebApp/Controllers/CommentWebApiController.cs @@ -19,7 +19,7 @@ public class CommentWebApiController : ApiController /// Name /// Return id new comment [HttpPost, Route("api/Comment")] - public String AddComment(String text, String name) + public String AddComment([FromBody]String text, [FromBody]String name) { return _commentLogic.AddComment(text, name); } @@ -51,7 +51,7 @@ public CommentWithoutObjectId GetById(String id) /// New text /// New Comment [HttpPut, Route("api/Comment/id{id}")] - public CommentWithoutObjectId UpdateById(String id, String name, String text) + public CommentWithoutObjectId UpdateById(String id, [FromBody]String name, [FromBody]String text) { var comment = _commentLogic.UpdateById(id, name, text); return comment; diff --git a/WebApp/Controllers/ImageController.cs b/WebApp/Controllers/ImageController.cs index 5827f02..f1fae3a 100644 --- a/WebApp/Controllers/ImageController.cs +++ b/WebApp/Controllers/ImageController.cs @@ -38,7 +38,7 @@ public JsonResult DownloadImage(HttpPostedFileBase uploadImage) public JsonResult GetById(String id) { try { - return Json(new { Result = _imageLogic.GetById(id) }, JsonRequestBehavior.AllowGet ); + return Json(_imageLogic.GetById(id), JsonRequestBehavior.AllowGet ); } catch (Exception e) { @@ -50,7 +50,7 @@ public JsonResult GetByIdAndVersion(String id, int version) { try { - return Json(new { Result = _imageLogic.GetByIdAndVersion(id, version) }, JsonRequestBehavior.AllowGet); + return Json(_imageLogic.GetByIdAndVersion(id, version), JsonRequestBehavior.AllowGet); } catch (Exception e) { diff --git a/WebApp/Controllers/ImageWebApiController.cs b/WebApp/Controllers/ImageWebApiController.cs index c8004c5..0b0845f 100644 --- a/WebApp/Controllers/ImageWebApiController.cs +++ b/WebApp/Controllers/ImageWebApiController.cs @@ -3,7 +3,6 @@ using DB.Models; using System; using System.Collections.Generic; -using System.Linq; using System.Web; using System.Web.Http; @@ -20,7 +19,7 @@ public class ImageWebApiController:ApiController /// Comment name /// Id new comment [HttpPost, Route("api/Image/id{simageId}/comment")] - public String AddCommentToImage(String simageId, String text, String name) + public String AddCommentToImage(String simageId, [FromBody]String text, [FromBody]String name) { return _imageLogic.AddCommentToImage(simageId, text, name); } @@ -31,7 +30,7 @@ public String AddCommentToImage(String simageId, String text, String name) /// Name /// Id new image [HttpPost, Route("api/Image")] - public String AddImage(String url, String name) + public String AddImage([FromBody]String url, [FromBody]String name) { return _imageLogic.AddImage(url, name); } @@ -52,7 +51,7 @@ public String DeleteCommentFromImage(String idImage, String idComment) /// Uploded image, HttpPostedFileBase /// Image url [HttpPost, Route("api/Image/Download")] - public String DownloadImage(HttpPostedFileBase uploadImage) + public String DownloadImage([FromBody]HttpPostedFileBase uploadImage) { return _imageLogic.DownloadImage(uploadImage); } @@ -104,7 +103,7 @@ public List GetCommentsFromImage(String simageId) /// New url /// New Image [HttpPut, Route("api/Image/id{id}")] - public ImageWithoutObjectId UpdateById(String id, String name, String url) + public ImageWithoutObjectId UpdateById(String id, [FromBody]String name, [FromBody]String url) { return _imageLogic.UpdateById(id, name, url); } diff --git a/WebApp/Controllers/ProjectController.cs b/WebApp/Controllers/ProjectController.cs index 5c65fc4..57cb6c3 100644 --- a/WebApp/Controllers/ProjectController.cs +++ b/WebApp/Controllers/ProjectController.cs @@ -52,7 +52,7 @@ public JsonResult GetById(String id) { try { - return Json(new { Result = _projectLogic.GetById(id) }, JsonRequestBehavior.AllowGet); + return Json(_projectLogic.GetById(id), JsonRequestBehavior.AllowGet); } catch (Exception e) { diff --git a/WebApp/Controllers/ProjectWebApiController.cs b/WebApp/Controllers/ProjectWebApiController.cs index 24d98d0..c3ba7de 100644 --- a/WebApp/Controllers/ProjectWebApiController.cs +++ b/WebApp/Controllers/ProjectWebApiController.cs @@ -18,7 +18,7 @@ public class ProjectWebApiController:ApiController /// Project id /// Id new project [HttpPost, Route("api/Project/id{sprojectId}/Comment")] - public String AddCommentToProject(String text, String name, String sprojectId) + public String AddCommentToProject([FromBody]String text, [FromBody]String name, String sprojectId) { return _projectLogic.AddCommentToProject(text, name, sprojectId); } @@ -30,7 +30,7 @@ public String AddCommentToProject(String text, String name, String sprojectId) /// Project id /// Id new image [HttpPost, Route("api/Project/id{sprojectId}/Image")] - public String AddImageToProject(String url, String name, String sprojectId) + public String AddImageToProject([FromBody]String url, [FromBody]String name, String sprojectId) { return _projectLogic.AddImageToProject(url, name, sprojectId); } @@ -40,7 +40,7 @@ public String AddImageToProject(String url, String name, String sprojectId) /// Name /// Id new project [HttpPost, Route("api/Project")] - public String AddProject(String name) + public String AddProject([FromBody]String name) { return _projectLogic.AddProject(name); } @@ -51,7 +51,7 @@ public String AddProject(String name) /// Name new project /// Id new project [HttpPost, Route("api/Project/id{sidRoot}/project")] - public String AddProjectToProject(String sidRoot, String name) + public String AddProjectToProject(String sidRoot, [FromBody]String name) { return _projectLogic.AddProjectToProject(sidRoot, name); } @@ -143,7 +143,7 @@ public List GetPtojectsFormProject(String sidRoot) /// New name /// New project [HttpPut, Route("api/Project/id{id}")] - public ProjectWithoutObjectId UpdateById(String id, String name) + public ProjectWithoutObjectId UpdateById(String id, [FromBody]String name) { return _projectLogic.UpdateById(id, name); } From 8b6cdafdeb8400c96a33d6d5897b43271c180f84 Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Mon, 8 Aug 2016 15:41:07 +0300 Subject: [PATCH 15/24] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?= =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20Async=20?= =?UTF-8?q?=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=BF=D1=80=D0=B8=20=D0=BE?= =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BD=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BE=D0=BD=20=D1=83=D1=81=D0=BF=D0=B5=D0=BB=20=D1=83=D0=B4?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D1=82=D1=8C=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DB/Repositories/DBImageRepository.cs | 2 +- DB/Repositories/DBProjectRepository.cs | 18 +++++++++--------- WebApp/Controllers/CommentWebApiController.cs | 2 +- WebApp/Web.config | 2 +- WebApp/WebApp.csproj | 5 ++--- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/DB/Repositories/DBImageRepository.cs b/DB/Repositories/DBImageRepository.cs index f370c8d..d84dc3e 100644 --- a/DB/Repositories/DBImageRepository.cs +++ b/DB/Repositories/DBImageRepository.cs @@ -47,7 +47,7 @@ public void AddCommentToImage(ObjectId newComments, ObjectId idImage) .CurrentDate("lastModified"); var result = _imageCollection.UpdateOne(filter, update);*/ var image = GetImageById(idImage); - DeleteById(idImage); + _imageCollection.DeleteOneAsync(im => im.Id.Equals(idImage)); image.Comments.Add(newComments); AddImage(image); } diff --git a/DB/Repositories/DBProjectRepository.cs b/DB/Repositories/DBProjectRepository.cs index da9f2a0..239b2ce 100644 --- a/DB/Repositories/DBProjectRepository.cs +++ b/DB/Repositories/DBProjectRepository.cs @@ -23,7 +23,7 @@ public DBProjectRepository() } public void DeleteById(ObjectId id) { - _projectCollection.DeleteOne(prop => true); + _projectCollection.DeleteOne(p => p.Id.Equals(id)); } public void DeleteAll() { @@ -85,33 +85,33 @@ public void AddProjectToProject(ObjectId newProject, ObjectId idRootProject) .CurrentDate("lastModified"); var result = _projectCollection.UpdateOne(filter, update);*/ var project = GetProjectById(idRootProject); - DeleteById(idRootProject); + _projectCollection.DeleteOneAsync(p => p.Id.Equals(idRootProject)); project.Projects.Add(newProject); AddProject(project); } - public void AddImageToProject(ObjectId newImage, ObjectId iDProject) + public void AddImageToProject(ObjectId newImage, ObjectId idProject) { /*var filter = Builders.Filter.Eq("_Id", iDProject); var update = Builders.Update .AddToSet("Images", newImage) .CurrentDate("lastModified"); var result = _projectCollection.UpdateOne(filter, update);*/ - var project = GetProjectById(iDProject); - DeleteById(iDProject); - project.Projects.Add(newImage); + var project = GetProjectById(idProject); + _projectCollection.DeleteOneAsync(p => p.Id.Equals(idProject)); + project.Images.Add(newImage); AddProject(project); } - public void AddCommentToProject(ObjectId newComment, ObjectId iDProject) + public void AddCommentToProject(ObjectId newComment, ObjectId idProject) { /*var filter = Builders.Filter.Eq("_Id", iDProject); var update = Builders.Update .AddToSet("Comments", newComment) .CurrentDate("lastModified"); var result = _projectCollection.UpdateOne(filter, update);*/ - var project = GetProjectById(iDProject); - DeleteById(iDProject); + var project = GetProjectById(idProject); + _projectCollection.DeleteOneAsync(p => p.Id.Equals(idProject)); project.Projects.Add(newComment); AddProject(project); } diff --git a/WebApp/Controllers/CommentWebApiController.cs b/WebApp/Controllers/CommentWebApiController.cs index f007a60..7650d83 100644 --- a/WebApp/Controllers/CommentWebApiController.cs +++ b/WebApp/Controllers/CommentWebApiController.cs @@ -53,7 +53,7 @@ public CommentWithoutObjectId GetById(String id) [HttpPut, Route("api/Comment/id{id}")] public CommentWithoutObjectId UpdateById(String id, [FromBody]String name, [FromBody]String text) { - var comment = _commentLogic.UpdateById(id, name, text); + var comment = _commentLogic.UpdateById(id, name, text); return comment; } } diff --git a/WebApp/Web.config b/WebApp/Web.config index ae783d4..0922b22 100644 --- a/WebApp/Web.config +++ b/WebApp/Web.config @@ -37,7 +37,7 @@ - + diff --git a/WebApp/WebApp.csproj b/WebApp/WebApp.csproj index f63bec4..e565d27 100644 --- a/WebApp/WebApp.csproj +++ b/WebApp/WebApp.csproj @@ -253,6 +253,7 @@ + @@ -334,9 +335,7 @@ - - - + From 960cbef467fe33aa3f226c197750977e3c2ffb2f Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Mon, 8 Aug 2016 16:53:15 +0300 Subject: [PATCH 16/24] =?UTF-8?q?=D0=9D=D0=B0=D0=BF=D0=B8=D1=81=D0=B0?= =?UTF-8?q?=D0=BB=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B7=D0=B0=201=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DB/Models/BaseEntity.cs | 1 + DB/Repositories/DBImageRepository.cs | 14 ++++-------- DB/Repositories/DBProjectRepository.cs | 30 ++++++-------------------- 3 files changed, 11 insertions(+), 34 deletions(-) diff --git a/DB/Models/BaseEntity.cs b/DB/Models/BaseEntity.cs index 7c2b5fb..bdadcc3 100644 --- a/DB/Models/BaseEntity.cs +++ b/DB/Models/BaseEntity.cs @@ -13,6 +13,7 @@ public class BaseEntity public ObjectId Author { get; set; } public uint Version { get; set; } public String Name { get; set; } + public DateTime LastModified { get; set; } public DateTime CreationelData { get; set; } } } diff --git a/DB/Repositories/DBImageRepository.cs b/DB/Repositories/DBImageRepository.cs index d84dc3e..6e7813b 100644 --- a/DB/Repositories/DBImageRepository.cs +++ b/DB/Repositories/DBImageRepository.cs @@ -33,23 +33,17 @@ public void DeleteCommentFromImage(ObjectId imageId, ObjectId commentId) { var list = _imageCollection.AsQueryable().FirstOrDefault(p => p.Id.Equals(imageId)).Comments; list.Remove(commentId); - var filter = Builders.Filter.Eq("_Id", imageId); var update = Builders.Update .Set("Comments", list) - .CurrentDate("lastModified"); - var result = _imageCollection.UpdateOne(filter, update); + .CurrentDate("LastModified"); + var result = _imageCollection.UpdateOne(prop => prop.Id.Equals(imageId), update); } public void AddCommentToImage(ObjectId newComments, ObjectId idImage) { - /*var filter = Builders.Filter.Eq("_Id", idImage); var update = Builders.Update .AddToSet("Comments", newComments) - .CurrentDate("lastModified"); - var result = _imageCollection.UpdateOne(filter, update);*/ - var image = GetImageById(idImage); - _imageCollection.DeleteOneAsync(im => im.Id.Equals(idImage)); - image.Comments.Add(newComments); - AddImage(image); + .CurrentDate("LastModified"); + var result = _imageCollection.UpdateOne(p => p.Id.Equals(idImage), update); } public Image AddImage(Image image) diff --git a/DB/Repositories/DBProjectRepository.cs b/DB/Repositories/DBProjectRepository.cs index 239b2ce..f6da42f 100644 --- a/DB/Repositories/DBProjectRepository.cs +++ b/DB/Repositories/DBProjectRepository.cs @@ -34,31 +34,28 @@ public void DeleteCommentFromProject(ObjectId projectId, ObjectId commentId) { var list = _projectCollection.AsQueryable().FirstOrDefault(p => p.Id.Equals(projectId)).Comments; list.Remove(commentId); - var filter = Builders.Filter.Eq("_Id", projectId); var update = Builders.Update .Set("Comments", list) .CurrentDate("lastModified"); - var result = _projectCollection.UpdateOne(filter, update); + var result = _projectCollection.UpdateOne(p => p.Id.Equals(projectId), update); } public void DeleteProjectFromProject(ObjectId rootProjectId, ObjectId deletedProjectId) { var list = _projectCollection.AsQueryable().FirstOrDefault(p => p.Id.Equals(rootProjectId)).Projects; list.Remove(deletedProjectId); - var filter = Builders.Filter.Eq("_Id", rootProjectId); var update = Builders.Update .Set("Projects", list) .CurrentDate("lastModified"); - var result = _projectCollection.UpdateOne(filter, update); + var result = _projectCollection.UpdateOne(p => p.Id.Equals(rootProjectId), update); } public void DeleteImageFromProject(ObjectId projectId, ObjectId imageId) { var list = _projectCollection.AsQueryable().FirstOrDefault(p => p.Id.Equals(projectId)).Images; list.Remove(imageId); - var filter = Builders.Filter.Eq("_Id", projectId); var update = Builders.Update .Set("Images", list) .CurrentDate("lastModified"); - var result = _projectCollection.UpdateOne(filter, update); + var result = _projectCollection.UpdateOne(p => p.Id.Equals(projectId), update); } public Project AddProject(Project project) { @@ -79,41 +76,26 @@ public Project GetProjectById(ObjectId id) public void AddProjectToProject(ObjectId newProject, ObjectId idRootProject) { - /*var filter = Builders.Filter.Eq("_Id", idRootProject); var update = Builders.Update .AddToSet("Projects", newProject) .CurrentDate("lastModified"); - var result = _projectCollection.UpdateOne(filter, update);*/ - var project = GetProjectById(idRootProject); - _projectCollection.DeleteOneAsync(p => p.Id.Equals(idRootProject)); - project.Projects.Add(newProject); - AddProject(project); + var result = _projectCollection.UpdateOne(p => p.Id.Equals(idRootProject), update); } public void AddImageToProject(ObjectId newImage, ObjectId idProject) { - /*var filter = Builders.Filter.Eq("_Id", iDProject); var update = Builders.Update .AddToSet("Images", newImage) .CurrentDate("lastModified"); - var result = _projectCollection.UpdateOne(filter, update);*/ - var project = GetProjectById(idProject); - _projectCollection.DeleteOneAsync(p => p.Id.Equals(idProject)); - project.Images.Add(newImage); - AddProject(project); + var result = _projectCollection.UpdateOne(p => p.Id.Equals(idProject), update); } public void AddCommentToProject(ObjectId newComment, ObjectId idProject) { - /*var filter = Builders.Filter.Eq("_Id", iDProject); var update = Builders.Update .AddToSet("Comments", newComment) .CurrentDate("lastModified"); - var result = _projectCollection.UpdateOne(filter, update);*/ - var project = GetProjectById(idProject); - _projectCollection.DeleteOneAsync(p => p.Id.Equals(idProject)); - project.Projects.Add(newComment); - AddProject(project); + var result = _projectCollection.UpdateOne(p => p.Id.Equals(idProject), update); } public List GetProjectsByIds(List ids) From e8da0359fbaa4c85d58c1daed8161cae9c7b26a7 Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Tue, 9 Aug 2016 12:39:46 +0300 Subject: [PATCH 17/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20id=20null=20=D1=83=20=D0=BA=D0=B0=D1=80=D1=82?= =?UTF-8?q?=D0=B8=D0=BD=D0=BE=D0=BA=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4?= =?UTF-8?q?=D0=BE=D0=BC=20MakeData?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ControllersLogic/Interfaces/IImageLogic.cs | 2 +- ControllersLogic/Logic/ImageLogic.cs | 8 +++--- ControllersLogic/Logic/ProjectLogic.cs | 3 +- DB/Interfaces/IImageRepository.cs | 2 ++ DB/Interfaces/IProjectRepository.cs | 1 + DB/Repositories/DBImageRepository.cs | 14 ++++++++++ DB/Repositories/DBProjectRepository.cs | 21 ++++++++++---- WebApp/Controllers/ImageController.cs | 8 ++++-- WebApp/Controllers/ImageWebApiController.cs | 6 ++-- WebApp/Controllers/MongoDBController.cs | 31 +++++++++++++++++++-- WebApp/WebApp.csproj | 4 +-- WebApp/packages.config | 2 +- 12 files changed, 78 insertions(+), 24 deletions(-) diff --git a/ControllersLogic/Interfaces/IImageLogic.cs b/ControllersLogic/Interfaces/IImageLogic.cs index 7d7c350..8cee069 100644 --- a/ControllersLogic/Interfaces/IImageLogic.cs +++ b/ControllersLogic/Interfaces/IImageLogic.cs @@ -11,7 +11,7 @@ namespace ControllersLogic.Interfaces public interface IImageLogic { String AddCommentToImage(String simageId, String text, String name); - String AddImage(String url, String name); + Task AddImage(String url, String name); String DeleteCommentFromImage(String idImage, String idComment); String DownloadImage(HttpPostedFileBase uploadImage); List GetAllImage(); diff --git a/ControllersLogic/Logic/ImageLogic.cs b/ControllersLogic/Logic/ImageLogic.cs index 21b55a1..013c120 100644 --- a/ControllersLogic/Logic/ImageLogic.cs +++ b/ControllersLogic/Logic/ImageLogic.cs @@ -3,6 +3,7 @@ using DB.Models; using MongoDB.Bson; using System; +using System.Threading.Tasks; using System.Collections.Generic; using System.IO; using System.Web; @@ -34,7 +35,7 @@ public String AddCommentToImage(String simageId, String text, String name) _imageRepository.AddCommentToImage(commentId, imageId); return commentId.ToString(); } - public String AddImage(String url, String name) + public async Task AddImage(String url, String name) { Image image = new Image(); image.Url = url; @@ -43,7 +44,7 @@ public String AddImage(String url, String name) image.CreationelData = DateTime.UtcNow; var id = _imageRepository.AddImage(image).Id; image.StartId = id.ToString(); - _imageRepository.DeleteById(id); + _imageRepository.DeleteByIdAsync(id); _imageRepository.AddImage(image); return id.ToString(); } @@ -165,8 +166,7 @@ public ImageWithoutObjectId UpdateById(String id, String name, String url) image.Version++; image.Name = name; image.StartId = id; - _imageRepository.DeleteById(objectId); - _imageRepository.AddImage(image); + _imageRepository.UpdateImage(objectId, name, url, image.Version); prev_image.Id = new ObjectId(); prev_image.StartId = id; _imageRepository.AddImage(prev_image); diff --git a/ControllersLogic/Logic/ProjectLogic.cs b/ControllersLogic/Logic/ProjectLogic.cs index 170a3a4..cf58562 100644 --- a/ControllersLogic/Logic/ProjectLogic.cs +++ b/ControllersLogic/Logic/ProjectLogic.cs @@ -229,8 +229,7 @@ public ProjectWithoutObjectId UpdateById(String id, String name) } project.Name = name; project.Version++; - _projectRepository.DeleteById(objectId); - _projectRepository.AddProject(project); + _projectRepository.UpdateProject(objectId, name, project.Version); return ProjectWithoutObjectId.ProjectToProjectWithoutObjectId(project); } } diff --git a/DB/Interfaces/IImageRepository.cs b/DB/Interfaces/IImageRepository.cs index 703ecd9..e016748 100644 --- a/DB/Interfaces/IImageRepository.cs +++ b/DB/Interfaces/IImageRepository.cs @@ -11,6 +11,7 @@ namespace DB.Interfaces public interface IImageRepository { void DeleteById(ObjectId id); + Task DeleteByIdAsync(ObjectId id); void DeleteAll(); void DeleteCommentFromImage(ObjectId imageId, ObjectId commentId); Image AddImage(Image image); @@ -19,5 +20,6 @@ public interface IImageRepository List GetAllImage(); void AddCommentToImage(ObjectId newComments, ObjectId idImage); List GetImagesByIds(List ids); + void UpdateImage(ObjectId id, String name, String url, uint version); } } diff --git a/DB/Interfaces/IProjectRepository.cs b/DB/Interfaces/IProjectRepository.cs index 803e715..0b55621 100644 --- a/DB/Interfaces/IProjectRepository.cs +++ b/DB/Interfaces/IProjectRepository.cs @@ -22,5 +22,6 @@ public interface IProjectRepository void AddImageToProject(ObjectId newImages, ObjectId iDProject); void AddCommentToProject(ObjectId newComments, ObjectId iDProject); List GetProjectsByIds(List ids); + void UpdateProject(ObjectId id, String name, uint version); } } diff --git a/DB/Repositories/DBImageRepository.cs b/DB/Repositories/DBImageRepository.cs index 6e7813b..60bd270 100644 --- a/DB/Repositories/DBImageRepository.cs +++ b/DB/Repositories/DBImageRepository.cs @@ -29,6 +29,10 @@ public void DeleteById(ObjectId id) { _imageCollection.DeleteOne(prop => prop.Id.Equals(id)); } + public async Task DeleteByIdAsync(ObjectId id) + { + await _imageCollection.DeleteOneAsync(prop => prop.Id.Equals(id)); + } public void DeleteCommentFromImage(ObjectId imageId, ObjectId commentId) { var list = _imageCollection.AsQueryable().FirstOrDefault(p => p.Id.Equals(imageId)).Comments; @@ -71,5 +75,15 @@ public List GetImagesByIds(List ids) { return _imageCollection.AsQueryable().Where(i => ids.Contains(i.Id)).ToList(); } + + public void UpdateImage(ObjectId id, string name, string url, uint version) + { + var update = Builders.Update + .Set("Version", version) + .Set("Name", name) + .Set("Url", url) + .CurrentDate("LastModified"); + var result = _imageCollection.UpdateOne(p => p.Id.Equals(id), update); + } } } diff --git a/DB/Repositories/DBProjectRepository.cs b/DB/Repositories/DBProjectRepository.cs index f6da42f..fdff136 100644 --- a/DB/Repositories/DBProjectRepository.cs +++ b/DB/Repositories/DBProjectRepository.cs @@ -36,7 +36,7 @@ public void DeleteCommentFromProject(ObjectId projectId, ObjectId commentId) list.Remove(commentId); var update = Builders.Update .Set("Comments", list) - .CurrentDate("lastModified"); + .CurrentDate("LastModified"); var result = _projectCollection.UpdateOne(p => p.Id.Equals(projectId), update); } public void DeleteProjectFromProject(ObjectId rootProjectId, ObjectId deletedProjectId) @@ -45,7 +45,7 @@ public void DeleteProjectFromProject(ObjectId rootProjectId, ObjectId deletedPro list.Remove(deletedProjectId); var update = Builders.Update .Set("Projects", list) - .CurrentDate("lastModified"); + .CurrentDate("LastModified"); var result = _projectCollection.UpdateOne(p => p.Id.Equals(rootProjectId), update); } public void DeleteImageFromProject(ObjectId projectId, ObjectId imageId) @@ -54,7 +54,7 @@ public void DeleteImageFromProject(ObjectId projectId, ObjectId imageId) list.Remove(imageId); var update = Builders.Update .Set("Images", list) - .CurrentDate("lastModified"); + .CurrentDate("LastModified"); var result = _projectCollection.UpdateOne(p => p.Id.Equals(projectId), update); } public Project AddProject(Project project) @@ -78,7 +78,7 @@ public void AddProjectToProject(ObjectId newProject, ObjectId idRootProject) { var update = Builders.Update .AddToSet("Projects", newProject) - .CurrentDate("lastModified"); + .CurrentDate("LastModified"); var result = _projectCollection.UpdateOne(p => p.Id.Equals(idRootProject), update); } @@ -86,7 +86,7 @@ public void AddImageToProject(ObjectId newImage, ObjectId idProject) { var update = Builders.Update .AddToSet("Images", newImage) - .CurrentDate("lastModified"); + .CurrentDate("LastModified"); var result = _projectCollection.UpdateOne(p => p.Id.Equals(idProject), update); } @@ -94,7 +94,7 @@ public void AddCommentToProject(ObjectId newComment, ObjectId idProject) { var update = Builders.Update .AddToSet("Comments", newComment) - .CurrentDate("lastModified"); + .CurrentDate("LastModified"); var result = _projectCollection.UpdateOne(p => p.Id.Equals(idProject), update); } @@ -102,5 +102,14 @@ public List GetProjectsByIds(List ids) { return _projectCollection.AsQueryable().Where(p => ids.Contains(p.Id)).ToList(); } + + public void UpdateProject(ObjectId id, string name, uint version) + { + var update = Builders.Update + .Set("Name", name) + .Set("Version", version) + .CurrentDate("LastModified"); + var result = _projectCollection.UpdateOne(p => p.Id.Equals(id), update); + } } } diff --git a/WebApp/Controllers/ImageController.cs b/WebApp/Controllers/ImageController.cs index f1fae3a..daef69f 100644 --- a/WebApp/Controllers/ImageController.cs +++ b/WebApp/Controllers/ImageController.cs @@ -5,6 +5,7 @@ using DB.Models; using MongoDB.Bson; using System.IO; +using System.Threading.Tasks; using ControllersLogic.Logic; using ControllersLogic.Interfaces; @@ -20,9 +21,10 @@ public JsonResult AddCommentToImage(String simageId, String text, String name) return Json(new { Result = _imageLogic.AddCommentToImage(simageId, text, name) }, JsonRequestBehavior.AllowGet); } [HttpPost, Route("Image")] - public JsonResult AddImage(String url, String name) - { - return Json(new { Result = _imageLogic.AddImage(url, name) }, JsonRequestBehavior.AllowGet); + public async Task AddImage(String url, String name) + { + String result = await _imageLogic.AddImage(url, name); + return Json(new { Result = result }, JsonRequestBehavior.AllowGet); } [HttpDelete, Route("Image/id{idImage}/comment/id{idComment}")] public JsonResult DeleteCommentFromImage(String idImage, String idComment) diff --git a/WebApp/Controllers/ImageWebApiController.cs b/WebApp/Controllers/ImageWebApiController.cs index 0b0845f..bdde70c 100644 --- a/WebApp/Controllers/ImageWebApiController.cs +++ b/WebApp/Controllers/ImageWebApiController.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Web; using System.Web.Http; +using System.Threading.Tasks; namespace WebApp.Controllers { @@ -30,9 +31,10 @@ public String AddCommentToImage(String simageId, [FromBody]String text, [FromBo /// Name /// Id new image [HttpPost, Route("api/Image")] - public String AddImage([FromBody]String url, [FromBody]String name) + public async Task AddImage([FromBody]String url, [FromBody]String name) { - return _imageLogic.AddImage(url, name); + String result = await _imageLogic.AddImage(url, name); + return result; } /// /// Delete comment from image diff --git a/WebApp/Controllers/MongoDBController.cs b/WebApp/Controllers/MongoDBController.cs index bccc591..d7077b5 100644 --- a/WebApp/Controllers/MongoDBController.cs +++ b/WebApp/Controllers/MongoDBController.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Web; using System.Web.Mvc; +using System.Threading.Tasks; using DB.Models; using MongoDB.Bson; using WebApp.ViewModels; @@ -26,7 +27,7 @@ public void DeleteData() _projectRepository.DeleteAll(); _imageRepository.DeleteAll(); } - public ActionResult MakeData() + public async Task MakeData() { /*Make this project Game @@ -58,6 +59,9 @@ public ActionResult MakeData() comment = _commentRepository.AddComment(comment); image.Comments.Add(comment.Id); var idAttackingWizard = _imageRepository.AddImage(image).Id; + image.StartId = idAttackingWizard.ToString(); + await _imageRepository.DeleteByIdAsync(idAttackingWizard); + _imageRepository.AddImage(image); image.Id = new ObjectId(); image.Url = "http://clash-wiki.com/images/army/wizard/wizard_level6_attacks.png"; @@ -66,6 +70,9 @@ public ActionResult MakeData() image.CreationelData = DateTime.UtcNow; image.Comments = new List(); var idStandingWizard = _imageRepository.AddImage(image).Id; + image.StartId = idStandingWizard.ToString(); + await _imageRepository.DeleteByIdAsync(idStandingWizard); + _imageRepository.AddImage(image); image.Id = new ObjectId(); image.Url = "http://i0.wp.com/fc09.deviantart.net/fs71/f/2014/324/3/6/_render__clash_of_clans___wizard_by_aaa13xxx-d871py5.png?w=1024&h=1024"; @@ -74,6 +81,9 @@ public ActionResult MakeData() image.Comments = new List(); image.CreationelData = DateTime.UtcNow; var idRastingWizard = _imageRepository.AddImage(image).Id; + image.StartId = idRastingWizard.ToString(); + await _imageRepository.DeleteByIdAsync(idRastingWizard); + _imageRepository.AddImage(image); project.Name = "Wizards"; project.Id = new ObjectId(); @@ -99,6 +109,9 @@ public ActionResult MakeData() image.CreationelData = DateTime.UtcNow; image.Comments = new List(); var idStandingWarrior = _imageRepository.AddImage(image).Id; + image.StartId = idStandingWarrior.ToString(); + await _imageRepository.DeleteByIdAsync(idStandingWarrior); + _imageRepository.AddImage(image); image.Id = new ObjectId(); image.Url = "http://cdn3.volusion.com/evkq6.5ok79/v/vspfiles/photos/NOV-4980-A1-2.jpg?1407836711"; @@ -107,6 +120,9 @@ public ActionResult MakeData() image.CreationelData = DateTime.UtcNow; image.Comments = new List(); var idAttackingWarrior = _imageRepository.AddImage(image).Id; + image.StartId = idAttackingWarrior.ToString(); + await _imageRepository.DeleteByIdAsync(idAttackingWarrior); + _imageRepository.AddImage(image); project = new Project(); project.Id = new ObjectId(); @@ -154,6 +170,9 @@ public ActionResult MakeData() comment = _commentRepository.AddComment(comment); image.Comments.Add(comment.Id); var idMap1 = _imageRepository.AddImage(image).Id; + image.StartId = idMap1.ToString(); + await _imageRepository.DeleteByIdAsync(idMap1); + _imageRepository.AddImage(image); image.Id = new ObjectId(); image.Comments = new List(); @@ -162,6 +181,9 @@ public ActionResult MakeData() image.Name = "For 6 People"; image.CreationelData = DateTime.UtcNow; var idMap2 = _imageRepository.AddImage(image).Id; + image.StartId = idMap2.ToString(); + await _imageRepository.DeleteByIdAsync(idMap2); + _imageRepository.AddImage(image); image.Id = new ObjectId(); image.Comments = new List(); @@ -177,6 +199,9 @@ public ActionResult MakeData() comment = _commentRepository.AddComment(comment); image.Comments.Add(comment.Id); var idMap3 = _imageRepository.AddImage(image).Id; + image.StartId = idMap3.ToString(); + await _imageRepository.DeleteByIdAsync(idMap3); + _imageRepository.AddImage(image); project = new Project(); project.Id = new ObjectId(); @@ -209,8 +234,8 @@ public ActionResult MakeData() project.Comments.Add(comment.Id); project.Projects.Add(idHeroes); project.Projects.Add(idMaps); - var idRootProject = _projectRepository.AddProject(project).Id; - + var idRootProject = _projectRepository.AddProject(project).Id; + return View(new MongoDBViewModels { IdRoot = idRootProject.ToString() diff --git a/WebApp/WebApp.csproj b/WebApp/WebApp.csproj index e565d27..bb1dddd 100644 --- a/WebApp/WebApp.csproj +++ b/WebApp/WebApp.csproj @@ -49,8 +49,8 @@ ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll True - - ..\packages\CloudinaryDotNet.1.0.23\lib\net40\CloudinaryDotNet.dll + + ..\packages\CloudinaryDotNet.1.0.24\lib\net40\CloudinaryDotNet.dll True diff --git a/WebApp/packages.config b/WebApp/packages.config index e84c56a..59fd0a8 100644 --- a/WebApp/packages.config +++ b/WebApp/packages.config @@ -2,7 +2,7 @@ - + From f78622dfbc5c2d06c0a2ccfd46339fed7db30a04 Mon Sep 17 00:00:00 2001 From: MikhniukR Date: Tue, 9 Aug 2016 17:09:27 +0300 Subject: [PATCH 18/24] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=87=D0=B5=D0=B3=D0=BE,=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D0=94=D0=B8=D0=BC=D0=B8=D0=BD=D1=8B=D0=BC=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D1=8F=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ControllersLogic/Logic/ImageLogic.cs | 2 +- ControllersLogic/Logic/ProjectLogic.cs | 3 ++ WebApp/App_Data/XmlDocument.xml | 5 +++ WebApp/App_Start/WebApiConfig.cs | 4 +- WebApp/Controllers/CommentController.cs | 8 ++-- WebApp/Controllers/CommentWebApiController.cs | 8 ++-- WebApp/Controllers/ImageController.cs | 18 ++++---- WebApp/Controllers/ImageWebApiController.cs | 18 ++++---- WebApp/Controllers/MongoDBController.cs | 26 +++++++++++ WebApp/Controllers/ProjectController.cs | 26 +++++------ WebApp/Controllers/ProjectWebApiController.cs | 29 ++++++------ WebApp/Views/Home/Index.cshtml | 44 ++++++++++--------- 12 files changed, 117 insertions(+), 74 deletions(-) diff --git a/ControllersLogic/Logic/ImageLogic.cs b/ControllersLogic/Logic/ImageLogic.cs index 013c120..650e0d1 100644 --- a/ControllersLogic/Logic/ImageLogic.cs +++ b/ControllersLogic/Logic/ImageLogic.cs @@ -44,7 +44,7 @@ public async Task AddImage(String url, String name) image.CreationelData = DateTime.UtcNow; var id = _imageRepository.AddImage(image).Id; image.StartId = id.ToString(); - _imageRepository.DeleteByIdAsync(id); + await _imageRepository.DeleteByIdAsync(id); _imageRepository.AddImage(image); return id.ToString(); } diff --git a/ControllersLogic/Logic/ProjectLogic.cs b/ControllersLogic/Logic/ProjectLogic.cs index cf58562..07f53d5 100644 --- a/ControllersLogic/Logic/ProjectLogic.cs +++ b/ControllersLogic/Logic/ProjectLogic.cs @@ -54,6 +54,9 @@ public String AddImageToProject(String url, String name, String sprojectId) image.Name = name; image.CreationelData = DateTime.UtcNow; var imageId = _imageRepository.AddImage(image).Id; + image.StartId = imageId.ToString(); + _imageRepository.DeleteByIdAsync(imageId); + _imageRepository.AddImage(image); _projectRepository.AddImageToProject(imageId, projectId); return imageId.ToString(); } diff --git a/WebApp/App_Data/XmlDocument.xml b/WebApp/App_Data/XmlDocument.xml index 2ebb9ce..d0093b1 100644 --- a/WebApp/App_Data/XmlDocument.xml +++ b/WebApp/App_Data/XmlDocument.xml @@ -580,6 +580,11 @@ New url New Image + + + Content-Type application/json + + Add new comment to project diff --git a/WebApp/App_Start/WebApiConfig.cs b/WebApp/App_Start/WebApiConfig.cs index c451248..90d4ff2 100644 --- a/WebApp/App_Start/WebApiConfig.cs +++ b/WebApp/App_Start/WebApiConfig.cs @@ -16,7 +16,9 @@ public static void Register(HttpConfiguration config) // Web API routes config.MapHttpAttributeRoutes(); - config.Formatters.JsonFormatter.SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/html")); + //config.Formatters.JsonFormatter.SupportedMediaTypes.Add(new MediaTypeHeaderValue("text/html")); + var appXmlType = config.Formatters.XmlFormatter.SupportedMediaTypes.FirstOrDefault(t => t.MediaType == "application/xml"); + config.Formatters.XmlFormatter.SupportedMediaTypes.Remove(appXmlType); config.Routes.MapHttpRoute( name: "DefaultApi", routeTemplate: "api/{controller}/{id}", diff --git a/WebApp/Controllers/CommentController.cs b/WebApp/Controllers/CommentController.cs index 11ac417..40f1dc0 100644 --- a/WebApp/Controllers/CommentController.cs +++ b/WebApp/Controllers/CommentController.cs @@ -16,12 +16,12 @@ public class CommentController : Controller { private static ICommentLogic _commentLogic = new CommentLogic(); - [HttpPost, Route("Comment")] + [HttpPost, Route(nameof(Comment))] public JsonResult AddComment(String text, String name) { return Json(new { Result = _commentLogic.AddComment(text, name) }, JsonRequestBehavior.AllowGet); } - [HttpGet, Route("Comment/id{id}")] + [HttpGet, Route(nameof(Comment)+"/{id}")] public JsonResult GetById(String id) { try { @@ -32,12 +32,12 @@ public JsonResult GetById(String id) return Json(e.ToString() , JsonRequestBehavior.AllowGet); } } - [HttpGet, Route("Comment")] + [HttpGet, Route(nameof(Comment))] public JsonResult Index() { return Json(_commentLogic.GetAllComment(), JsonRequestBehavior.AllowGet); } - [HttpPut, Route("Comment/id{id}")] + [HttpPut, Route(nameof(Comment) + "/{id}")] public JsonResult UpdateById(String id, String name, String text) { try diff --git a/WebApp/Controllers/CommentWebApiController.cs b/WebApp/Controllers/CommentWebApiController.cs index 7650d83..3630c5e 100644 --- a/WebApp/Controllers/CommentWebApiController.cs +++ b/WebApp/Controllers/CommentWebApiController.cs @@ -18,7 +18,7 @@ public class CommentWebApiController : ApiController /// Text /// Name /// Return id new comment - [HttpPost, Route("api/Comment")] + [HttpPost, Route("api/"+ nameof(Comment))] public String AddComment([FromBody]String text, [FromBody]String name) { return _commentLogic.AddComment(text, name); @@ -27,7 +27,7 @@ public String AddComment([FromBody]String text, [FromBody]String name) /// Get all comments /// /// all comments - [HttpGet, Route("api/Comment")] + [HttpGet, Route("api/"+ nameof(Comment))] public List GetAllComment() { return _commentLogic.GetAllComment(); @@ -37,7 +37,7 @@ public List GetAllComment() /// /// Id /// - [HttpGet, Route("api/Comment/id{id}")] + [HttpGet, Route("api/"+ nameof(Comment)+"/{id}")] public CommentWithoutObjectId GetById(String id) { var comment = _commentLogic.GetById(id); @@ -50,7 +50,7 @@ public CommentWithoutObjectId GetById(String id) /// New name /// New text /// New Comment - [HttpPut, Route("api/Comment/id{id}")] + [HttpPut, Route("api/"+ nameof(Comment)+"/{id}")] public CommentWithoutObjectId UpdateById(String id, [FromBody]String name, [FromBody]String text) { var comment = _commentLogic.UpdateById(id, name, text); diff --git a/WebApp/Controllers/ImageController.cs b/WebApp/Controllers/ImageController.cs index daef69f..953fbda 100644 --- a/WebApp/Controllers/ImageController.cs +++ b/WebApp/Controllers/ImageController.cs @@ -15,28 +15,28 @@ public class ImageController:Controller { private static IImageLogic _imageLogic = new ImageLogic(); - [HttpPost, Route("Image/id{simageId}/comment")] + [HttpPost, Route(nameof(Image) + "/{simageId}/" + nameof(Comment))] public JsonResult AddCommentToImage(String simageId, String text, String name) { return Json(new { Result = _imageLogic.AddCommentToImage(simageId, text, name) }, JsonRequestBehavior.AllowGet); } - [HttpPost, Route("Image")] + [HttpPost, Route(nameof(Image) )] public async Task AddImage(String url, String name) { String result = await _imageLogic.AddImage(url, name); return Json(new { Result = result }, JsonRequestBehavior.AllowGet); } - [HttpDelete, Route("Image/id{idImage}/comment/id{idComment}")] + [HttpDelete, Route(nameof(Image) + "/{idImage}/" + nameof(Comment)+"/{idComment}")] public JsonResult DeleteCommentFromImage(String idImage, String idComment) { return Json(new { Result = _imageLogic.DeleteCommentFromImage(idImage,idComment)}, JsonRequestBehavior.AllowGet); } - [HttpPost, Route("Image/Download")] + [HttpPost, Route(nameof(Image) + "/Download")] public JsonResult DownloadImage(HttpPostedFileBase uploadImage) { return Json(new { Result = _imageLogic.DownloadImage(uploadImage) }, JsonRequestBehavior.AllowGet ); } - [HttpGet, Route("Image/id{id}")] + [HttpGet, Route(nameof(Image) + "/{id}")] public JsonResult GetById(String id) { try { @@ -47,7 +47,7 @@ public JsonResult GetById(String id) return Json(e.ToString(), JsonRequestBehavior.AllowGet); } } - [HttpGet, Route("Image/id{id}/{version}")] + [HttpGet, Route(nameof(Image) + "/{id}/{version}")] public JsonResult GetByIdAndVersion(String id, int version) { try @@ -59,7 +59,7 @@ public JsonResult GetByIdAndVersion(String id, int version) return Json(e.ToString(), JsonRequestBehavior.AllowGet); } } - [HttpGet, Route("Image/id{simageId}/comment")] + [HttpGet, Route(nameof(Image) + "/{simageId}/" + nameof(Comment))] public JsonResult GetCommentFromImage(String simageId) { try { @@ -70,12 +70,12 @@ public JsonResult GetCommentFromImage(String simageId) return Json(e.ToString(), JsonRequestBehavior.AllowGet); } } - [HttpGet, Route("Image")] + [HttpGet, Route(nameof(Image) )] public JsonResult Index() { return Json(_imageLogic.GetAllImage(), JsonRequestBehavior.AllowGet); } - [HttpPut, Route("Image/id{id}")] + [HttpPut, Route(nameof(Image) + "/{id}")] public JsonResult UpdateById(String id, String name, String url) { try { diff --git a/WebApp/Controllers/ImageWebApiController.cs b/WebApp/Controllers/ImageWebApiController.cs index bdde70c..3a129ca 100644 --- a/WebApp/Controllers/ImageWebApiController.cs +++ b/WebApp/Controllers/ImageWebApiController.cs @@ -19,7 +19,7 @@ public class ImageWebApiController:ApiController /// Comment text /// Comment name /// Id new comment - [HttpPost, Route("api/Image/id{simageId}/comment")] + [HttpPost, Route("api/"+ nameof(Image) + "/{simageId}/" + nameof(Comment))] public String AddCommentToImage(String simageId, [FromBody]String text, [FromBody]String name) { return _imageLogic.AddCommentToImage(simageId, text, name); @@ -30,7 +30,7 @@ public String AddCommentToImage(String simageId, [FromBody]String text, [FromBo /// Image url /// Name /// Id new image - [HttpPost, Route("api/Image")] + [HttpPost, Route("api/" + nameof(Image) )] public async Task AddImage([FromBody]String url, [FromBody]String name) { String result = await _imageLogic.AddImage(url, name); @@ -42,7 +42,7 @@ public async Task AddImage([FromBody]String url, [FromBody]String name) /// Imgae id /// Comment id /// Result - [HttpDelete, Route("api/Image/id{idImage}/comment/id{idComment}")] + [HttpDelete, Route("api/" + nameof(Image) + "/{idImage}/" + nameof(Comment) + "/{idComment}")] public String DeleteCommentFromImage(String idImage, String idComment) { return _imageLogic.DeleteCommentFromImage(idImage, idComment); @@ -52,7 +52,7 @@ public String DeleteCommentFromImage(String idImage, String idComment) /// /// Uploded image, HttpPostedFileBase /// Image url - [HttpPost, Route("api/Image/Download")] + [HttpPost, Route("api/" + nameof(Image) + "/Download")] public String DownloadImage([FromBody]HttpPostedFileBase uploadImage) { return _imageLogic.DownloadImage(uploadImage); @@ -61,7 +61,7 @@ public String DownloadImage([FromBody]HttpPostedFileBase uploadImage) /// Get all image /// /// List image - [HttpGet, Route("api/Image")] + [HttpGet, Route("api/" + nameof(Image))] public List GetAllImage() { return _imageLogic.GetAllImage(); @@ -71,7 +71,7 @@ public List GetAllImage() /// /// Id /// Image - [HttpGet, Route("api/Image/id{id}")] + [HttpGet, Route("api/" + nameof(Image) + "/{id}")] public ImageWithoutObjectId GetById(String id) { return _imageLogic.GetById(id); @@ -82,7 +82,7 @@ public ImageWithoutObjectId GetById(String id) /// Id /// Version /// Image - [HttpGet, Route("api/Image/id{id}/{version}")] + [HttpGet, Route("api/" + nameof(Image) + "/{id}/{version}")] public ImageWithoutObjectId GetByIdAndVersion(String id, int version) { return _imageLogic.GetByIdAndVersion(id, version); @@ -92,7 +92,7 @@ public ImageWithoutObjectId GetByIdAndVersion(String id, int version) /// /// Image id /// List comments - [HttpGet, Route("api/Image/id{simageId}/comment")] + [HttpGet, Route("api/" + nameof(Image) + "/{simageId}/" + nameof(Comment))] public List GetCommentsFromImage(String simageId) { return _imageLogic.GetCommentFromImage(simageId); @@ -104,7 +104,7 @@ public List GetCommentsFromImage(String simageId) /// New name /// New url /// New Image - [HttpPut, Route("api/Image/id{id}")] + [HttpPut, Route("api/" + nameof(Image) + "/{id}")] public ImageWithoutObjectId UpdateById(String id, [FromBody]String name, [FromBody]String url) { return _imageLogic.UpdateById(id, name, url); diff --git a/WebApp/Controllers/MongoDBController.cs b/WebApp/Controllers/MongoDBController.cs index d7077b5..13362b1 100644 --- a/WebApp/Controllers/MongoDBController.cs +++ b/WebApp/Controllers/MongoDBController.cs @@ -236,6 +236,32 @@ public async Task MakeData() project.Projects.Add(idMaps); var idRootProject = _projectRepository.AddProject(project).Id; + project.Id = new ObjectId(); + project.Name = "Project with Image with many version"; + project.Version = 1; + project.CreationelData = DateTime.UtcNow; + image.Id = new ObjectId(); + image.Name = "Version 1"; + image.Version = 1; + image.Url = "http://veastrology.com/images/num1.jpg"; + var id = _imageRepository.AddImage(image).Id; + image.StartId = id.ToString(); + await _imageRepository.DeleteByIdAsync(id); + _imageRepository.AddImage(image); + + Image prev_image = _imageRepository.GetImageById(id); + _imageRepository.UpdateImage(id, "Version 2", "http://cliparts.co/cliparts/rTL/o9o/rTLo9o5kc.png", 2); + prev_image.Id = new ObjectId(); + prev_image.StartId = id.ToString(); + _imageRepository.AddImage(prev_image); + + prev_image = _imageRepository.GetImageById(id); + _imageRepository.UpdateImage(id, "Version 3", "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSdLFPMkUBGXErXUE13IUmX49gSpvXYn3nOdKKkf3zYreak4Wwflg", 3); + prev_image.Id = new ObjectId(); + prev_image.StartId = id.ToString(); + _imageRepository.AddImage(prev_image); + project.Images.Add(id); + _projectRepository.AddProject(project); return View(new MongoDBViewModels { IdRoot = idRootProject.ToString() diff --git a/WebApp/Controllers/ProjectController.cs b/WebApp/Controllers/ProjectController.cs index 57cb6c3..3c4db1f 100644 --- a/WebApp/Controllers/ProjectController.cs +++ b/WebApp/Controllers/ProjectController.cs @@ -12,42 +12,42 @@ public class ProjectController : Controller { private IProjectLogic _projectLogic = new ProjectLogic(); - [HttpPost, Route("Project/id{sprojectId}/Comment")] + [HttpPost, Route(nameof(Project) + "/{sprojectId}/" + nameof(Comment))] public JsonResult AddCommentToProject(String text, String name, String sprojectId) { return Json(new { Result = _projectLogic.AddCommentToProject(text, name, sprojectId) }, JsonRequestBehavior.AllowGet); } - [HttpPost, Route("Project/id{sprojectId}/Image")] + [HttpPost, Route(nameof(Project) + "/{sprojectId}/" + nameof(Image))] public JsonResult AddImageToProject(String url, String name, String sprojectId) { return Json(new { Result = _projectLogic.AddImageToProject(url, name, sprojectId) }, JsonRequestBehavior.AllowGet); } - [HttpPost, Route("Project")] + [HttpPost, Route(nameof(Project))] public JsonResult AddProject(String name) { return Json(new { Result = _projectLogic.AddProject(name) }, JsonRequestBehavior.AllowGet); } - [HttpPost, Route("Project/id{sidRoot}/project")] + [HttpPost, Route(nameof(Project) + "/{sidRoot}/project")] public JsonResult AddProjectToProject(String sidRoot, String name) { return Json(new { Result = _projectLogic.AddProjectToProject(sidRoot, name) }, JsonRequestBehavior.AllowGet); } - [HttpDelete, Route("Project/id{id}")] + [HttpDelete, Route(nameof(Project) + "/{id}")] public JsonResult DeleteById(String id) { return Json(new { Result = _projectLogic.DeleteById(id) }, JsonRequestBehavior.AllowGet); } - [HttpDelete, Route("Project/id{projectId}/comment/id{commentId}")] + [HttpDelete, Route(nameof(Project) + "/{projectId}/" + nameof(Comment)+"/{commentId}")] public JsonResult DeleteCommentFromProject(String projectId, String commentId) { return Json(new { Result = _projectLogic.DeleteCommentFromProject(projectId, commentId)}, JsonRequestBehavior.AllowGet); } - [HttpDelete, Route("Project/id{projectId}/image/id{imageId}")] + [HttpDelete, Route(nameof(Project) + "/{projectId}/" + nameof(Image) + "/{imageId}")] public JsonResult DeleteImageFromProject(String projectId, String imageId) { return Json(new { Result = _projectLogic.DeleteImageFromProject(projectId, imageId) }, JsonRequestBehavior.AllowGet); } - [HttpGet, Route("Project/id{id}")] + [HttpGet, Route(nameof(Project) + "/{id}")] public JsonResult GetById(String id) { try @@ -59,7 +59,7 @@ public JsonResult GetById(String id) return Json(new { Result = e.ToString() }, JsonRequestBehavior.AllowGet); } } - [HttpGet, Route("Project/id{sidRoot}/Comment")] + [HttpGet, Route(nameof(Project) + "/{sidRoot}/" + nameof(Comment))] public JsonResult GetCommentsFormProject(String sidRoot) { try @@ -71,7 +71,7 @@ public JsonResult GetCommentsFormProject(String sidRoot) return Json(new { Result = e.ToString() }, JsonRequestBehavior.AllowGet); } } - [HttpGet, Route("Project/id{sidRoot}/Image")] + [HttpGet, Route(nameof(Project) + "/{sidRoot}/" + nameof(Image) )] public JsonResult GetImagesFormProject(String sidRoot) { try @@ -83,7 +83,7 @@ public JsonResult GetImagesFormProject(String sidRoot) return Json(new { Result = e.ToString() }, JsonRequestBehavior.AllowGet); } } - [HttpGet, Route("Project/id{sidRoot}/Project")] + [HttpGet, Route(nameof(Project) + "/{sidRoot}/Project")] public JsonResult GetPtojectsFormProject(String sidRoot) { try @@ -95,12 +95,12 @@ public JsonResult GetPtojectsFormProject(String sidRoot) return Json(new { Result = e.ToString() }, JsonRequestBehavior.AllowGet); } } - [HttpGet, Route("Project")] + [HttpGet, Route(nameof(Project))] public JsonResult Index() { return Json(_projectLogic.GetAllProjects(), JsonRequestBehavior.AllowGet); } - [HttpPut, Route("Project/id{id}")] + [HttpPut, Route(nameof(Project) + "/{id}")] public JsonResult UpdateById(String id, String name) { try diff --git a/WebApp/Controllers/ProjectWebApiController.cs b/WebApp/Controllers/ProjectWebApiController.cs index c3ba7de..88bcfd2 100644 --- a/WebApp/Controllers/ProjectWebApiController.cs +++ b/WebApp/Controllers/ProjectWebApiController.cs @@ -7,6 +7,9 @@ namespace WebApp.Controllers { + /// + /// Content-Type application/json + /// public class ProjectWebApiController:ApiController { private IProjectLogic _projectLogic = new ProjectLogic(); @@ -17,7 +20,7 @@ public class ProjectWebApiController:ApiController /// Name /// Project id /// Id new project - [HttpPost, Route("api/Project/id{sprojectId}/Comment")] + [HttpPost, Route("api/"+nameof(Project)+"/{sprojectId}/"+ nameof(Comment))] public String AddCommentToProject([FromBody]String text, [FromBody]String name, String sprojectId) { return _projectLogic.AddCommentToProject(text, name, sprojectId); @@ -29,7 +32,7 @@ public String AddCommentToProject([FromBody]String text, [FromBody]String name, /// Name /// Project id /// Id new image - [HttpPost, Route("api/Project/id{sprojectId}/Image")] + [HttpPost, Route("api/" + nameof(Project) + "/{sprojectId}/" + nameof(Image) )] public String AddImageToProject([FromBody]String url, [FromBody]String name, String sprojectId) { return _projectLogic.AddImageToProject(url, name, sprojectId); @@ -39,7 +42,7 @@ public String AddImageToProject([FromBody]String url, [FromBody]String name, Str /// /// Name /// Id new project - [HttpPost, Route("api/Project")] + [HttpPost, Route("api/"+nameof(Project))] public String AddProject([FromBody]String name) { return _projectLogic.AddProject(name); @@ -50,7 +53,7 @@ public String AddProject([FromBody]String name) /// Id root project /// Name new project /// Id new project - [HttpPost, Route("api/Project/id{sidRoot}/project")] + [HttpPost, Route("api/" + nameof(Project) + "/{sidRoot}/project")] public String AddProjectToProject(String sidRoot, [FromBody]String name) { return _projectLogic.AddProjectToProject(sidRoot, name); @@ -60,7 +63,7 @@ public String AddProjectToProject(String sidRoot, [FromBody]String name) /// /// Deleted project id /// Result - [HttpDelete, Route("api/Project/id{id}")] + [HttpDelete, Route("api/" + nameof(Project) + "/{id}")] public String DeleteById(String id) { return _projectLogic.DeleteById(id); @@ -69,7 +72,7 @@ public String DeleteById(String id) /// GetAllProject /// /// List project - [HttpGet, Route("api/Project")] + [HttpGet, Route("api/" + nameof(Project) )] public List GetAllProject() { return _projectLogic.GetAllProjects(); @@ -80,7 +83,7 @@ public List GetAllProject() /// Project id /// Comment id /// Result - [HttpDelete, Route("api/Project/id{projectId}/comment/id{commentId}")] + [HttpDelete, Route("api/" + nameof(Project) + "/{projectId}/" + nameof(Comment)+"/{commentId}")] public String DeleteCommentFromProject(String projectId, String commentId) { return _projectLogic.DeleteCommentFromProject(projectId, commentId); @@ -91,7 +94,7 @@ public String DeleteCommentFromProject(String projectId, String commentId) /// Project id /// Image id /// Result - [HttpDelete, Route("api/Project/id{projectId}/image/id{imageId}")] + [HttpDelete, Route("api/" + nameof(Project) + "/{projectId}/" + nameof(Image) + "/{imageId}")] public String DeleteImageFromProject(String projectId, String imageId) { return _projectLogic.DeleteImageFromProject(projectId, imageId); @@ -101,7 +104,7 @@ public String DeleteImageFromProject(String projectId, String imageId) /// /// Id /// Project - [HttpGet, Route("api/Project/id{id}")] + [HttpGet, Route("api/" + nameof(Project) + "/{id}")] public ProjectWithoutObjectId GetById(String id) { return _projectLogic.GetById(id); @@ -111,7 +114,7 @@ public ProjectWithoutObjectId GetById(String id) /// /// Id project /// List id comments - [HttpGet, Route("api/Project/id{sidRoot}/Comment")] + [HttpGet, Route("api/" + nameof(Project) + "/{sidRoot}/" + nameof(Comment))] public List GetCommentsFormProject(String sidRoot) { return _projectLogic.GetCommentsFormProject(sidRoot); @@ -121,7 +124,7 @@ public List GetCommentsFormProject(String sidRoot) /// /// Id project /// List id images - [HttpGet, Route("api/Project/id{sidRoot}/Image")] + [HttpGet, Route("api/" + nameof(Project) + "/{sidRoot}/" + nameof(Image) )] public List GetImagesFormProject(String sidRoot) { return _projectLogic.GetImagesFormProject(sidRoot); @@ -131,7 +134,7 @@ public List GetImagesFormProject(String sidRoot) /// /// Id root project /// List id projects - [HttpGet, Route("api/Project/id{sidRoot}/Project")] + [HttpGet, Route("api/" + nameof(Project) + "/{sidRoot}/Project")] public List GetPtojectsFormProject(String sidRoot) { return _projectLogic.GetPtojectsFormProject(sidRoot); @@ -142,7 +145,7 @@ public List GetPtojectsFormProject(String sidRoot) /// Id /// New name /// New project - [HttpPut, Route("api/Project/id{id}")] + [HttpPut, Route("api/" + nameof(Project) + "/{id}")] public ProjectWithoutObjectId UpdateById(String id, [FromBody]String name) { return _projectLogic.UpdateById(id, name); diff --git a/WebApp/Views/Home/Index.cshtml b/WebApp/Views/Home/Index.cshtml index e4b4930..680af51 100644 --- a/WebApp/Views/Home/Index.cshtml +++ b/WebApp/Views/Home/Index.cshtml @@ -29,57 +29,57 @@