[WebApiUtils] tests

WebAPiUtils-test/BusinessManager/ValuesBusiness.cs

@@ -7,15 +7,19 @@ namespace WebAPiUtils_test.BusinessManager
 {
     public class ValuesBusiness
     {
-        public static OpResult<ValuesDbo> Get(long id)
+        public static OpResult<ValuesDboGet> Get(long id)
         {
-            //return ValuesManager.Get(id);
-            return ValuesManager.GetByIdDbo(id);
+            return ValuesManager.GetSingleById(id);
         }
 
-        public static OpResult<IEnumerable<ValuesDbo>> Contains(string text)
+        public static OpResult<IEnumerable<ValuesDboGet>> Contains(string text, int page, int perPage)
         {
-            return ValuesManager.Contains(text);
+            return ValuesManager.Contains(text, page, perPage);
+        }
+
+        public static OpResult<bool> Edit(ValuesDboEdit obj, long id)
+        {
+            return ValuesManager.EditById(obj, id);
         }
     }
 }

WebAPiUtils-test/Controllers/ValuesController.cs

@@ -9,38 +9,25 @@ namespace WebAPiUtils_test.Controllers
 {
     public class ValuesController : ApiController
     {
-        // GET api/values
-        public IEnumerable<string> Get()
-        {
-            throw new Exception("Something went wrong...");
-        }
-
-        // GET api/values/5
-        public ValuesDbo Get(int id)
+        [HttpGet]
+        [Route("api/values/{id}")]
+        public ValuesDboGet Get(int id)
         {
-            return BMRHandler<ValuesDbo>.Handle(ValuesBusiness.Get(id), Request);
+            return BMRHandler<ValuesDboGet>.Handle(ValuesBusiness.Get(id), Request);
         }
 
         [HttpGet]
         [Route("api/values/contains")]
-        public IEnumerable<ValuesDbo> Contains(string text)
-        {
-            return BMRHandler<IEnumerable<ValuesDbo>>.Handle(ValuesBusiness.Contains(text), Request);
-        }
-
-        // POST api/values
-        public void Post([FromBody]MyDbo value)
-        {
-        }
-
-        // PUT api/values/5
-        public void Put(int id, [FromBody]string value)
+        public IEnumerable<ValuesDboGet> Contains(string text, int page = 0, int perPage = Int32.MaxValue)
         {
+            return BMRHandler<IEnumerable<ValuesDboGet>>.Handle(ValuesBusiness.Contains(text, page, perPage), Request);
         }
 
-        // DELETE api/values/5
-        public void Delete(int id)
+        [HttpPost]
+        [Route("api/values/edit/{id}")]
+        public bool Edit(long id, ValuesDboEdit obj)
         {
+            return BMRHandler<bool>.Handle(ValuesBusiness.Edit(obj, id), Request);
         }
     }
 }

WebAPiUtils-test/DBO/MyDbo.cs

@@ -1,13 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace WebAPiUtils_test.DBO
-{
-    public class MyDbo
-    {
-        [Required]
-        public int MyInt { get; set; }
-
-        [MinLength(2)]
-        public string MyString { get; set; }
-    }
-}

WebAPiUtils-test/DBO/ValuesDboAdd.cs

@@ -0,0 +1,7 @@
+
+namespace WebAPiUtils_test.DBO
+{
+    public class ValuesDboAdd : ValuesDboEdit
+    {
+    }
+}

WebAPiUtils-test/DBO/ValuesDbo.cs → WebAPiUtils-test/DBO/ValuesDboEdit.cs

@@ -1,12 +1,12 @@
 
 namespace WebAPiUtils_test.DBO
 {
-    public class ValuesDbo
+    public class ValuesDboEdit
     {
-        public long Id { get; set; }
-
         public string MyString { get; set; }
 
         public int MyInt { get; set; }
+
+        public long TextId { get; set; }
     }
 }

WebAPiUtils-test/DBO/ValuesDboGet.cs

@@ -0,0 +1,10 @@
+
+namespace WebAPiUtils_test.DBO
+{
+    public class ValuesDboGet : ValuesDboAdd
+    {
+        public long Id { get; set; }
+
+        public string Text { get; set; }
+    }
+}

WebAPiUtils-test/DataAccess/SqlServerManager.Context.cs

@@ -26,5 +26,6 @@ namespace WebAPiUtils_test.DataAccess
         }
     
         public virtual DbSet<T_SqlManager> T_SqlManager { get; set; }
+        public virtual DbSet<T_Text> T_Text { get; set; }
     }
 }

WebAPiUtils-test/DataAccess/SqlServerManager.edmx

@@ -12,9 +12,34 @@
           <Property Name="id" Type="bigint" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="my_string" Type="varchar" MaxLength="50" Nullable="false" />
           <Property Name="my_int" Type="int" Nullable="false" />
