gehgassiGmbH/gehgassi_backend
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gehgassiGmbH:release/1.0.101
Branches Tags
gehgassiGmbH:master
gehgassiGmbH:release/1.0.101
gehgassiGmbH:features/auto-payout-tool
gehgassiGmbH:develop
gehgassiGmbH:features/paymenttype-cash
gehgassiGmbH:release/1.0.100
gehgassiGmbH:release/1.0.99
..
compare: gehgassiGmbH:master
Branches Tags
gehgassiGmbH:release/1.0.101
gehgassiGmbH:features/auto-payout-tool
gehgassiGmbH:develop
gehgassiGmbH:features/paymenttype-cash
gehgassiGmbH:master
gehgassiGmbH:release/1.0.100
gehgassiGmbH:release/1.0.99

No commits in common. "release/1.0.101" and "master" have entirely different histories.
release/1. ... master

11 changed files with 50 additions and 333 deletions
Show Stats Expand all files Collapse all files

13
gehGassi.Core/Interfaces/ServiceInterfaces.cs
View File

@ -3696,19 +3696,6 @@ namespace gehGassi.Core.Interfaces
/// <param name="appUserId">Id des AppUsers</param> /// <param name="appUserId">Id des AppUsers</param>
/// <returns>Liste von Wallets</returns> /// <returns>Liste von Wallets</returns>
Task<List<Wallet>> GetAllAsync(string appUserId); Task<List<Wallet>> GetAllAsync(string appUserId);
/// <summary>
/// Gibt eine Liste aller Wallets mit positivem Kontostand zurück
/// </summary>
/// <param name="type">Wallet typ</param>
/// <returns>Liste von Wallets</returns>
Task<List<Wallet>> GetAllWithPositiveBalanceAsync(WalletType type);
/// <summary>
/// Gibt eine Liste aller Wallets mit positivem Kontostand zurück
/// </summary>
/// <returns>Liste von Wallets</returns>
Task<List<Wallet>> GetAllWithPositiveBalanceAsync();
} }
/// <summary> /// <summary>

28
gehGassi.Core/Services/WalletService.cs
View File

@ -1,11 +1,10 @@
using gehGassi.Core.Interfaces; using System;
using gehGassi.Domain.Common;
using gehGassi.Domain.Dogs;
using gehGassi.Domain.Payment;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using gehGassi.Core.Interfaces;
using gehGassi.Domain.Common;
using gehGassi.Domain.Payment;
namespace gehGassi.Core.Services namespace gehGassi.Core.Services
{ {
@ -71,24 +70,5 @@ namespace gehGassi.Core.Services
{ {
return (await Repository.FindAsync(c => c.AppUserId == appUserId).ConfigureAwait(false)).ToList(); return (await Repository.FindAsync(c => c.AppUserId == appUserId).ConfigureAwait(false)).ToList();
} }
/// <summary>
/// Gibt eine Liste aller Wallets mit positivem Kontostand zurück
/// </summary>
/// <param name="type">Wallet typ</param>
/// <returns>Liste von Wallets</returns>
public async Task<List<Wallet>> GetAllWithPositiveBalanceAsync(WalletType type)
{
return (await Repository.FindAsync(c => c.Type == type && c.Balance > 0).ConfigureAwait(false)).ToList();
}
/// <summary>
/// Gibt eine Liste aller Wallets mit positivem Kontostand zurück
/// </summary>
/// <returns>Liste von Wallets</returns>
public async Task<List<Wallet>> GetAllWithPositiveBalanceAsync()
{
return (await Repository.FindAsync(c => c.Balance > 0).ConfigureAwait(false)).ToList();
}
} }
} }

9
gehGassi.Web/Controllers/Api/ApiPaymentController.cs
View File

@ -820,11 +820,10 @@ namespace gehGassi.Web.Controllers.Api
} }
//Wenn der erfolgreiche KYC-Check eines AppUsers nicht mindestens 48 Stunden zurückliegt, dann keine Auszahlung //Wenn der erfolgreiche KYC-Check eines AppUsers nicht mindestens 48 Stunden zurückliegt, dann keine Auszahlung
//TODO: Prüfen ob nicht wieder aktiviert werden soll! if (appUser.KycPassedDate.HasValue && appUser.KycPassedDate.Value > DateTimeOffset.UtcNow.AddHours(-48))
//if (appUser.KycPassedDate.HasValue && appUser.KycPassedDate.Value > DateTimeOffset.UtcNow.AddHours(-48)) {
//{ return BadRequest(CommunicationErrors.PayOut_Failed);
// return BadRequest(CommunicationErrors.PayOut_Failed); }
//}
//Wenn mmehr als 200 Euro, dann blockieren //Wenn mmehr als 200 Euro, dann blockieren
//TODO: Überprüfen ob das für die App-User passt. //TODO: Überprüfen ob das für die App-User passt.

