Kona.Web/Helpers/NHibExtensions.cs Kona.Web/Model/Supply/Inventory/BackOrdered.cs Kona.Web/Model/Supply/Inventory/Discontinued.cs Kona.Web/Model/Supply/Inventory/InStock.cs Kona.Web/Model/Supply/Inventory/InventoryState.cs Kona.Web/Model/Supply/Inventory/PreOrder.cs lib/NHibernate.LambdaExtensions.dll Kona.Web/App_Data/Kona.mdf Kona.Web/App_Data/Kona_log.ldf @@ -12,25 +12,15 @@ namespace Kona.Controllers [HandleError] public class HomeController : Controller { - StoreService _service; - ISession _session; + IStoreService _service; - public HomeController(ISession session) { - _session = session; - _service = new StoreService(session); + public HomeController(IStoreService service) { + _service = service; } public ActionResult Index() { - var stuff = _session.CreateCriteria<Category>() - .List<Category>(); - - foreach (var cat in stuff) { - var products = cat.Products.Count; - } - - var model = _service.GetHomeModel(); //return Content("Success"); return View(model); Kona.Web/Controllers/HomeController.cs @@ -1,16 +1,14 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; using System.Web.Mvc; using System.Web.Routing; +using HibernatingRhinos.Profiler.Appender.NHibernate; using Kona.App.Infrastructure; using Commerce.MVC.Web; using NHibernate; using NHibernate.Cfg; using System.IO; using NHibernate.Context; -using HibernatingRhinos.NHibernate.Profiler.Appender; + namespace Kona { Kona.Web/Global.asax.cs @@ -1,22 +1,8 @@ -using System; -using System.Data; -using System.Configuration; -using System.Linq; -using System.Web; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.HtmlControls; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Xml.Linq; -using StructureMap; +using StructureMap; using StructureMap.Configuration.DSL; -using StructureMap.Configuration; -using StructureMap.Attributes; -using StructureMap.Pipeline; -using Kona.Model; using NHibernate; using Kona; +using Kona.App.Services; namespace Commerce.MVC.Web { public static class Bootstrapper { @@ -34,8 +20,9 @@ namespace Commerce.MVC.Web { ForRequestedType<ISession>() .TheDefault.Is.ConstructedBy(x => MvcApplication.SessionFactory.GetCurrentSession()); - - + ForRequestedType<IStoreService>() + .TheDefaultIsConcreteType<StoreService>(); + } } } Kona.Web/Infrastructure/Bootstrapper.cs @@ -47,9 +47,9 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\lib\DotNetOpenAuth.dll</HintPath> </Reference> - <Reference Include="HibernatingRhinos.NHibernate.Profiler.Appender, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0774796e73ebf640, processorArchitecture=MSIL"> + <Reference Include="HibernatingRhinos.Profiler.Appender, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0774796e73ebf640, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\lib\HibernatingRhinos.NHibernate.Profiler.Appender.dll</HintPath> + <HintPath>..\..\..\@Apps\NHProf\HibernatingRhinos.Profiler.Appender.dll</HintPath> </Reference> <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> @@ -67,6 +67,10 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\lib\NHibernate.ByteCode.Castle.dll</HintPath> </Reference> + <Reference Include="NHibernate.LambdaExtensions, Version=1.0.8.0, Culture=neutral, PublicKeyToken=706dcfc1e2725d62, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\lib\NHibernate.LambdaExtensions.dll</HintPath> + </Reference> <Reference Include="NHibernate.Linq, Version=1.0.0.4000, Culture=neutral, PublicKeyToken=444cf6a87fdab271, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\lib\NHibernate.Linq.dll</HintPath> @@ -105,9 +109,17 @@ <Compile Include="Controllers\AccountController.cs" /> <Compile Include="Controllers\HomeController.cs" /> <Compile Include="Controllers\ProductController.cs" /> + <Compile Include="Helpers\NHibExtensions.cs"> + <SubType>Code</SubType> + </Compile> <Compile Include="Infrastructure\Bootstrapper.cs" /> <Compile Include="Infrastructure\KonaControllerFactory.cs" /> <Compile Include="Infrastructure\KonaViewEngine.cs" /> + <Compile Include="Model\Supply\Inventory\Discontinued.cs" /> + <Compile Include="Model\Supply\Inventory\InStock.cs" /> + <Compile Include="Model\Supply\Inventory\InventoryState.cs" /> + <Compile Include="Model\Supply\Inventory\BackOrdered.cs" /> + <Compile Include="Model\Supply\Inventory\PreOrder.cs" /> <Compile Include="Services\StoreService.cs" /> <Compile Include="ViewModels\DetailsViewModel.cs" /> <Compile Include="ViewModels\ProductListViewModel.cs" /> @@ -391,7 +403,6 @@ <None Include="nhibernate-mapping.xsd" /> </ItemGroup> <ItemGroup> - <Folder Include="Helpers\" /> <Folder Include="Repositories\" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> Kona.Web/Kona.csproj @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using Iesi.Collections.Generic; +using Kona.Model.Supply.Inventory; namespace Kona.Model { @@ -31,27 +33,24 @@ namespace Kona.Model { public virtual DeliveryMethod Delivery { get; set; } public virtual decimal WeightInPounds { get; set; } public virtual bool IsTaxable { get; set; } - public virtual InventoryStatus Inventory { get; set; } public virtual bool AllowBackOrder { get; set; } public virtual bool AllowPreOrder { get; set; } public virtual string EstimatedDelivery { get; set; } public virtual string DefaultImage { get; set; } public virtual DateTime DateAvailable { get; set; } public virtual int AmountOnHand { get; set; } - + public virtual InventoryState Inventory { get; set; } public virtual decimal DiscountedPrice { get { return Price * (1.0M - DiscountPercent); } } - public virtual ICollection<Image> Images { get; set; } - public virtual ICollection<Product> Related { get; set; } - public virtual ICollection<Product> CrossSells { get; set; } public virtual ICollection<Descriptor> Descriptors { get; set; } + public virtual ICollection<Image> Images { get; set; } public virtual ICollection<Product> Recommended { get; set; } - public virtual ICollection<Category> Categories { get; set; } - public virtual ICollection<InventoryRecord> InventoryRecords { get; set; } + + public virtual ISet<Category> Categories { get; set; } #region Object overrides public override bool Equals(object obj) { Kona.Web/Model/Supply/Product.cs @@ -12,7 +12,6 @@ <property name="Price" column="BasePrice" not-null="true" /> <property name="WeightInPounds" column="WeightInPounds" not-null="true" /> <property name="DateAvailable" column="DateAvailable" not-null="true" /> - <property name="Inventory" column="InventoryStatusID" not-null="true" /> <property name="EstimatedDelivery" column="EstimatedDelivery" not-null="true" /> <property name="AllowBackOrder" column="AllowBackOrder" not-null="true" /> <property name="IsTaxable" column="IsTaxable" not-null="true" /> @@ -20,7 +19,7 @@ <property name="AmountOnHand" column="AmountOnHand" not-null="true" /> <property name="AllowPreOrder" column="AllowPreOrder" not-null="true" /> <property name="Delivery" column="DeliveryMethodID" not-null="true" /> - <bag name="Descriptors"> + <bag name="Descriptors" > <key column="SKU"></key> <one-to-many class="Descriptor"/> </bag> Kona.Web/Model/Supply/Product.hbm.xml @@ -1,14 +1,19 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Web; +using Kona.Helpers; using Kona.Model; using Kona.ViewModels; using NHibernate; using NHibernate.Linq; +using NHibernate.Criterion; +using NHibernate.LambdaExtensions; namespace Kona.App.Services { - public class StoreService { + public interface IStoreService{ + ProductListViewModel GetHomeModel(); + } + + public class StoreService : IStoreService{ ISession _session; public StoreService(ISession session) { @@ -39,36 +44,44 @@ namespace Kona.App.Services { // } public ProductListViewModel GetHomeModel() { - var result = new ProductListViewModel(); + var result = new ProductListViewModel(); //add the featured product - result.FeaturedProducts = _session.Linq<Product>() - .Where(x => x.Categories.Any(c => c.ID == 33)); - - //_session.CreateQuery("select p from Category c join c.Products p where c.Id = :categoryID") - //.SetParameter("categoryID", 33).List<Product>(); //categories - result.Categories = _session.Linq<Category>(); + result.Categories = _session + .CreateCriteria<Category>() + .Future<Category>(); - return result; + var featuredProduct = _session + .CreateCriteria<Product>() + .SetFetchMode<Product>(x=>x.Descriptors,FetchMode.Join) + .CreateCriteria<Product>(x=>x.Categories) + .Add<Category>(x=>x.ID==33) + .Future<Product>(); + + result.FeaturedProduct = featuredProduct.First(); + result.FeaturedProducts = featuredProduct.Skip(1).Take(3).ToList(); + + return result; + } -// public DetailsViewModel GetDetails(string sku) { -// var result = new DetailsViewModel(); -// //categories -// result.Categories = _repo.GetCategories(); + // public DetailsViewModel GetDetails(string sku) { + // var result = new DetailsViewModel(); + // //categories + // result.Categories = _repo.GetCategories(); -// //organize them -// result.Categories.ToList().ForEach(x => x.SubCategories = result.Categories.Where(y => y.ParentID == x.ID).ToList()); + // //organize them + // result.Categories.ToList().ForEach(x => x.SubCategories = result.Categories.Where(y => y.ParentID == x.ID).ToList()); -// result.SelectedProduct = _repo.GetProduct(sku); + // result.SelectedProduct = _repo.GetProduct(sku); -// return result; + // return result; -// } - } + // } + } } Kona.Web/Services/StoreService.cs @@ -13,9 +13,10 @@ namespace Kona.ViewModels { } } public IEnumerable<Category> Categories { get; set; } - public IEnumerable<Product> FeaturedProducts { get; set; } - public IEnumerable<Product> Recent { get; set; } - public IEnumerable<Product> Favorite { get; set; } + public IList<Product> FeaturedProducts { get; set; } + public Product FeaturedProduct { get; set; } + public IList<Product> Recent { get; set; } + public IList<Product> Favorite { get; set; } public Category SelectedCategory { get; set; } public Category HomeCategory { get { Kona.Web/ViewModels/ProductListViewModel.cs @@ -49,7 +49,7 @@ <!--Product widget with 1 product--> <div class="prodWidget"> - <%var featured = Model.FeaturedProducts.Take(1).SingleOrDefault(); %> + <%var featured = Model.FeaturedProduct; %> <h4> Featured</h4> <hr /> @@ -81,7 +81,7 @@ <div class="prodWidget"> <h4>Blowout Specials</h4> <hr /> - <%foreach (Product p in Model.FeaturedProducts.Skip(1).Take(3)) { %> + <%foreach (var p in Model.FeaturedProducts) { %> <div class="fltleft prodItem"> <a href="<%=Url.Action("Details","Product",new {id=p.SKU}) %>"><img src="/content/productimages/<%=p.DefaultImage %>" alt="<%=p.Name %>" width="115" height="115" /></a> Kona.Web/Views/Home/Index.aspx 976758baea1251aa85328a860c6ed6b3e2f05df3 Rob Conery robconery@gmail.com http://github.com/robconery/Kona/commit/bfe81af0289580db0b75ad09163311558b43832c bfe81af0289580db0b75ad09163311558b43832c 2009-11-10T19:05:14-08:00 2009-11-10T19:05:14-08:00 Updated for episode 4 aaedf0aec8efb3d7e8f929a1c6041eaa2c0619a1 Rob Conery robconery@gmail.com