From b8105a87d60e77fe70a624187dcab06012b4f300 Mon Sep 17 00:00:00 2001 From: smbadiwe Date: Mon, 12 Sep 2016 22:46:50 -0700 Subject: [PATCH] Release 6 --- ...ultiTenancyFramework.SimpleInjector.nuspec | 4 +-- ...ultiTenancyFramework.Mvc.NHibernate.nuspec | 8 +++--- .../MultiTenancyFramework.Mvc.nuspec | 4 +-- .../GetPhotosByOwnerIdAndImageTypeQuery.cs | 11 ++++++++ MultiTenancyFramework.Core/Entities/Photo.cs | 23 ++++++++++++++++- MultiTenancyFramework.Core/Enums.cs | 5 +++- .../MultiTenancyFramework.Core.csproj | 1 + .../MultiTenancyFramework.Core.nuspec | 2 +- .../Maps/PhotoMap.cs | 16 ++++++++++++ .../MultiTenancyFramework.NHibernate.csproj | 2 ++ .../MultiTenancyFramework.NHibernate.nuspec | 4 +-- ...PhotosByOwnerIdAndImageTypeQueryHandler.cs | 25 +++++++++++++++++++ WebTestsNuget/packages.config | 8 +++--- 13 files changed, 96 insertions(+), 17 deletions(-) create mode 100644 MultiTenancyFramework.Core/Data/Queries/GetPhotosByOwnerIdAndImageTypeQuery.cs create mode 100644 MultiTenancyFramework.NHibernate/Maps/PhotoMap.cs create mode 100644 MultiTenancyFramework.NHibernate/Queries/GetPhotosByOwnerIdAndImageTypeQueryHandler.cs diff --git a/IoCContainers/MultiTenancyFramework.SimpleInjector/MultiTenancyFramework.SimpleInjector.nuspec b/IoCContainers/MultiTenancyFramework.SimpleInjector/MultiTenancyFramework.SimpleInjector.nuspec index 31c40d8..b1361b0 100644 --- a/IoCContainers/MultiTenancyFramework.SimpleInjector/MultiTenancyFramework.SimpleInjector.nuspec +++ b/IoCContainers/MultiTenancyFramework.SimpleInjector/MultiTenancyFramework.SimpleInjector.nuspec @@ -2,7 +2,7 @@ $id$ - 1.0.0.5 + 1.0.0.6 $title$ $author$ $author$ @@ -13,7 +13,7 @@ Copyright 2016 SaaS MultiTenant MultiTenancy Framework Software-as-a-Service IoC SimpleInjector - + \ No newline at end of file diff --git a/MVC5/MultiTenancyFramework.Mvc.NHibernate/MultiTenancyFramework.Mvc.NHibernate.nuspec b/MVC5/MultiTenancyFramework.Mvc.NHibernate/MultiTenancyFramework.Mvc.NHibernate.nuspec index 54359f9..e15bfcf 100644 --- a/MVC5/MultiTenancyFramework.Mvc.NHibernate/MultiTenancyFramework.Mvc.NHibernate.nuspec +++ b/MVC5/MultiTenancyFramework.Mvc.NHibernate/MultiTenancyFramework.Mvc.NHibernate.nuspec @@ -2,7 +2,7 @@ $id$ - 1.0.0.5 + 1.0.0.6 $title$ $author$ $author$ @@ -13,9 +13,9 @@ $copyright$ SaaS MultiTenant MultiTenancy Framework Software-as-a-Service MVC5 NHibernate FluentNHibernate - - - + + + diff --git a/MVC5/MultiTenancyFramework.Mvc/MultiTenancyFramework.Mvc.nuspec b/MVC5/MultiTenancyFramework.Mvc/MultiTenancyFramework.Mvc.nuspec index c46eefb..def9444 100644 --- a/MVC5/MultiTenancyFramework.Mvc/MultiTenancyFramework.Mvc.nuspec +++ b/MVC5/MultiTenancyFramework.Mvc/MultiTenancyFramework.Mvc.nuspec @@ -2,7 +2,7 @@ $id$ - 1.0.0.5 + 1.0.0.6 $title$ $author$ $author$ @@ -13,7 +13,7 @@ Copyright 2016 SaaS MultiTenant MultiTenancy Framework Software-as-a-Service MVC5 - + \ No newline at end of file diff --git a/MultiTenancyFramework.Core/Data/Queries/GetPhotosByOwnerIdAndImageTypeQuery.cs b/MultiTenancyFramework.Core/Data/Queries/GetPhotosByOwnerIdAndImageTypeQuery.cs new file mode 100644 index 0000000..c66c32e --- /dev/null +++ b/MultiTenancyFramework.Core/Data/Queries/GetPhotosByOwnerIdAndImageTypeQuery.cs @@ -0,0 +1,11 @@ +using MultiTenancyFramework.Entities; +using System.Collections.Generic; + +namespace MultiTenancyFramework.Data.Queries +{ + public sealed class GetPhotosByOwnerIdAndImageTypeQuery : IDbQuery> + { + public string OwnerID { get; set; } + public ImageType ImageType { get; set; } + } +} diff --git a/MultiTenancyFramework.Core/Entities/Photo.cs b/MultiTenancyFramework.Core/Entities/Photo.cs index cabb3f2..4ad1362 100644 --- a/MultiTenancyFramework.Core/Entities/Photo.cs +++ b/MultiTenancyFramework.Core/Entities/Photo.cs @@ -1,12 +1,33 @@ namespace MultiTenancyFramework.Entities { + /// + /// A person's photo record + /// public class Photo : Entity { - public virtual long OwnerID { get; set; } + /// + /// The ID representing the person that owns this photo record + /// + public virtual string OwnerID { get; set; } + /// + /// The image, as byte array, typically to be saved in the Database + /// public virtual byte[] Image { get; set; } + /// + /// Url (filepath) of the image, use when you're saving the image to disk, not database + /// + public virtual string ImageUrl { get; set; } + + /// + /// Image type + /// public virtual ImageType ImageType { get; set; } + /// + /// Set to true by default. + /// + public override bool SkipAudit { get; set; } = true; } } diff --git a/MultiTenancyFramework.Core/Enums.cs b/MultiTenancyFramework.Core/Enums.cs index 15fc521..e81dd9e 100644 --- a/MultiTenancyFramework.Core/Enums.cs +++ b/MultiTenancyFramework.Core/Enums.cs @@ -28,7 +28,10 @@ public enum ImageType { Passport = 0, Picture, - Signature + Signature, + LeftThumbPrint, + RightThumbPrint, + Other = 99, } public enum Gender diff --git a/MultiTenancyFramework.Core/MultiTenancyFramework.Core.csproj b/MultiTenancyFramework.Core/MultiTenancyFramework.Core.csproj index e3073be..f7527b1 100644 --- a/MultiTenancyFramework.Core/MultiTenancyFramework.Core.csproj +++ b/MultiTenancyFramework.Core/MultiTenancyFramework.Core.csproj @@ -62,6 +62,7 @@ + diff --git a/MultiTenancyFramework.Core/MultiTenancyFramework.Core.nuspec b/MultiTenancyFramework.Core/MultiTenancyFramework.Core.nuspec index b90173e..8104fd6 100644 --- a/MultiTenancyFramework.Core/MultiTenancyFramework.Core.nuspec +++ b/MultiTenancyFramework.Core/MultiTenancyFramework.Core.nuspec @@ -2,7 +2,7 @@ $id$ - 1.0.0.5 + 1.0.0.6 $title$ $author$ $author$ diff --git a/MultiTenancyFramework.NHibernate/Maps/PhotoMap.cs b/MultiTenancyFramework.NHibernate/Maps/PhotoMap.cs new file mode 100644 index 0000000..3aae182 --- /dev/null +++ b/MultiTenancyFramework.NHibernate/Maps/PhotoMap.cs @@ -0,0 +1,16 @@ +using MultiTenancyFramework.Entities; + +namespace MultiTenancyFramework.NHibernate.Maps +{ + public class PhotoMap : EntityMap + { + public PhotoMap() + { + Map(x => x.Name); + Map(x => x.Image); + Map(x => x.ImageUrl); + Map(x => x.ImageType); + Map(x => x.OwnerID); + } + } +} diff --git a/MultiTenancyFramework.NHibernate/MultiTenancyFramework.NHibernate.csproj b/MultiTenancyFramework.NHibernate/MultiTenancyFramework.NHibernate.csproj index 107f62f..7be931a 100644 --- a/MultiTenancyFramework.NHibernate/MultiTenancyFramework.NHibernate.csproj +++ b/MultiTenancyFramework.NHibernate/MultiTenancyFramework.NHibernate.csproj @@ -73,6 +73,7 @@ + @@ -108,6 +109,7 @@ + diff --git a/MultiTenancyFramework.NHibernate/MultiTenancyFramework.NHibernate.nuspec b/MultiTenancyFramework.NHibernate/MultiTenancyFramework.NHibernate.nuspec index 5392a8a..7f439b9 100644 --- a/MultiTenancyFramework.NHibernate/MultiTenancyFramework.NHibernate.nuspec +++ b/MultiTenancyFramework.NHibernate/MultiTenancyFramework.NHibernate.nuspec @@ -2,7 +2,7 @@ $id$ - 1.0.0.5 + 1.0.0.6 $title$ $author$ $author$ @@ -13,7 +13,7 @@ $copyright$ SaaS MultiTenant MultiTenancy Framework Software-as-a-Service MVC5 NHibernate FluentNHibernate - + diff --git a/MultiTenancyFramework.NHibernate/Queries/GetPhotosByOwnerIdAndImageTypeQueryHandler.cs b/MultiTenancyFramework.NHibernate/Queries/GetPhotosByOwnerIdAndImageTypeQueryHandler.cs new file mode 100644 index 0000000..da70d4b --- /dev/null +++ b/MultiTenancyFramework.NHibernate/Queries/GetPhotosByOwnerIdAndImageTypeQueryHandler.cs @@ -0,0 +1,25 @@ +using MultiTenancyFramework.Data.Queries; +using MultiTenancyFramework.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MultiTenancyFramework.NHibernate.Queries +{ + public sealed class GetPhotosByOwnerIdAndImageTypeQueryHandler + : CoreGeneralDAO, IDbQueryHandler> + { + public IList Handle(GetPhotosByOwnerIdAndImageTypeQuery theQuery) + { + if (string.IsNullOrWhiteSpace(theQuery.OwnerID)) return new List(); + + var session = BuildSession(); + var query = session.QueryOver() + .Where(x => x.OwnerID == theQuery.OwnerID) + .And(x => x.ImageType == theQuery.ImageType); + return query.List(); + } + } +} diff --git a/WebTestsNuget/packages.config b/WebTestsNuget/packages.config index 0af2bca..940f931 100644 --- a/WebTestsNuget/packages.config +++ b/WebTestsNuget/packages.config @@ -15,10 +15,10 @@ - - - - + + + +