175
gehGassi.Web/Controllers/ToolsController.cs
View File

@ -1,20 +1,26 @@
using AutoMapper; using System;
using System.Collections.Generic;
using System.Dynamic;
using System.IO;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using AutoMapper;
using gehGassi.Core.Interfaces; using gehGassi.Core.Interfaces;
using gehGassi.Core.Services; using gehGassi.Core.Services;
using gehGassi.Domain.Common; using gehGassi.Domain.Common;
using gehGassi.Domain.Dogs; using gehGassi.Domain.Dogs;
using gehGassi.Domain.Users;
using gehGassi.Web.Auth; using gehGassi.Web.Auth;
using gehGassi.Web.Models; using gehGassi.Web.Helper;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Localization; using Microsoft.Extensions.Localization;
using System; using SixLabors.ImageSharp;
using System.Collections.Generic; using SixLabors.ImageSharp.Advanced;
using System.Dynamic; using SixLabors.ImageSharp.Processing;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using gehGassi.Dto.Payment;
namespace gehGassi.Web.Controllers namespace gehGassi.Web.Controllers
{ {
@ -42,7 +48,6 @@ namespace gehGassi.Web.Controllers
private readonly IDeviceService _deviceService; private readonly IDeviceService _deviceService;
private readonly IMessageService _messageService; private readonly IMessageService _messageService;
private readonly IAppUserReportService _appUserReportService; private readonly IAppUserReportService _appUserReportService;
private readonly IPayoutService _payoutService;
/// <summary> /// <summary>
/// Erstellt eine Instanz /// Erstellt eine Instanz
@ -65,11 +70,9 @@ namespace gehGassi.Web.Controllers
/// <param name="deviceService">Instanz eines IDeviceService</param> /// <param name="deviceService">Instanz eines IDeviceService</param>
/// <param name="messageService">Instanz eines IMessageService</param> /// <param name="messageService">Instanz eines IMessageService</param>
/// <param name="appUserReportService">Instanz eines IAppUserReportService</param> /// <param name="appUserReportService">Instanz eines IAppUserReportService</param>
/// <param name="payoutService">Instanz eines IPayoutService</param>
public ToolsController(IMapper mapper, IStringLocalizer<ToolsController> localizer, IFileService fileService, IFileShareService fileShareService, IMangoPayService mangoPayService, IPushNotificationService pushNotificationService, public ToolsController(IMapper mapper, IStringLocalizer<ToolsController> localizer, IFileService fileService, IFileShareService fileShareService, IMangoPayService mangoPayService, IPushNotificationService pushNotificationService,
IAppUserService appUserService, IWalletService walletService, IWalkService walkService, IRatingService ratingService, ITransactionFeeService transactionFeeService, IRefreshTokenService refreshTokenService, IAppUserService appUserService, IWalletService walletService, IWalkService walkService, IRatingService ratingService, ITransactionFeeService transactionFeeService, IRefreshTokenService refreshTokenService,
IUserService userService, IFavouriteService favouriteService, ISystemMessageService systemMessageService, IDeviceService deviceService, IMessageService messageService, IAppUserReportService appUserReportService, IUserService userService, IFavouriteService favouriteService, ISystemMessageService systemMessageService, IDeviceService deviceService, IMessageService messageService, IAppUserReportService appUserReportService)
IPayoutService payoutService)
{ {
_mapper = mapper; _mapper = mapper;
_localizer = localizer; _localizer = localizer;
@ -89,7 +92,6 @@ namespace gehGassi.Web.Controllers
_deviceService = deviceService; _deviceService = deviceService;
_messageService = messageService; _messageService = messageService;
_appUserReportService = appUserReportService; _appUserReportService = appUserReportService;
_payoutService = payoutService;
} }
public async Task<IActionResult> TestMango() public async Task<IActionResult> TestMango()
@ -166,7 +168,6 @@ namespace gehGassi.Web.Controllers
else else
walk.PaymentStatus = PaymentStatus.Voided; walk.PaymentStatus = PaymentStatus.Voided;
} }
await _walkService.CommitAsync("System"); await _walkService.CommitAsync("System");
} }
@ -242,7 +243,6 @@ namespace gehGassi.Web.Controllers
feeDecimal += gehGassiFee.Fixed; feeDecimal += gehGassiFee.Fixed;
} }
} }
if (feeDecimal > 0) if (feeDecimal > 0)
{ {
fee = (long)(feeDecimal * 100); fee = (long)(feeDecimal * 100);
@ -303,7 +303,6 @@ namespace gehGassi.Web.Controllers
{ {
_walletService.Remove(wallet); _walletService.Remove(wallet);
} }
await _walletService.CommitAsync("System"); await _walletService.CommitAsync("System");
return Ok(); return Ok();
@ -453,7 +452,6 @@ namespace gehGassi.Web.Controllers
System.Diagnostics.Debug.WriteLine($"{appUser.FirstName} {appUser.LastName}: Es konnte kein neues Credit-Wallet angelegt werde"); System.Diagnostics.Debug.WriteLine($"{appUser.FirstName} {appUser.LastName}: Es konnte kein neues Credit-Wallet angelegt werde");
} }
} }
var feeWallet = wallets.FirstOrDefault(c => c.Type == WalletType.Fees); var feeWallet = wallets.FirstOrDefault(c => c.Type == WalletType.Fees);
if (feeWallet == null) if (feeWallet == null)
{ {
@ -594,151 +592,10 @@ namespace gehGassi.Web.Controllers
{ {
await _ratingService.UpdateRatingStatisticsAsync(ratingTargetToUpdate.Item1, ratingTargetToUpdate.Item2); await _ratingService.UpdateRatingStatisticsAsync(ratingTargetToUpdate.Item1, ratingTargetToUpdate.Item2);
} }
await _ratingService.CommitAsync(User.Identity.Name); await _ratingService.CommitAsync(User.Identity.Name);
} }
return View(model); return View(model);
} }
/// <summary>
/// Tool zum automatischen Auszahlen von Guthaben wenn dies möglich ist
/// </summary>
/// <returns>Task</returns>
public async Task<IActionResult> AutoPayout()
{
var model = new List<AutoPayoutVm>();
//1. alle Wallets mit Guthaben holen
var wallets = await _walletService.GetAllWithPositiveBalanceAsync();
//2. nun prüfen ob der wallet status mit dem bei mangoPay übereinstimmt
foreach (var wallet in wallets)
{
var balanceResponse = await _mangoPayService.GetWalletBalanceAsync(wallet.WalletId);
if (balanceResponse.Success)
{
wallet.Balance = balanceResponse.Value;
wallet.UpdatedAt = DateTimeOffset.UtcNow;
await _walletService.CommitAsync("System", true);
}
}
//Nun die wallets erneut holen
wallets = await _walletService.GetAllWithPositiveBalanceAsync();
foreach (var wallet in wallets)
{
//App user zum Wallet holen
var appUser = await _appUserService.GetAsync(wallet.AppUserId);
if (appUser != null)
{
//Nun prüfen ob berechtig für eine Auszahlung
if (appUser.Locked)
continue;
if (!appUser.KycPassed)
continue;
var getBankAccountResult = await _mangoPayService.GetBankAccountAsync(appUser.Id, appUser.PaymentId, appUser.BankId);
if (getBankAccountResult.Success)
{
var viewModel = new AutoPayoutVm
{
AppUser = appUser,
Wallet = wallet
};
model.Add(viewModel);
}
}
}
return View(model);
}
/// <summary>
/// Run Auto Payout
/// </summary>
/// <returns></returns>
public async Task<IActionResult> RunAutoPayout()
{
var model = new List<RunAutoPayoutVm>();
//1. alle Wallets mit Guthaben holen
var wallets = await _walletService.GetAllWithPositiveBalanceAsync();
foreach (var wallet in wallets)
{
try
{
//App user zum Wallet holen
var appUser = await _appUserService.GetAsync(wallet.AppUserId);
if (appUser != null)
{
//Nun prüfen ob berechtig für eine Auszahlung
if (appUser.Locked)
continue;
if (!appUser.KycPassed)
continue;
var getBankAccountResult = await _mangoPayService.GetBankAccountAsync(appUser.Id, appUser.PaymentId, appUser.BankId);
if (getBankAccountResult.Success)
{
var iban = string.Empty;
if (!string.IsNullOrWhiteSpace(getBankAccountResult.Value.Iban))
iban = getBankAccountResult.Value.Iban;
var bic = string.Empty;
if (!string.IsNullOrWhiteSpace(getBankAccountResult.Value.Bic))
bic = getBankAccountResult.Value.Bic;
if (iban.Length >= 4)
{
iban = iban.Substring(iban.Length - 4);
}
if (bic.Length >= 4)
{
bic = bic.Substring(bic.Length - 4);
}
//Auszahlen
var ammount = wallet.Balance;
var payout = _payoutService.Create(appUser.Id, appUser.PaymentId, "", wallet.Id, wallet.WalletId, appUser.BankId, iban, bic, ammount, "EUR");
var payoutResult = await _mangoPayService.CreatePayoutAsync(appUser.PaymentId, wallet.WalletId, appUser.BankId, ammount, $"Payout_{payout.Id}");
if (payoutResult.Success)
{
payout.MangoPayId = payoutResult.Value.PayoutId;
payout.Status = payoutResult.Value.Status;
payout.ResultCode = payoutResult.Value.ResultCode;
payout.ResultMessage = payoutResult.Value.ResultMessage;
payout.ExecutionDate = payoutResult.Value.ExecutionDate;
payout.UpdatedAt = DateTimeOffset.UtcNow;
_payoutService.Add(payout);
await _payoutService.CommitAsync(User.Identity.Name);
var dto = _mapper.Map<PayoutDto>(payout);
var item = new RunAutoPayoutVm()
{
Wallet = wallet,
AppUser = appUser,
PayoutDto = dto
};
model.Add(item);
}
}
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(ex.Message);
}
}
return View(model);
}
} }
} }

