Skip to content

Commit 3185e3f

Browse files
ryannewingtonryannewington
committed
Fixes an issue where if during an group import an error is returned when retreiving group settings or members, the group does not appear in the feed.
1 parent 080878a commit 3185e3f

File tree

9 files changed

+50
-51
lines changed

9 files changed

+50
-51
lines changed

‎src/Lithnet.GoogleApps.MA.Setup/Product.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Product Id="*"
44
Name="Lithnet GoogleApps Management Agent"
55
Language="1033"
6-
Version="1.1.6143"
6+
Version="1.1.6145"
77
Manufacturer="Lithnet"
88
UpgradeCode="3410d571b358426281edb2990ae57cae" >
99

‎src/Lithnet.GoogleApps.MA.UnitTests/AdvancedUserTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public void Rename()
202202

203203
e = UserRequestFactory.Add(e);
204204
id = e.Id;
205-
System.Threading.Thread.Sleep(1000);
205+
System.Threading.Thread.Sleep(2000);
206206

207207
CSEntryChange cs = CSEntryChange.Create();
208208
cs.ObjectModificationType = ObjectModificationType.Update;
@@ -222,7 +222,7 @@ public void Rename()
222222
Assert.Fail(result.ErrorName);
223223
}
224224

225-
System.Threading.Thread.Sleep(1000);
225+
System.Threading.Thread.Sleep(2000);
226226
e = UserRequestFactory.Get(id);
227227
Assert.AreEqual(newDN, e.PrimaryEmail);
228228
}
@@ -815,7 +815,7 @@ public void AddDelegates()
815815
Assert.Fail(result.ErrorName);
816816
}
817817

818-
System.Threading.Thread.Sleep(2000);
818+
System.Threading.Thread.Sleep(5000);
819819

820820
CollectionAssert.AreEquivalent(new string[] { delegate1, delegate2 }, UserSettingsRequestFactory.GetDelegates(cs.DN).ToArray());
821821
}
@@ -956,7 +956,7 @@ public void RemoveDelegates()
956956
Assert.Fail(result.ErrorName);
957957
}
958958

959-
System.Threading.Thread.Sleep(5000);
959+
System.Threading.Thread.Sleep(10000);
960960

961961
CollectionAssert.AreEquivalent(new string[] { }, UserSettingsRequestFactory.GetDelegates(cs.DN).ToArray());
962962
}
@@ -991,7 +991,7 @@ public void ReplaceDelegates()
991991
string delegate4 = this.CreateUser(out x);
992992
UserSettingsRequestFactory.AddDelegate(dn, delegate1);
993993
UserSettingsRequestFactory.AddDelegate(dn, delegate2);
994-
System.Threading.Thread.Sleep(5000);
994+
System.Threading.Thread.Sleep(10000);
995995

996996
cs.AttributeChanges.Add(AttributeChange.CreateAttributeReplace("delegate", new List<object>() { delegate3, delegate4 }));
997997

@@ -1005,7 +1005,7 @@ public void ReplaceDelegates()
10051005
Assert.Fail(result.ErrorName);
10061006
}
10071007

1008-
System.Threading.Thread.Sleep(5000);
1008+
System.Threading.Thread.Sleep(10000);
10091009

10101010
CollectionAssert.AreEquivalent(new string[] { delegate3, delegate4 }, UserSettingsRequestFactory.GetDelegates(cs.DN).ToArray());
10111011
}

‎src/Lithnet.GoogleApps.MA.UnitTests/Lithnet.GoogleApps.MA.UnitTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
<HintPath>..\packages\Google.GData.Extensions.2.2.0.0\lib\Google.GData.Extensions.dll</HintPath>
9090
<Private>True</Private>
9191
</Reference>
92-
<Reference Include="Lithnet.GoogleApps, Version=1.0.6143.17367, Culture=neutral, processorArchitecture=MSIL">
93-
<HintPath>..\packages\Lithnet.GoogleApps.1.0.6143.17367\lib\net452\Lithnet.GoogleApps.dll</HintPath>
92+
<Reference Include="Lithnet.GoogleApps, Version=1.0.6144.23555, Culture=neutral, processorArchitecture=MSIL">
93+
<HintPath>..\packages\Lithnet.GoogleApps.1.0.6144.23555\lib\net452\Lithnet.GoogleApps.dll</HintPath>
9494
<Private>True</Private>
9595
</Reference>
9696
<Reference Include="Lithnet.Logging, Version=1.0.5774.20685, Culture=neutral, processorArchitecture=MSIL">

