Changeset 6825 for branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/Convert.cs

Timestamp:

09/23/11 20:13:55 (13 years ago)

Author:

ascheibe

Message:

#1648 updated the database scheme and dto's

Location:

branches/ClientUserManagement

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Access/3.3 (modified) (1 prop)
• HeuristicLab.Services.Access/3.3/Convert.cs (modified) (7 diffs)

branches/ClientUserManagement

@@ -1 +1 @@
 *.suo
+*.testsettings
+HeuristicLab.Services.Access.vsmdi

@@ -1 +1 @@
 *.suo
+*.testsettings
+HeuristicLab.Services.Access.vsmdi

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3

@@ -2 +2 @@
 bin
 obj
+HeuristicLab.Services.Access-3.3.csproj.user

@@ -2 +2 @@
 bin
 obj
+HeuristicLab.Services.Access-3.3.csproj.user

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/Convert.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Linq;
 using DA = HeuristicLab.Services.Access.DataAccess;
 using DT = HeuristicLab.Services.Access.DataTransfer;
+
 
 namespace HeuristicLab.Services.ClientManagement {
@@ -31 +34 @@
         Id = source.Id,
         Description = source.Description,
-        Name = source.Name,
-        Type = source.Type
+        Name = source.Name
       };
     }
@@ -40 +42 @@
         Id = source.Id,
         Description = source.Description,
-        Name = source.Name,
-        Type = source.Type
-      };
-    }
-    #endregion
-
-    #region Group
-    public static DT.ClientGroup ToDto(DA.Group source) {
+        Name = source.Name
+      };
+    }
+    #endregion
+
+    #region ClientGroup
+    public static DT.ClientGroup ToDto(DA.ClientGroup source) {
       return new DT.ClientGroup() {
         Id = source.Id,
         Description = source.Description,
-        Name = source.Name,
-        Type = source.Type
-      };
-    }
-
-    public static DA.Group ToEntity(DT.ClientGroup source) {
-      return new DA.Group() {
-        Id = source.Id,
-        Description = source.Description,
-        Name = source.Name,
-        Type = source.Type
+        Name = source.Name
+      };
+    }
+
+    public static DA.ClientGroup ToEntity(DT.ClientGroup source) {
+      return new DA.ClientGroup() {
+        Id = source.Id,
+        Description = source.Description,
+        Name = source.Name,
+
+      };
+    }
+    #endregion
+
+    #region Country
+    public static DT.Country ToDto(DA.Country source) {
+      return new DT.Country() {
+        Id = source.Id,
+        Name = source.Name
+      };
+    }
+
+    public static DA.Country ToEntity(DT.Country source) {
+      return new DA.Country() {
+        Id = source.Id,
+        Name = source.Name,
+
+      };
+    }
+    #endregion
+
+    #region OperatingSystem
+    public static DT.OperatingSystem ToDto(DA.OperatingSystem source) {
+      return new DT.OperatingSystem() {
+        Id = source.Id,
+        Name = source.Name
+      };
+    }
+
+    public static DA.OperatingSystem ToEntity(DT.OperatingSystem source) {
+      return new DA.OperatingSystem() {
+        Id = source.Id,
+        Name = source.Name,
+
+      };
+    }
+    #endregion
+
+    #region ClientType
+    public static DT.ClientType ToDto(DA.ClientType source) {
+      return new DT.ClientType() {
+        Id = source.Id,
+        Name = source.Name
+      };
+    }
+
+    public static DA.ClientType ToEntity(DT.ClientType source) {
+      return new DA.ClientType() {
+        Id = source.Id,
+        Name = source.Name,
+
+      };
+    }
+    #endregion
+
+    #region ClientConfiguration
+    public static DT.ClientConfiguration ToDto(DA.ClientConfiguration source) {
+      return new DT.ClientConfiguration() {
+        Id = source.Id,
+        Hash = source.Hash,
+        Description = source.Description
+      };
+    }
+
+    public static DA.ClientConfiguration ToEntity(DT.ClientConfiguration source) {
+      return new DA.ClientConfiguration() {
+        Id = source.Id,
+        Hash = source.Hash,
+        Description = source.Description
+      };
+    }
+    #endregion
+
+    #region Plugin
+    public static DT.Plugin ToDto(DA.Plugin source) {
+      return new DT.Plugin() {
+        Id = source.Id,
+        Name = source.Name,
+        StrongName = source.StrongName,
+        Version = source.Version
+      };
+    }
+
+    public static DA.Plugin ToEntity(DT.Plugin source) {
+      return new DA.Plugin() {
+        Id = source.Id,
+        Name = source.Name,
+        StrongName = source.StrongName,
+        Version = source.Version
       };
     }
@@ -72 +161 @@
         Description = source.Description,
         Name = source.Name,
-        Type = source.Type,
-        Country = source.Country,
+        ClientConfiguration = ToDto(source.ClientConfiguration),
         HeuristicLabVersion = source.HeuristicLabVersion,
-        IPAddress = source.IPAddress,
-        MemorySize = source.MemorySize,
-        NumberOfCores = source.NumberOfCores,
-        OperatingSystem = source.OperatingSystem,
+        Country = ToDto(source.Country),
+        OperatingSystem = ToDto(source.OperatingSystem),
+        MemorySize = source.MemorySize.GetValueOrDefault(),
+        Timestamp = source.Timestamp.GetValueOrDefault(),
+        NumberOfCores = source.NumberOfCores.GetValueOrDefault(),
         ProcessorType = source.ProcessorType,