+          <Property Name="text" Type="bigint" Nullable="false" />
         </EntityType>
+        <EntityType Name="T_Text">
+          <Key>
+            <PropertyRef Name="id" />
+          </Key>
+          <Property Name="id" Type="bigint" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="text" Type="varchar" MaxLength="50" Nullable="false" />
+        </EntityType>
+        <Association Name="FK_T_SqlManager_T_Text">
+          <End Role="T_Text" Type="Self.T_Text" Multiplicity="1" />
+          <End Role="T_SqlManager" Type="Self.T_SqlManager" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="T_Text">
+              <PropertyRef Name="id" />
+            </Principal>
+            <Dependent Role="T_SqlManager">
+              <PropertyRef Name="text" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <EntityContainer Name="ModelStoreContainer">
           <EntitySet Name="T_SqlManager" EntityType="Self.T_SqlManager" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="T_Text" EntityType="Self.T_Text" Schema="dbo" store:Type="Tables" />
+          <AssociationSet Name="FK_T_SqlManager_T_Text" Association="Self.FK_T_SqlManager_T_Text">
+            <End Role="T_Text" EntitySet="T_Text" />
+            <End Role="T_SqlManager" EntitySet="T_SqlManager" />
+          </AssociationSet>
         </EntityContainer>
       </Schema></edmx:StorageModels>
     <!-- CSDL content -->
@@ -22,6 +47,11 @@
       <Schema Namespace="Model" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
         <EntityContainer Name="SqlServerManagerEntities" annotation:LazyLoadingEnabled="true">
           <EntitySet Name="T_SqlManager" EntityType="Model.T_SqlManager" />
+          <EntitySet Name="T_Text" EntityType="Model.T_Text" />
+          <AssociationSet Name="FK_T_SqlManager_T_Text" Association="Model.FK_T_SqlManager_T_Text">
+            <End Role="T_Text" EntitySet="T_Text" />
+            <End Role="T_SqlManager" EntitySet="T_SqlManager" />
+          </AssociationSet>
         </EntityContainer>
         <EntityType Name="T_SqlManager">
           <Key>
@@ -30,7 +60,29 @@
           <Property Name="id" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="my_string" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
           <Property Name="my_int" Type="Int32" Nullable="false" />
+          <Property Name="text" Type="Int64" Nullable="false" />
+          <NavigationProperty Name="T_Text" Relationship="Model.FK_T_SqlManager_T_Text" FromRole="T_SqlManager" ToRole="T_Text" />
+        </EntityType>
+        <EntityType Name="T_Text">
+          <Key>
+            <PropertyRef Name="id" />
+          </Key>
+          <Property Name="id" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="text" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="T_SqlManager" Relationship="Model.FK_T_SqlManager_T_Text" FromRole="T_Text" ToRole="T_SqlManager" />
         </EntityType>
+        <Association Name="FK_T_SqlManager_T_Text">
+          <End Type="Model.T_Text" Role="T_Text" Multiplicity="1" />
+          <End Type="Model.T_SqlManager" Role="T_SqlManager" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="T_Text">
+              <PropertyRef Name="id" />
+            </Principal>
+            <Dependent Role="T_SqlManager">
+              <PropertyRef Name="text" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
       </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -40,12 +92,21 @@
           <EntitySetMapping Name="T_SqlManager">
             <EntityTypeMapping TypeName="Model.T_SqlManager">
               <MappingFragment StoreEntitySet="T_SqlManager">
+                <ScalarProperty Name="text" ColumnName="text" />
                 <ScalarProperty Name="my_int" ColumnName="my_int" />
                 <ScalarProperty Name="my_string" ColumnName="my_string" />
                 <ScalarProperty Name="id" ColumnName="id" />
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="T_Text">
+            <EntityTypeMapping TypeName="Model.T_Text">
+              <MappingFragment StoreEntitySet="T_Text">
+                <ScalarProperty Name="text" ColumnName="text" />
+                <ScalarProperty Name="id" ColumnName="id" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
         </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>

WebAPiUtils-test/DataAccess/SqlServerManager.edmx.diagram

@@ -5,7 +5,9 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="08dc5c61470647c385ff700da7502692" Name="Diagram1">
-        <EntityTypeShape EntityType="Model.T_SqlManager" Width="1.5" PointX="0.75" PointY="0.75" />
+        <EntityTypeShape EntityType="Model.T_SqlManager" Width="1.5" PointX="3" PointY="0.875" />
+        <EntityTypeShape EntityType="Model.T_Text" Width="1.5" PointX="0.75" PointY="1.125" />
+        <AssociationConnector Association="Model.FK_T_SqlManager_T_Text" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>

WebAPiUtils-test/DataAccess/T_SqlManager.cs

@@ -17,5 +17,8 @@ namespace WebAPiUtils_test.DataAccess
         public long id { get; set; }
         public string my_string { get; set; }
         public int my_int { get; set; }