‎src/Lithnet.GoogleApps.MA.UnitTests/UserTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public void Rename()
201201

202202
e = UserRequestFactory.Add(e);
203203
id = e.Id;
204-
System.Threading.Thread.Sleep(1000);
204+
System.Threading.Thread.Sleep(2000);
205205

206206
CSEntryChange cs = CSEntryChange.Create();
207207
cs.ObjectModificationType = ObjectModificationType.Update;
@@ -221,7 +221,7 @@ public void Rename()
221221
Assert.Fail(result.ErrorName);
222222
}
223223

224-
System.Threading.Thread.Sleep(1000);
224+
System.Threading.Thread.Sleep(2000);
225225
e = UserRequestFactory.Get(id);
226226
Assert.AreEqual(newDN, e.PrimaryEmail);
227227
}
@@ -942,7 +942,7 @@ public void TakeAdmin()
942942
Assert.Fail(result.ErrorName);
943943
}
944944

945-
System.Threading.Thread.Sleep(2000);
945+
System.Threading.Thread.Sleep(5000);
946946

947947
e = UserRequestFactory.Get(e.Id);
948948

‎src/Lithnet.GoogleApps.MA.UnitTests/app.config‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,15 @@
44
<section name="lithnet-google-ma" type="Lithnet.GoogleApps.MA.MAConfigurationSection, Lithnet.GoogleApps.MA" />
55
</configSections>
66

7-
<lithnet-google-ma
8-
http-debug-enabled="true"
9-
export-threads="30">
7+
<lithnet-google-ma http-debug-enabled="true" export-threads="30">
108

11-
<directory-api
12-
rate-limit="1500"
13-
pool-size="35"
14-
export-threads-group-member="5"
15-
import-threads-group-member="10"
16-
batch-size-group-member="100"/>
9+
<directory-api rate-limit="1500" pool-size="35" export-threads-group-member="5" import-threads-group-member="10" batch-size-group-member="100" />
1710

18-
<groupssettings-api
19-
rate-limit="1500"
20-
pool-size="30"/>
11+
<groupssettings-api rate-limit="1500" pool-size="30" />
2112

22-
<emailsettings-api
23-
rate-limit="1500"
24-
pool-size="30"/>
13+
<emailsettings-api rate-limit="1500" pool-size="30" />
2514

26-
<contacts-api
27-
rate-limit="1500"
28-
pool-size="30"/>
15+
<contacts-api rate-limit="1500" pool-size="30" />
2916

3017
</lithnet-google-ma>
3118

‎src/Lithnet.GoogleApps.MA.UnitTests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<package id="Google.GData.Client" version="2.2.0.0" targetFramework="net452" />
1212
<package id="Google.GData.Contacts" version="2.2.0.0" targetFramework="net452" />
1313
<package id="Google.GData.Extensions" version="2.2.0.0" targetFramework="net452" />
14-
<package id="Lithnet.GoogleApps" version="1.0.6143.17367" targetFramework="net452" />
14+
<package id="Lithnet.GoogleApps" version="1.0.6144.23555" targetFramework="net452" />
1515
<package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net452" />
1616
<package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net452" />
1717
<package id="log4net" version="2.0.5" targetFramework="net452" />

