fix bags with DBContext

koljada · koljada · commit 79e4b98d3904 · 2015-04-22T11:50:34.000+03:00
diff --git a/BookStore.DAL.EntityFramework/EfAuthorRepository.cs b/BookStore.DAL.EntityFramework/EfAuthorRepository.cs
@@ -49,7 +49,7 @@ public override Author GetById(int id)
         {
             using (EfDbContext context = new EfDbContext())
             {
-                return context.Authors.Include(x => x.Books).FirstOrDefault(x => x.Author_ID == id);
+                return context.Authors.Include(x => x.Books.Select(c=>c.BookAuthors)).Include(x=>x.FavoriteUsers).FirstOrDefault(q => q.Author_ID == id);
             }
         }
 
diff --git a/BookStore.DAL.EntityFramework/EfBookRepository.cs b/BookStore.DAL.EntityFramework/EfBookRepository.cs
@@ -227,7 +227,7 @@ public Rate GetRate(int bookId, int userId)
         {
             using (EfDbContext context = new EfDbContext())
             {
-                return context.Rates.FirstOrDefault(x => x.User_ID == userId && x.Book.Book_ID == bookId);
+                return context.Rates.Include(x=>x.Book).FirstOrDefault(x => x.User_ID == userId && x.Book.Book_ID == bookId);
             }
         }
     }