-        ClientType = source.ClientType
+        ClientType = ToDto(source.ClientType)
       };
     }
@@ -89 +178 @@
         Description = source.Description,
         Name = source.Name,
-        Type = source.Type,
-        Country = source.Country,
+        ClientConfiguration = ToEntity(source.ClientConfiguration),
         HeuristicLabVersion = source.HeuristicLabVersion,
-        IPAddress = source.IPAddress,
+        Country = ToEntity(source.Country),
+        OperatingSystem = ToEntity(source.OperatingSystem),
         MemorySize = source.MemorySize,
+        Timestamp = source.Timestamp,
         NumberOfCores = source.NumberOfCores,
-        OperatingSystem = source.OperatingSystem,
         ProcessorType = source.ProcessorType,
-        ClientType = source.ClientType
+        ClientType = ToEntity(source.ClientType)
       };
     }
@@ -107 +196 @@
         Timestamp = source.Timestamp,
         ResourceId = source.ResourceId,
-        Exception = source.Exception,
         Message = source.Message
       };
@@ -116 +204 @@
         Timestamp = source.Timestamp,
         ResourceId = source.ResourceId,
+        Message = source.Message
+      };
+    }
+    #endregion
+
+    #region ClientError
+    public static DT.ClientError ToDto(DA.ClientError source) {
+      return new DT.ClientError() {
+        Id = source.Id,
+        Timestamp = source.Timestamp,
         Exception = source.Exception,
-        Message = source.Message
-      };
+        UserComment = source.UserComment,
+        ConfigDump = source.ConfigDump,
+        ClientId = source.ClientId.GetValueOrDefault(),
+        UserId = source.UserId.GetValueOrDefault()
+      };
+    }
+
+    public static DA.ClientError ToEntity(DT.ClientError source) {
+      return new DA.ClientError() {
+        Id = source.Id,
+        Timestamp = source.Timestamp,
+        Exception = source.Exception,
+        UserComment = source.UserComment,
+        ConfigDump = source.ConfigDump,
+        ClientId = source.ClientId,
+        UserId = source.UserId
+      };
+    }
+    #endregion
+
+    #region UserGroup
+    public static DT.UserGroup ToDto(DA.UserGroup source) {
+      return new DT.UserGroup() {
+        Id = source.Id,
+        Name = source.Name
+      };
+    }
+
+    public static DA.UserGroup ToEntity(DT.UserGroup source) {
+      return new DA.UserGroup() {
+        Id = source.Id,
+        Name = source.Name
+      };
+    }
+    #endregion
+
+    #region User
+    public static DT.User ToDto(DA.User source, DA.aspnet_User aspUserSource, DA.aspnet_Membership aspMembershipSource) {
+      return new DT.User() {
+        Id = source.Id,
+        FullName = source.FullName,
+        Comment = aspMembershipSource.Comment,
+        CreationDate = aspMembershipSource.CreateDate,
+        Email = aspMembershipSource.Email,
+        IsApproved = aspMembershipSource.IsApproved,
+        LastActivityDate = aspUserSource.LastActivityDate,
+        LastLoginDate = aspMembershipSource.LastLoginDate,
+        LastPasswordChangedDate = aspMembershipSource.LastPasswordChangedDate,
+        UserName = aspUserSource.UserName
+      };
+    }
+
+    public static void ToEntity(DT.User source, out DA.User accessUser, out DA.aspnet_User aspUser, out DA.aspnet_Membership aspMembership, out bool userExistsInASP) {
+      userExistsInASP = false;
+      accessUser = new DA.User();
+      aspUser = new DA.aspnet_User();
+      aspMembership = new DA.aspnet_Membership();
+
+      if (source.Id != Guid.Empty) {
+        using (DA.ASPNETAuthenticationDataContext context = new DA.ASPNETAuthenticationDataContext()) {
+          var userCol = context.aspnet_Users.Where(s => s.UserId == source.Id);
+          var membershipCol = context.aspnet_Memberships.Where(s => s.UserId == source.Id);
+          if (userCol.Count() > 0 && membershipCol.Count() > 0) {
+            aspUser = userCol.First();
+            aspMembership = membershipCol.First();
+            userExistsInASP = true;
+          }
+        }
+      }
+
+      accessUser.Id = source.Id;
+      accessUser.FullName = source.FullName;
+
+      aspUser.UserId = source.Id;
+      aspUser.LastActivityDate = source.LastActivityDate;
+      aspUser.UserName = source.UserName;
+
+      aspMembership.UserId = source.Id;
+      aspMembership.Comment = source.Comment;
+      aspMembership.CreateDate = source.CreationDate;
+      aspMembership.Email = source.Email;
+      aspMembership.IsApproved = source.IsApproved;
+      aspMembership.LastLoginDate = source.LastLoginDate;
+      aspMembership.LastPasswordChangedDate = source.LastPasswordChangedDate;
     }
     #endregion

@@ -1 +1 @@
 *.suo
+*.testsettings
+HeuristicLab.Services.Access.vsmdi

@@ -2 +2 @@
 bin
 obj
+HeuristicLab.Services.Access-3.3.csproj.user