22
gehGassi.Web/Models/AutoPayoutVm.cs
View File

@ -1,22 +0,0 @@
using gehGassi.Domain.Dogs;
using gehGassi.Domain.Payment;
using gehGassi.Dto.Payment;
namespace gehGassi.Web.Models
{
/// <summary>
/// Viewmodel für das Autopayout tool
/// </summary>
public class AutoPayoutVm
{
public Wallet Wallet { get; set; }
public AppUser AppUser { get; set; }
}
public class RunAutoPayoutVm
{
public Wallet Wallet { get; set; }
public AppUser AppUser { get; set; }
public PayoutDto PayoutDto { get; set; }
}
}

38
gehGassi.Web/Views/Tools/AutoPayout.cshtml
View File

@ -1,38 +0,0 @@
@using gehGassi.Permissions
@using gehGassi.Web.Helper
@using Microsoft.AspNetCore.Mvc.Localization
@model List<gehGassi.Web.Models.AutoPayoutVm>;
@inject IViewLocalizer Localizer
@{
ViewData["Title"] = Localizer["Menu_Tools"];
}
@section pageTitle {
<a href="@Url.Action("Index", "Home")">@Localizer["Menu_Tools"]</a>
}
<section id="autoPayoutListContainer">
<table class="table table-striped">
<thead>
<tr>
<th>App user</th>
<th>Type</th>
<th>Balance</th>
</tr>
</thead>
<tbody>
@foreach (var item in Model)
{
<tr>
<td>@item.AppUser.FirstName @item.AppUser.LastName</td>
<td>@item.Wallet.Type.ToString()</td>
<td>€ @((item.Wallet.Balance / 100).ToString("N2"))</td>
</tr>
}
</tbody>
</table>
<div class="text-center mt-5">
<a href="@Url.Action("RunAutoPayout", "Tools")" class="btn btn-primary">Run Auto Payout</a>
</div>
</section>