diff --git a/BookStore.DAL.EntityFramework/EfUserRepository.cs b/BookStore.DAL.EntityFramework/EfUserRepository.cs
@@ -12,6 +12,14 @@ namespace BookStore.DAL.EntityFramework
 {
     public class EfUserRepository : EfStoreRepository<User>, IUserRepository
     {
+        public override User GetById(int id)
+        {
+            using (EfDbContext context = new EfDbContext())
+            {
+                return context.Users.Include(x=>x.Comments).FirstOrDefault(x=>x.User_ID==id);
+            }
+        }
+
         public IList<Book> GetReccomendedBooks(int userId)
         {
             throw new NotImplementedException();
@@ -54,7 +62,8 @@ public User GetUserByEmail(string email)
             using (EfDbContext context = new EfDbContext())
             {
                 return context.Users.Include(e => e.Roles)
-                    .Include(x => x.RatedBooks)
+                    .Include(x=>x.WishedBooks)
+                    .Include(x => x.RatedBooks.Select(b=>b.Book.BookAuthors))
                     .Include(x => x.FavoriteAuthors)
                     .FirstOrDefault(e => e.Email == email);
             }
diff --git a/BookStore.Tests/UnitTest1.cs b/BookStore.Tests/UnitTest1.cs
@@ -3,11 +3,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
-using BookStore.DLL.Interface.RepositoryService;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using BookStore.Controllers;
-using BookStore.DAL.Interface.Abstract;
-using BookStore.DAL.Interface.EntityFramework;
 using BookStore.DLL.Interface.Abstract;
 using BookStore.DO.Entities;
 using BookStore.Models;
diff --git a/BookStore/BookStore.WebUI.csproj b/BookStore/BookStore.WebUI.csproj
@@ -224,6 +224,7 @@
     <Compile Include="Models\BookListViewModel.cs" />
     <Compile Include="Models\BookViewModel.cs" />
     <Compile Include="Models\CommentModel.cs" />
+    <Compile Include="Models\Fb2Parser.cs" />
     <Compile Include="Models\RegisterViewModel.cs" />
     <Compile Include="Models\TextViewModel.cs" />
     <Compile Include="Models\LoginViewModel.cs" />
@@ -285,7 +286,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Scripts\addCommet.js" />
-    <Content Include="Scripts\AddField.js" />
+    <Content Include="Scripts\addField.js" />
     <Content Include="Scripts\bootstrap3-typeahead.js" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js.map">
diff --git a/BookStore/Content/Admin.css.map b/BookStore/Content/Admin.css.map
diff --git a/BookStore/Content/bootstrap.min.css b/BookStore/Content/bootstrap.min.css
diff --git a/BookStore/Controllers/BookController.cs b/BookStore/Controllers/BookController.cs
@@ -175,49 +175,15 @@ public PartialViewResult BookRating(int bookId)
             return p;
         }
 
-        public ViewResult Fb2Text(string path, int section = 0, int page = 1)//TODO: Separate and move to DLL
+        public ViewResult Fb2Text(string path, int section = 0, int page = 1)
         {
-            XDocument doc = XDocument.Load(Server.MapPath(path));
-            StringBuilder text = new StringBuilder();
-            int pageCharacters = 15000;
-            List<string> chapters = new List<string>();
-            if (doc.Root != null)
-            {
-                var body = doc.Root.Elements().FirstOrDefault(x => x.Name.LocalName == "body");
-                if (body != null)
-                {
-                    var sections = body.Elements().Where(x => x.Name.LocalName == "section");
-                    var xElements = sections as IList<XElement> ?? sections.ToList();
-                    foreach (var chapter in xElements)
-                    {
-                        var name = chapter.Elements().FirstOrDefault(x => x.Name.LocalName == "title");
-                        if (name != null)
-                        {
-                            chapters.Add(name.Element(body.GetDefaultNamespace() + "p").Value);
-                        }
-                    }
-                    var main = xElements.Count() > 2 ? xElements.ElementAt(section) : body;
-                    using (var xReader = main.CreateReader())
-                    {
-                        xReader.MoveToContent();
-                        text.Append(xReader.ReadInnerXml());
-                    }
-                }
-            }
-            if (text.Length >= pageCharacters)
-            {
-                text.Append(' ', pageCharacters - text.Length%pageCharacters);
-            }
-            else
-            {
-                pageCharacters = text.Length;
-            }
+            Fb2Parser fb2 = new Fb2Parser(Server.MapPath(path),section);
             TextViewModel model = new TextViewModel()
             {
-                Text = text.ToString((page - 1) * pageCharacters, pageCharacters),
-                Chapters = chapters,
+                Text = fb2.Text.ToString((page - 1) * fb2.PageCharacters, fb2.PageCharacters)+" - ",
+                Chapters = fb2.Chapters,
                 CurrentChapter = section,
-                PagingInfo = new PagingInfo(page, pageCharacters, text.Length),
+                PagingInfo = new PagingInfo(page, fb2.PageCharacters, fb2.Text.Length),
                 CurrentPath = path
             };
             return View(model);
diff --git a/BookStore/Scripts/AddField.js b/BookStore/Scripts/AddField.js
@@ -2,7 +2,7 @@
     OwnershipsCount = $("#Tags>input").length;
     AuthorFieldsCount = $("#Authors>input").length;
     GenresFieldsCount = $("#Genres>input").length;
-    $(".remove-field").click(RemoveField);
+    $(".remove-field").click(removeField);
     
     $(".bookCover").click(function () {
         var link = $(this).child().attr(src);
@@ -13,13 +13,13 @@ var OwnershipsCount = 0;
 var AuthorFieldsCount = 0;
 var GenresFieldsCount = 0;
 
-function AddField(type) {
+function addField(type) {
     //добавляем поля
     if (type == "Tag") {
         var OwnershipContainer = $("<div/>").attr("class", "ownership-container").attr("id", "OwnershipContainer" + OwnershipsCount).appendTo($("#Tags"));
         $("<input/>").attr("class", "text-box single-line").attr("type", "text").attr("id", "Ownerships[" + OwnershipsCount + "]_Name").attr("name", "Tages[" + OwnershipsCount + "].Tag_Name").attr("value", "").appendTo(OwnershipContainer);
         var RemoveButton = $("<a/>").attr("class", "remove-field glyphicon glyphicon-remove").attr("item", OwnershipsCount).attr("href", "#").appendTo(OwnershipContainer);
-        RemoveButton.click(function () { RemoveField(type, RemoveButton); });
+        RemoveButton.click(function () { removeField(type, RemoveButton); });
         OwnershipsCount++;
     }
     else if (type == "Author") {
@@ -28,21 +28,20 @@ function AddField(type) {
         $("<input/>").attr("class", "text-box single-line").attr("type", "text").attr("id", "Author" + AuthorFieldsCount + "Middle").attr("name", "BookAuthors[" + AuthorFieldsCount + "].Middle_Name").attr("value", "").appendTo(OwnershipContainer);
         $("<input/>").attr("class", "text-box single-line").attr("type", "text").attr("id", "Author" + AuthorFieldsCount + "Last").attr("name", "BookAuthors[" + AuthorFieldsCount + "].Last_Name").attr("value", "").appendTo(OwnershipContainer);
         var RemoveButton = $("<a/>").attr("class", "remove-field glyphicon glyphicon-remove").attr("item", AuthorFieldsCount).attr("href", "#").appendTo(OwnershipContainer);
-        RemoveButton.click(function () { RemoveField(type, RemoveButton); });
+        RemoveButton.click(function () { removeField(type, RemoveButton); });
         AuthorFieldsCount = AuthorFieldsCount + 1;
     }
     else if (type == "Genre") {
         
         var OwnershipContainer = $("<div/>").attr("class", "ownership-container").attr("id", "OwnershipContainer" + GenresFieldsCount).appendTo($("#Genres"));
         $("<input/>").attr("class", "text-box single-line").attr("type", "text").attr("id", "Genre" + GenresFieldsCount).attr("name", "Genres[" + GenresFieldsCount + "].Genre_Name").attr("value", "").appendTo(OwnershipContainer);
         var RemoveButton = $("<a/>").attr("class", "remove-field glyphicon glyphicon-remove").attr("item", GenresFieldsCount).attr("href", "#").appendTo(OwnershipContainer);
-        RemoveButton.click(function () { RemoveField(type, RemoveButton); });
+        RemoveButton.click(function () { removeField(type, RemoveButton); });
         GenresFieldsCount++;
     }
-    return false
 }
 
-function RemoveField(type, RemoveButton) {
+function removeField(type, RemoveButton) {
     debugger;
     var RecalculateStartNum = parseInt(RemoveButton.attr("item"));
     var count = 0;
@@ -65,10 +64,9 @@ function RemoveField(type, RemoveButton) {
         RecalculateNamesAndIds(i, type);
     }
     // OwnershipsCount--;
-    return false;
 }
 
-function RecalculateNamesAndIds(number, type) {
+function recalculateNamesAndIds(number, type) {
     var prevNumber = number - 1;
     //скобки "[" и "]" которые присутствуют в id DOM-объекта в jquery селекторе необходим экранировать двойным обратным слэшем \\
     if (type == "Tag") {
@@ -82,5 +80,4 @@ function RecalculateNamesAndIds(number, type) {
         $("#Author" + number + "Middle").attr("name", "BookAuthors[" + prevNumber + "].Middle_Name");
         $("#Author" + number + "Last").attr("name", "BookAuthors[" + prevNumber + "].Last_Name");
     }
-    return false;
 }
diff --git a/BookStore/Views/Admin/Edit.cshtml b/BookStore/Views/Admin/Edit.cshtml
@@ -14,12 +14,12 @@
                 <div class="editor-label">@Html.LabelFor(b => b.Title, new { @class = "single-line" })</div>
                 <div class="editor-field">@Html.EditorFor(b => b.Title, new { @class = "single-line" })</div>
                 <div id="Authors">
-                    <a href="#" class="glyphicon glyphicon-plus" aria-hidden="true" onclick="return AddField('Author')"></a>
+                    <a href="#" class="glyphicon glyphicon-plus" aria-hidden="true" onclick="return addField('Author')"></a>
                     @Html.EditorFor(b => b.BookAuthors, new { @class = "single-line" })
                 </div>
                 <div class="editor-label">
                     @Html.LabelFor(b => b.Genres, new { @class = "single-line" })
-                    <a href="#" class="glyphicon glyphicon-plus" aria-hidden="true" onclick="return AddField('Genre')"></a>
+                    <a href="#" class="glyphicon glyphicon-plus" aria-hidden="true" onclick="return addField('Genre')"></a>
                 </div>
                 <div id="Genres">
                     @Html.EditorFor(b => b.Genres, new { @class = "single-line" })
@@ -40,7 +40,7 @@
                 <div class="editor-field">@Html.EditorFor(b => b.Price, new { @class = "single-line", type = "number", step = "any" })</div>
                 <div class="editor-label">
                     @Html.LabelFor(b => b.Tages, new { @class = "single-line" })
-                    <a href="#" id="addField" class="glyphicon glyphicon-plus" aria-hidden="true" onclick=" return AddField('Tag') "></a>
+                    <a href="#" id="addField" class="glyphicon glyphicon-plus" aria-hidden="true" onclick=" return addField('Tag') "></a>
                 </div>
                 <div class="editor-field" id="Tags">
                     @Html.EditorFor(t => t.Tages, new { @class = "single-line" })

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public override Author GetById(int id)`
`49`	`49`	`{`
`50`	`50`	`using (EfDbContext context = new EfDbContext())`
`51`	`51`	`{`
`52`		`- return context.Authors.Include(x => x.Books).FirstOrDefault(x => x.Author_ID == id);`
	`52`	`+ return context.Authors.Include(x => x.Books.Select(c=>c.BookAuthors)).Include(x=>x.FavoriteUsers).FirstOrDefault(q => q.Author_ID == id);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public Rate GetRate(int bookId, int userId)`
`227`	`227`	`{`
`228`	`228`	`using (EfDbContext context = new EfDbContext())`
`229`	`229`	`{`
`230`		`- return context.Rates.FirstOrDefault(x => x.User_ID == userId && x.Book.Book_ID == bookId);`
	`230`	`+ return context.Rates.Include(x=>x.Book).FirstOrDefault(x => x.User_ID == userId && x.Book.Book_ID == bookId);`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,14 @@ namespace BookStore.DAL.EntityFramework`
`12`	`12`	`{`
`13`	`13`	`public class EfUserRepository : EfStoreRepository<User>, IUserRepository`
`14`	`14`	`{`
	`15`	`+ public override User GetById(int id)`
	`16`	`+ {`
	`17`	`+ using (EfDbContext context = new EfDbContext())`
	`18`	`+ {`
	`19`	`+ return context.Users.Include(x=>x.Comments).FirstOrDefault(x=>x.User_ID==id);`
	`20`	`+ }`
	`21`	`+ }`
	`22`	`+`
`15`	`23`	`public IList<Book> GetReccomendedBooks(int userId)`
`16`	`24`	`{`
`17`	`25`	`throw new NotImplementedException();`
`@@ -54,7 +62,8 @@ public User GetUserByEmail(string email)`
`54`	`62`	`using (EfDbContext context = new EfDbContext())`
`55`	`63`	`{`
`56`	`64`	`return context.Users.Include(e => e.Roles)`
`57`		`- .Include(x => x.RatedBooks)`
	`65`	`+ .Include(x=>x.WishedBooks)`
	`66`	`+ .Include(x => x.RatedBooks.Select(b=>b.Book.BookAuthors))`
`58`	`67`	`.Include(x => x.FavoriteAuthors)`
`59`	`68`	`.FirstOrDefault(e => e.Email == email);`
`60`	`69`	`}`