MS

Modules.Interfaces/ActiveDirectoryInterface/SyncUsers.MSSQL.vb

@@ -73,11 +73,14 @@ Namespace SyncUsers
                     Else
                         _logger.Debug("Updating user [{0}]", oUser)
                         oUserId = UpdateUser(oUser)
-                        _logger.Debug("User created with Id [{0}]", oUserId)
-                        _logger.Info("Updated User [{0}]", oUser.samAccountName)
+                        If oUserId <> 0 Then
+                            _logger.Debug("User created with Id [{0}]", oUserId)
+                            _logger.Info("Updated User [{0}]", oUser.samAccountName)
 
-                        oUpdatedUsers.Add(oUser)
+                            oUpdatedUsers.Add(oUser)
+                        End If
                     End If
+
                 Catch ex As Exception
                     _logger.Error(ex)
                     _logger.Warn("Could Not create/update user. Skipping.")
@@ -110,10 +113,14 @@ Namespace SyncUsers
             Dim oUserIdString = String.Join(",", oSyncedUserIds)
             Dim oSQL As String = $"DELETE FROM TBDD_GROUPS_USER WHERE USER_ID NOT IN (${oUserIdString}) AND GROUP_ID = {oGroupId}"
             Dim oDeletedRelations = _mssql.GetScalarValue(oSQL)
-
-            _logger.Info("Created [{0}] new users", oCreatedUsers.Count)
+            If oCreatedUsers.Count > 0 Then
+                _logger.Info("Created [{0}] new users", oCreatedUsers.Count)
+            End If
             _logger.Info("Updated [{0}] users", oUpdatedUsers.Count)
-            _logger.Info("Removed [{0}] users from Group [{1}]", oDeletedRelations, GroupName)
+            If oDeletedRelations > 0 Then
+                _logger.Info("Removed [{0}] users from Group [{1}]", oDeletedRelations, GroupName)
+            End If
+
 
             Return oSyncedUsers
         End Function
@@ -200,18 +207,24 @@ Namespace SyncUsers
         Private Function UpdateUser(User As ADUser) As Integer
             Try
                 Dim oUserId As Integer = GetUserId(User.samAccountName)
-                If oUserId > 0 Then
-                    Dim oSQL As String = $"UPDATE TBDD_USER SET PRENAME = '{User.GivenName}', NAME = '{User.Surname.Replace("'", "''")}', EMAIL = '{User.Email.Replace("'", "''")}', CHANGED_WHO = '{ADDED_WHO}' WHERE GUID = {oUserId}"
-                    Dim oResult = _mssql.ExecuteNonQuery(oSQL)
+                If Not IsNothing(oUserId) Then
+                    If oUserId > 0 Then
+                        Dim oSQL As String = $"UPDATE TBDD_USER SET PRENAME = '{User.GivenName}', NAME = '{User.Surname.Replace("'", "''")}', EMAIL = '{User.Email.Replace("'", "''")}', CHANGED_WHO = '{ADDED_WHO}' WHERE GUID = {oUserId}"
+                        Dim oResult = _mssql.ExecuteNonQuery(oSQL)
 
-                    If oResult = True Then
-                        Return oUserId
+                        If oResult = True Then
+                            Return oUserId
+                        Else
+                            Throw New Exception($"Error while updating user {User.samAccountName}!")
+                        End If
                     Else
-                        Throw New Exception($"Error while updating user {User.samAccountName}!")
+                        Return oUserId
                     End If
                 Else
-                    Return oUserId
+                    _logger.Warn("Error in UpdateUser - Could not get a userid for samAccountName: " + User.samAccountName)
+                    Return 0
                 End If
+
             Catch ex As Exception
                 _logger.Error(ex)
                 Throw ex