Browse Source

Notifo updated.

pull/617/head
Sebastian 5 years ago
parent
commit
3ebd736fee
  1. 18
      backend/src/Squidex.Domain.Apps.Entities/History/NotifoService.cs
  2. 6
      backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  3. 10
      backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  4. 10
      backend/src/Squidex/Squidex.csproj
  5. 2
      backend/tests/RunCoverage.ps1
  6. 2
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj
  7. 4
      backend/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj

18
backend/src/Squidex.Domain.Apps.Entities/History/NotifoService.cs

@ -79,13 +79,13 @@ namespace Squidex.Domain.Apps.Entities.History
{
[Providers.WebPush] = new NotificationSettingDto
{
Send = true,
Send = NotificationSend.Send,
DelayInSeconds = null
},
[Providers.Email] = new NotificationSettingDto
{
Send = true,
Send = NotificationSend.Send,
DelayInSeconds = 5 * 60
}
};
@ -133,7 +133,7 @@ namespace Squidex.Domain.Apps.Entities.History
if (publishedEvents.Any())
{
var requests = new List<PublishRequestDto>();
var requests = new List<PublishDto>();
foreach (var @event in publishedEvents)
{
@ -143,7 +143,7 @@ namespace Squidex.Domain.Apps.Entities.History
{
foreach (var userId in comment.Mentions!)
{
var publishRequest = new PublishRequestDto
var publishRequest = new PublishDto
{
Topic = $"users/{userId}"
};
@ -166,7 +166,7 @@ namespace Squidex.Domain.Apps.Entities.History
{
var historyEvent = @event.HistoryEvent;
var publishRequest = new PublishRequestDto
var publishRequest = new PublishDto
{
Properties = new EventProperties()
};
@ -194,7 +194,7 @@ namespace Squidex.Domain.Apps.Entities.History
}
}
var request = new PublishManyRequestDto
var request = new PublishManyDto
{
Requests = requests
};
@ -219,7 +219,7 @@ namespace Squidex.Domain.Apps.Entities.History
try
{
var request = new AddAllowedTopicRequest
var request = new AddAllowedTopicDto
{
Prefix = GetAppPrefix(contributorAssigned)
};
@ -265,7 +265,7 @@ namespace Squidex.Domain.Apps.Entities.History
return appEvent is CommentCreated comment && comment.Mentions?.Length > 0;
}
private static void SetUser(AppEvent appEvent, PublishRequestDto publishRequest)
private static void SetUser(AppEvent appEvent, PublishDto publishRequest)
{
if (appEvent.Actor.IsSubject)
{
@ -273,7 +273,7 @@ namespace Squidex.Domain.Apps.Entities.History
}
}
private static void SetTopic(AppEvent appEvent, PublishRequestDto publishRequest, HistoryEvent @event)
private static void SetTopic(AppEvent appEvent, PublishDto publishRequest, HistoryEvent @event)
{
var topicPrefix = GetAppPrefix(appEvent);
var topicSuffix = @event.Channel.Replace('.', '/').Trim();

6
backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj

@ -26,12 +26,12 @@
</PackageReference>
<PackageReference Include="GraphQL" Version="3.2.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.3.0">
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
<PackageReference Include="Notifo.SDK" Version="1.0.0-alpha9" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.4.0" />
<PackageReference Include="Notifo.SDK" Version="1.0.0-alpha16" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />

10
backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj

@ -14,23 +14,23 @@
<None Remove="NewFolder\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MailKit" Version="2.10.0" />
<PackageReference Include="MailKit" Version="2.10.1" />
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.3.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.1" />
<PackageReference Include="Microsoft.OData.Core" Version="7.8.1" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.3.0">
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.3.0" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.4.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NJsonSchema" Version="10.3.2" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.Assets" Version="1.3.0" />
<PackageReference Include="Squidex.Caching" Version="1.3.0" />
<PackageReference Include="Squidex.Hosting.Abstractions" Version="1.7.0" />
<PackageReference Include="Squidex.Hosting.Abstractions" Version="1.8.0" />
<PackageReference Include="Squidex.Log" Version="1.1.0" />
<PackageReference Include="Squidex.Text" Version="1.5.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

10
backend/src/Squidex/Squidex.csproj

@ -45,9 +45,9 @@
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
<PackageReference Include="Microsoft.Data.Edm" Version="5.8.4" />
<PackageReference Include="Microsoft.OData.Core" Version="7.8.1" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.3.0" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.4.0" />
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.4.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.4.0" />
<PackageReference Include="MongoDB.Driver" Version="2.11.5" />
<PackageReference Include="Namotion.Reflection" Version="1.0.15" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
@ -57,7 +57,7 @@
<PackageReference Include="Orleans.Providers.MongoDB" Version="3.2.0" />
<PackageReference Include="OrleansDashboard" Version="3.1.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="ReportGenerator" Version="4.8.3" PrivateAssets="all" />
<PackageReference Include="ReportGenerator" Version="4.8.4" PrivateAssets="all" />
<PackageReference Include="Squidex.Assets.Azure" Version="1.3.0" />
<PackageReference Include="Squidex.Assets.GoogleCloud" Version="1.3.0" />
<PackageReference Include="Squidex.Assets.FTP" Version="1.3.0" />
@ -65,7 +65,7 @@
<PackageReference Include="Squidex.Assets.S3" Version="1.3.0" />
<PackageReference Include="Squidex.Caching.Orleans" Version="1.3.0" />
<PackageReference Include="Squidex.ClientLibrary" Version="6.8.0" />
<PackageReference Include="Squidex.Hosting" Version="1.7.0" />
<PackageReference Include="Squidex.Hosting" Version="1.8.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />

2
backend/tests/RunCoverage.ps1

@ -81,6 +81,6 @@ if ($all -Or $web) {
-oldStyle
}
&"$folderHome\.nuget\packages\ReportGenerator\4.4.6\tools\net47\ReportGenerator.exe" `
&"$folderHome\.nuget\packages\ReportGenerator\4.8.4\tools\net47\ReportGenerator.exe" `
-reports:"$folderWorking\$folderReports\*.xml" `
-targetdir:"$folderWorking\$folderReports\Output"

2
backend/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj

@ -25,7 +25,7 @@
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.3.0" />
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.4.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.Caching.Orleans" Version="1.3.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

4
backend/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj

@ -18,8 +18,8 @@
<PackageReference Include="Google.Cloud.Storage.V1" Version="3.3.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.3.0" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.3.0">
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.4.0" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

Loading…
Cancel
Save