46
gehGassi.Web/Views/Tools/RunAutoPayout.cshtml
View File

@ -1,46 +0,0 @@
@using gehGassi.Permissions
@using gehGassi.Web.Helper
@using Microsoft.AspNetCore.Mvc.Localization
@model List<gehGassi.Web.Models.RunAutoPayoutVm>;
@inject IViewLocalizer Localizer
@{
ViewData["Title"] = Localizer["Menu_Tools"];
}
@section pageTitle {
<a href="@Url.Action("Index", "Home")">@Localizer["Menu_Tools"]</a>
}
<section id="autoPayoutListContainer">
<table class="table table-striped">
<thead>
<tr>
<th>App user</th>
<th>Balance before</th>
<th>IBAN</th>
<th>BIC</th>
<th>Status</th>
<th>Ammount</th>
<th>Result code</th>
<th>Result message</th>
</tr>
</thead>
<tbody>
@foreach (var item in Model)
{
<tr>
<td>@item.AppUser.FirstName @item.AppUser.LastName</td>
<td>€ @((item.Wallet.Balance / 100).ToString("N2"))</td>
<td>@item.PayoutDto.Iban</td>
<td>@item.PayoutDto.Bic</td>
<td>@item.PayoutDto.Status.ToString()</td>
<td>€ @((item.PayoutDto.Ammount / 100).ToString("N2"))</td>
<td>@item.PayoutDto.ResultCode</td>
<td>@item.PayoutDto.ResultMessage</td>
</tr>
}
</tbody>
</table>
</section>

6
gehGassi.Web/appsettings.Live.json
View File