+        public long text { get; set; }
+    
+        public virtual T_Text T_Text { get; set; }
     }
 }

WebAPiUtils-test/DataAccess/T_Text.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebAPiUtils_test.DataAccess
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class T_Text
+    {
+        public T_Text()
+        {
+            this.T_SqlManager = new HashSet<T_SqlManager>();
+        }
+    
+        public long id { get; set; }
+        public string text { get; set; }
+    
+        public virtual ICollection<T_SqlManager> T_SqlManager { get; set; }
+    }
+}

WebAPiUtils-test/DataAccess/ValuesManager.cs

@@ -1,42 +1,54 @@
 using System.Collections.Generic;
 using System.Data.Entity;
-using System.Security;
 using iiie.Logs.DBO;
 using iiie.WebApiUtils.BusinessManager;
 using WebAPiUtils_test.DBO;
 
 namespace WebAPiUtils_test.DataAccess
 {
-    public class ValuesManager : SqlServerManager<T_SqlManager, ValuesDbo, SqlServerManagerEntities, ValuesManager>
+    public class ValuesManager : SqlServerManager<T_SqlManager, ValuesDboGet, ValuesDboAdd, ValuesDboEdit, SqlServerManagerEntities, ValuesManager>
     {
         public override DbSet<T_SqlManager> GetTable(SqlServerManagerEntities db)
         {
             return db.T_SqlManager;
         }
 
-        public override ValuesDbo DbToDbo(T_SqlManager o)
+        public override ValuesDboGet DbToDboGet(T_SqlManager obj)
         {
-            return new ValuesDbo
+            return new ValuesDboGet
             {
-                Id = o.id,
-                MyInt = o.my_int,
-                MyString = o.my_string
+                Id = obj.id,
+                MyInt = obj.my_int,
+                MyString = obj.my_string,
+                Text = obj.T_Text.text,
+                TextId = obj.text
             };
         }
 
-        public override T_SqlManager DboToDb(ValuesDbo o)
+        public override T_SqlManager DboAddToDb(ValuesDboAdd obj)
         {
             return new T_SqlManager
             {
-                id = o.Id,
-                my_int = o.MyInt,
-                my_string = o.MyString
+                my_string = obj.MyString,
+                my_int = obj.MyInt,
+                text = obj.TextId
             };
         }
 
-        public static OpResult<IEnumerable<ValuesDbo>> Contains(string text)
+        public override T_SqlManager DboEditToDb(ValuesDboEdit obj, T_SqlManager edit)
         {
-            return GetMultipleDbo(x => x.my_string.Contains(text));
+            return new T_SqlManager
+            {
+                id = edit.id,
+                my_string = obj.MyString,
+                my_int = obj.MyInt,
+                text = obj.TextId
+            };
+        }
+
+        public static OpResult<IEnumerable<ValuesDboGet>> Contains(string text, int page, int perPage)
+        {
+            return GetMultiple(x => x.my_string.Contains(text), x => x.id, page, perPage);
         }
     }
 }

WebAPiUtils-test/WebAPiUtils-test.csproj

@@ -48,7 +48,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Logs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Logs.dll.1.2.1\lib\net45\Logs.dll</HintPath>
+      <HintPath>..\packages\Logs.dll.1.2.2\lib\net45\Logs.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
@@ -187,9 +187,13 @@
     <Compile Include="DataAccess\T_SqlManager.cs">
       <DependentUpon>SqlServerManager.tt</DependentUpon>
     </Compile>
+    <Compile Include="DataAccess\T_Text.cs">
+      <DependentUpon>SqlServerManager.tt</DependentUpon>
+    </Compile>
     <Compile Include="DataAccess\ValuesManager.cs" />
-    <Compile Include="DBO\MyDbo.cs" />
-    <Compile Include="DBO\ValuesDbo.cs" />
+    <Compile Include="DBO\ValuesDboAdd.cs" />
+    <Compile Include="DBO\ValuesDboEdit.cs" />
+    <Compile Include="DBO\ValuesDboGet.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>

WebAPiUtils-test/packages.config

@@ -8,7 +8,7 @@
   <package id="EnterpriseLibrary.Logging.Database" version="6.0.1304.0" targetFramework="net45" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
   <package id="jQuery" version="1.10.2" targetFramework="net45" />
-  <package id="Logs.dll" version="1.2.1" targetFramework="net45" />
+  <package id="Logs.dll" version="1.2.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="5.0.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="3.0.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Web.Optimization" version="1.1.1" targetFramework="net45" />

WebApiUtils/WebApiUtils.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>3ieWebApiUtils.dll</id>
-    <version>1.2.0</version>
+    <version>2.0.0</version>
     <title>Web Api Utils</title>
     <authors>robin.thoni</authors>
     <owners>robin.thoni</owners>