‎src/Lithnet.GoogleApps.MA/ApiInterfaces/ApiInterfaceGroup.cs‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Concurrent;
33
using System.Collections.Generic;
4+
using System.Diagnostics;
45
using System.Linq;
56
using System.Text.RegularExpressions;
67
using System.Threading.Tasks;
@@ -256,25 +257,36 @@ public Task GetItems(IManagementAgentParameters config, MmsSchema schema, Blocki
256257
Logger.WriteLine("Requesting settings: " + settingsRequired);
257258
Logger.WriteLine("Requesting members: " + membersRequired);
258259

259-
foreach (GoogleGroup group in GroupRequestFactory.GetGroups(config.CustomerID, membersRequired, settingsRequired, groupFields, groupSettingsFields))
260+
Regex filter = null;
261+
262+
if (config.GroupRegexFilter != null)
260263
{
261-
if (!string.IsNullOrWhiteSpace(config.GroupRegexFilter))
262-
{
263-
if (!Regex.IsMatch(group.Group.Email, config.GroupRegexFilter, RegexOptions.IgnoreCase))
264-
{
265-
continue;
266-
}
267-
}
264+
filter = new Regex(config.GroupRegexFilter);
265+
}
268266

269-
if (config.ExcludeUserCreated)
270-
{
271-
if (!group.Group.AdminCreated.HasValue || !group.Group.AdminCreated.Value)
272-
{
273-
continue;
274-
}
275-
}
267+
foreach (GoogleGroup group in GroupRequestFactory.GetGroups(config.CustomerID, membersRequired, settingsRequired, groupFields, groupSettingsFields, config.ExcludeUserCreated, filter))
268+
{
269+
//if (!string.IsNullOrWhiteSpace(config.GroupRegexFilter))
270+
//{
271+
// if (!Regex.IsMatch(group.Group.Email, config.GroupRegexFilter, RegexOptions.IgnoreCase))
272+
// {
273+
// Debug.WriteLine($"Ignoring group based on regex filter: {group.Group.Email}");
274+
// continue;
275+
// }
276+
//}
277+
278+
//if (config.ExcludeUserCreated)
279+
//{
280+
// if (!group.Group.AdminCreated.HasValue || !group.Group.AdminCreated.Value)
281+
// {
282+
// Debug.WriteLine($"Ignoring user created group: {group.Group.Email}");
283+
// continue;
284+
// }
285+
//}
276286

277287
collection.Add(this.GetCSEntryForGroup(group, schema, config));
288+
Debug.WriteLine($"Created CSEntryChange for group: {group.Group.Email}");
289+
278290
continue;
279291
}
280292

‎src/Lithnet.GoogleApps.MA/Lithnet.GoogleApps.MA.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<DocumentationFile />
3737
<BaseAddress>285212672</BaseAddress>
3838
<ConfigurationOverrideFile />
39-
<DefineConstants />
39+
<DefineConstants>TRACE;DEBUG</DefineConstants>
4040
<DefineDebug>true</DefineDebug>
4141
<DefineTrace>true</DefineTrace>
4242
<DebugSymbols>true</DebugSymbols>
@@ -54,7 +54,7 @@
5454
<DocumentationFile />
5555
<BaseAddress>285212672</BaseAddress>
5656
<ConfigurationOverrideFile />
57-
<DefineConstants />
57+
<DefineConstants>TRACE</DefineConstants>
5858
<DefineDebug>false</DefineDebug>
5959
<DefineTrace>true</DefineTrace>
6060
<DebugSymbols>false</DebugSymbols>
@@ -169,8 +169,8 @@
169169
<HintPath>..\packages\Google.GData.Extensions.2.2.0.0\lib\Google.GData.Extensions.dll</HintPath>
170170
<Private>True</Private>
171171
</Reference>
172-
<Reference Include="Lithnet.GoogleApps, Version=1.0.6143.17367, Culture=neutral, processorArchitecture=MSIL">
173-
<HintPath>..\packages\Lithnet.GoogleApps.1.0.6143.17367\lib\net452\Lithnet.GoogleApps.dll</HintPath>
172+
<Reference Include="Lithnet.GoogleApps, Version=1.0.6144.23555, Culture=neutral, processorArchitecture=MSIL">
173+
<HintPath>..\packages\Lithnet.GoogleApps.1.0.6144.23555\lib\net452\Lithnet.GoogleApps.dll</HintPath>
174174
<Private>True</Private>
175175
</Reference>
176176
<Reference Include="Lithnet.Logging, Version=1.0.5774.20685, Culture=neutral, processorArchitecture=MSIL">

‎src/Lithnet.GoogleApps.MA/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<package id="Google.GData.Client" version="2.2.0.0" targetFramework="net452" />
1414
<package id="Google.GData.Contacts" version="2.2.0.0" targetFramework="net452" />
1515
<package id="Google.GData.Extensions" version="2.2.0.0" targetFramework="net452" />
16-
<package id="Lithnet.GoogleApps" version="1.0.6143.17367" targetFramework="net452" />
16+
<package id="Lithnet.GoogleApps" version="1.0.6144.23555" targetFramework="net452" />
1717
<package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net452" />
1818
<package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net452" />
1919
<package id="log4net" version="2.0.5" targetFramework="net452" />

0 commit comments

Comments
 (0)