@ -22,10 +22,10 @@
"LicenseOptions": { "LicenseOptions": {
"Address": "https://gehgassi.com", "Address": "https://gehgassi.com",
"Software": "gehgassi", "Software": "gehgassi",
"Version": "1.0.101" "Version": "1.0.100"
}, },
"SystemJsOptions": { "SystemJsOptions": {
"FileVersion": "1.0.101" "FileVersion": "1.0.100"
}, },
"SessionSettings": { "SessionSettings": {
"TimeOut": "60", "TimeOut": "60",
@ -107,7 +107,7 @@
"AutoConfirm": true, "AutoConfirm": true,
"ConfirmationMinutes": 10080, "ConfirmationMinutes": 10080,
"ConfirmationReminderMinutes": 1440, "ConfirmationReminderMinutes": 1440,
"MinPayoutAmmount": 1 "MinPayoutAmmount": 1000
}, },
"GeoLocationOptions": { "GeoLocationOptions": {
"BaseUri": "https://nominatim.openstreetmap.org/", "BaseUri": "https://nominatim.openstreetmap.org/",

6
gehGassi.Web/appsettings.Production.json
View File

@ -23,10 +23,10 @@
"LicenseOptions": { "LicenseOptions": {
"Address": "https://creativeBITS.com", "Address": "https://creativeBITS.com",
"Software": "gehgassi", "Software": "gehgassi",
"Version": "1.0.101" "Version": "1.0.100"
}, },
"SystemJsOptions": { "SystemJsOptions": {
"FileVersion": "1.0.101" "FileVersion": "1.0.100"
}, },
"SessionSettings": { "SessionSettings": {
"TimeOut": "60", "TimeOut": "60",
@ -108,7 +108,7 @@
"AutoConfirm": true, "AutoConfirm": true,
"ConfirmationMinutes": 10080, "ConfirmationMinutes": 10080,
"ConfirmationReminderMinutes": 1440, "ConfirmationReminderMinutes": 1440,
"MinPayoutAmmount": 1 "MinPayoutAmmount": 1000
}, },
"GeoLocationOptions": { "GeoLocationOptions": {
"BaseUri": "https://nominatim.openstreetmap.org/", "BaseUri": "https://nominatim.openstreetmap.org/",

6
gehGassi.Web/appsettings.Staging.json
View File

@ -22,10 +22,10 @@
"LicenseOptions": { "LicenseOptions": {
"Address": "https://gehGassi.creativeBITS.eu", "Address": "https://gehGassi.creativeBITS.eu",
"Software": "gehgassi", "Software": "gehgassi",
"Version": "1.0.101" "Version": "1.0.100"
}, },
"SystemJsOptions": { "SystemJsOptions": {
"FileVersion": "1.0.101" "FileVersion": "1.0.100"
}, },
"SessionSettings": { "SessionSettings": {
"TimeOut": "60", "TimeOut": "60",
@ -107,7 +107,7 @@
"AutoConfirm": true, "AutoConfirm": true,
"ConfirmationMinutes": 10080, "ConfirmationMinutes": 10080,
"ConfirmationReminderMinutes": 1440, "ConfirmationReminderMinutes": 1440,
"MinPayoutAmmount": 1 "MinPayoutAmmount": 1000
}, },
"GeoLocationOptions": { "GeoLocationOptions": {
"BaseUri": "https://nominatim.openstreetmap.org/", "BaseUri": "https://nominatim.openstreetmap.org/",

6
gehGassi.Web/appsettings.json
View File

@ -23,10 +23,10 @@
"LicenseOptions": { "LicenseOptions": {
"Address": "https://creativeBITS.com", "Address": "https://creativeBITS.com",
"Software": "gehgassi", "Software": "gehgassi",
"Version": "1.0.101" "Version": "1.0.100"
}, },
"SystemJsOptions": { "SystemJsOptions": {
"FileVersion": "1.0.101" "FileVersion": "1.0.100"
}, },
"SessionSettings": { "SessionSettings": {
"TimeOut": "60", "TimeOut": "60",
@ -108,7 +108,7 @@
"AutoConfirm": true, "AutoConfirm": true,
"ConfirmationMinutes": 10080, "ConfirmationMinutes": 10080,
"ConfirmationReminderMinutes": 1440, "ConfirmationReminderMinutes": 1440,
"MinPayoutAmmount": 1 "MinPayoutAmmount": 1000
}, },
"GeoLocationOptions": { "GeoLocationOptions": {
"BaseUri": "https://nominatim.openstreetmap.org/", "BaseUri": "https://nominatim.openstreetmap.org/",