Compare commits

...

24 Commits

Author SHA1 Message Date
masoodafar-web 28e81041fc chore: Update production workflow to use Nexus registry (no proxy needed)
Build and Deploy to Production / build-and-deploy (push) Failing after 0s
- Changed Dockerfile base images to use 194.5.195.53:32082 (Nexus)
- Updated workflow to use docker-sshpass image from Nexus
- Removed HTTP_PROXY/HTTPS_PROXY dependencies
- Changed deploy method to SSH instead of kubeconfig
- Registry: 194.5.195.53:30080 (Gitea internal)
- K8S Server: 45.149.79.127 (Production)
2026-01-29 22:04:31 +03:30
masoodafar-web ecac62d095 Merge branch 'kub-stage' into production
Build and Deploy to Production / build-and-deploy (push) Successful in 1m42s
2025-12-29 00:40:34 +03:30
masoodafar-web a8a3d246da feat: enhance WeeklyBalanceModel with carryover and new members fields; update mappings and response DTO
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 1m55s
2025-12-28 23:57:26 +03:30
masoodafar-web 0ed694f475 fix: ensure WeekDefinitionId is correctly mapped to nullable type in GetMyWeeklyBalancesQuery
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 1m39s
2025-12-27 22:07:35 +03:30
masoodafar-web 99c0da4ecc feat: add production configuration for JWT and gRPC settings
Build and Deploy to Production / build-and-deploy (push) Successful in 2m31s
2025-12-27 07:42:45 +03:30
masoodafar-web 0bab1d857e refactor: streamline mapping for GetMyWeeklyBalancesRequest to GetMyWeeklyBalancesQuery
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 1m31s
2025-12-27 07:35:49 +03:30
masoodafar-web 84c519060f refactor: simplify status handling in commission payout queries and responses
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 1m34s
2025-12-27 07:10:44 +03:30
masoodafar-web a429a2328a fix: remove unnecessary type parameter from WithdrawBalance handling
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 1m31s
2025-12-27 06:22:28 +03:30
masoodafar-web c53056c750 fix: correct formatting of PYMSMSAddress in appsettings.json
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 1m35s
2025-12-27 03:49:48 +03:30
masoodafar-web dadd0ee66c fix: update CMSMSAddress to use secure HTTPS URL 2025-12-27 03:46:12 +03:30
masoodafar-web b71d948e0e feat: add ReferralCode to network tree queries and responses
Build and Deploy to Production / build-and-deploy (push) Successful in 1m42s
2025-12-26 03:52:15 +03:30
masoodafar-web a189340aac feat(AppVersion): Add BFF handler for AppVersion
Build and Deploy to Production / build-and-deploy (push) Successful in 2m49s
- Add GetAppVersionQuery and Handler in Application layer
- Add AppVersionGrpcService in WebApi
- Add AppVersion to IApplicationContractContext and ApplicationContractContext
- Update CMSMicroservice.Protobuf to 0.0.158
2025-12-25 19:07:16 +03:30
masoodafar-web e35ad0ebfb fix: update CMSMSAddress in appsettings for correct service URL
Build and Deploy to Production / build-and-deploy (push) Successful in 1m46s
2025-12-25 18:50:53 +03:30
masoodafar-web 0364749342 Merge branch 'stage-new' into production 2025-12-25 18:49:59 +03:30
masoodafar-web 07e420de1b feat(AppVersion): Add AppVersion proto for cache invalidation 2025-12-25 18:42:50 +03:30
admin f471ee468a fix: correct dockerfile path and registry
Build and Deploy to Production / build-and-deploy (push) Successful in 1m37s
2025-12-23 22:33:13 +00:00
admin 3f22628bf4 fix: correct dockerfile path and registry
Build and Deploy to Production / build-and-deploy (push) Has been cancelled
2025-12-23 22:33:05 +00:00
admin 452544b527 feat: add production deployment workflow
Build and Deploy to Production / build-and-deploy (push) Failing after 11s
2025-12-23 22:19:48 +00:00
admin 47c0bcd76f fix: update appsettings for production K8s 2025-12-23 22:17:07 +00:00
admin 3e3033386d fix: update appsettings for production K8s 2025-12-23 22:16:37 +00:00
masoodafar-web b7057e0928 fix: update CMS and Seq service URLs to production endpoints 2025-12-20 05:20:11 +03:30
masoodafar-web 97b62e9168 fix: correct branch name in deployment configuration from 'stage_new' to 'stage-new' 2025-12-20 05:04:09 +03:30
masoodafar-web 2a2599973e fix: update branch name in deployment configuration from 'stage' to 'stage_new' 2025-12-20 05:01:24 +03:30
masoodafar-web 2d2840485f feat: update version to 0.0.3 and add target for pushing NuGet package to FourSat 2025-12-20 04:59:36 +03:30
31 changed files with 333 additions and 62 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ name: Push nuget and docker image Actions Workflow
on: on:
push: push:
branches: branches:
- stage - stage-new
jobs: jobs:
Deploy: Deploy:
runs-on: windows runs-on: windows
+68
View File
@@ -0,0 +1,68 @@
name: Build and Deploy to Production
on:
push:
branches:
- production
env:
REGISTRY: 194.5.195.53:30080
IMAGE_NAME: admin/frontoffice-bff
K8S_SERVER: 45.149.79.127
jobs:
build-and-deploy:
runs-on: ubuntu-latest
container:
image: 194.5.195.53:32082/docker-sshpass:latest
options: --privileged
steps:
- name: Start Docker daemon
run: |
mkdir -p /etc/docker
cat > /etc/docker/daemon.json << 'DAEMON'
{
"insecure-registries": ["194.5.195.53:30080", "194.5.195.53:32082"]
}
DAEMON
echo "🚀 Starting Docker daemon..."
dockerd &
for i in $(seq 1 90); do
if docker info >/dev/null 2>&1; then
echo "✅ Docker daemon is ready (attempt $i)"
docker version
break
else
echo "⏳ Waiting for Docker daemon... (attempt $i/90)"
sleep 2
fi
done
if ! docker info >/dev/null 2>&1; then
echo "❌ Docker daemon failed to start"
exit 1
fi
- name: Checkout code
run: |
git clone --depth 1 --branch production http://gitea-svc:3000/admin/FrontOffice.BFF.git .
- name: Build Docker Image
run: |
cd src
docker build -f FrontOffice.BFF.WebApi/Dockerfile \
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
-t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod \
.
- name: Push to Registry
run: |
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod
- name: Deploy to Production
run: |
sshpass -p "${{ secrets.K8S_SSH_PASSWORD }}" ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} \
"kubectl rollout restart deployment/frontoffice-bff && kubectl rollout status deployment/frontoffice-bff --timeout=5m" || echo "Deployment pending"
@@ -44,8 +44,7 @@ public class GetMyCommissionPayoutsQueryHandler : IRequestHandler<GetMyCommissio
BalancesEarned = (int)p.BalancesEarned, BalancesEarned = (int)p.BalancesEarned,
TotalAmount = p.TotalAmount, TotalAmount = p.TotalAmount,
AmountFormatted = FormatCurrency(p.TotalAmount), AmountFormatted = FormatCurrency(p.TotalAmount),
Status = MapStatus(p.Status), Status = p.Status,
StatusBadgeColor = GetStatusColor(p.Status),
CalculatedDate = p.Created?.ToDateTime() ?? DateTime.UtcNow, CalculatedDate = p.Created?.ToDateTime() ?? DateTime.UtcNow,
DatePersian = FormatPersianDate(p.Created?.ToDateTime()) DatePersian = FormatPersianDate(p.Created?.ToDateTime())
}).ToList(); }).ToList();
@@ -59,30 +58,6 @@ public class GetMyCommissionPayoutsQueryHandler : IRequestHandler<GetMyCommissio
}; };
} }
private static string MapStatus(int status)
{
return status switch
{
0 => "Pending",
1 => "Calculated",
2 => "Paid",
3 => "Withdrawn",
_ => "Unknown"
};
}
private static string GetStatusColor(int status)
{
return status switch
{
0 => "warning",
1 => "info",
2 => "success",
3 => "success",
_ => "default"
};
}
private static string FormatCurrency(long amount) private static string FormatCurrency(long amount)
{ {
return $"{amount:N0} تومان"; return $"{amount:N0} تومان";
@@ -41,14 +41,9 @@ public class CommissionPayoutDto
public string AmountFormatted { get; set; } = string.Empty; public string AmountFormatted { get; set; } = string.Empty;
/// <summary> /// <summary>
/// وضعیت (Pending/Calculated/Paid/Withdrawn) /// وضعیت (0=Pending=1,Paid=2,WithdrawRequested=3,Withdrawn=4,PaymentFailed= 5,Cancelled)
/// </summary> /// </summary>
public string Status { get; set; } = string.Empty; public int Status { get; set; }
/// <summary>
/// رنگ Badge
/// </summary>
public string StatusBadgeColor { get; set; } = string.Empty;
/// <summary> /// <summary>
/// تاریخ محاسبه /// تاریخ محاسبه
@@ -35,17 +35,23 @@ public class GetMyWeeklyBalancesQueryHandler : IRequestHandler<GetMyWeeklyBalanc
var response = await _context.Commission.GetUserWeeklyBalancesAsync(cmsRequest, cancellationToken: cancellationToken); var response = await _context.Commission.GetUserWeeklyBalancesAsync(cmsRequest, cancellationToken: cancellationToken);
// Map list of UserWeeklyBalanceModel to DTO // Map list of UserWeeklyBalanceModel to DTO
// Note: CMS proto uses LeftLegTotal/RightLegTotal (sum of NewMembers + Carryover)
var balances = response.Models.Select(b => new WeeklyBalanceItemDto var balances = response.Models.Select(b => new WeeklyBalanceItemDto
{ {
Id = b.Id, Id = b.Id,
WeekDefinitionId = b.WeekDefinitionId, WeekDefinitionId = b.WeekDefinitionId,
WeekLabel = b.WeekDisplayName, WeekLabel = b.WeekDisplayName,
LeftLegBalances = b.LeftLegBalances, LeftLegBalances = b.LeftLegTotal, // Changed from LeftLegBalances
RightLegBalances = b.RightLegBalances, RightLegBalances = b.RightLegTotal, // Changed from RightLegBalances
TotalBalances = b.TotalBalances, TotalBalances = b.TotalBalances,
WeeklyPoolContribution = b.WeeklyPoolContribution, WeeklyPoolContribution = b.WeeklyPoolContribution,
CalculatedAt = b.CalculatedAt?.ToDateTime(), CalculatedAt = b.CalculatedAt?.ToDateTime(),
IsExpired = b.IsExpired IsExpired = b.IsExpired,
// New fields for carryover info
LeftLegCarryover = b.LeftLegCarryover,
RightLegCarryover = b.RightLegCarryover,
LeftLegNewMembers = b.LeftLegNewMembers,
RightLegNewMembers = b.RightLegNewMembers
}).ToList(); }).ToList();
// Calculate summary // Calculate summary
@@ -89,4 +89,24 @@ public class WeeklyBalanceItemDto
/// تاریخ شمسی /// تاریخ شمسی
/// </summary> /// </summary>
public string DatePersian { get; set; } = string.Empty; public string DatePersian { get; set; } = string.Empty;
/// <summary>
/// انتقالی پای چپ از هفته قبل
/// </summary>
public int LeftLegCarryover { get; set; }
/// <summary>
/// انتقالی پای راست از هفته قبل
/// </summary>
public int RightLegCarryover { get; set; }
/// <summary>
/// اعضای جدید پای چپ این هفته
/// </summary>
public int LeftLegNewMembers { get; set; }
/// <summary>
/// اعضای جدید پای راست این هفته
/// </summary>
public int RightLegNewMembers { get; set; }
} }
@@ -10,6 +10,7 @@ using CMSMicroservice.Protobuf.Protos.UserAddress;
using CMSMicroservice.Protobuf.Protos.UserCarts; using CMSMicroservice.Protobuf.Protos.UserCarts;
using CMSMicroservice.Protobuf.Protos.Commission; using CMSMicroservice.Protobuf.Protos.Commission;
using CMSMicroservice.Protobuf.Protos.Configuration; using CMSMicroservice.Protobuf.Protos.Configuration;
using CMSMicroservice.Protobuf.Protos.AppVersion;
using CMSMicroservice.Protobuf.Protos.UserContract; using CMSMicroservice.Protobuf.Protos.UserContract;
using CMSMicroservice.Protobuf.Protos.UserOrder; using CMSMicroservice.Protobuf.Protos.UserOrder;
using CMSMicroservice.Protobuf.Protos.UserWallet; using CMSMicroservice.Protobuf.Protos.UserWallet;
@@ -63,6 +64,9 @@ public interface IApplicationContractContext
// Geography System (GMS) // Geography System (GMS)
CityContract.CityContractClient Cities { get; } CityContract.CityContractClient Cities { get; }
// App Version System
AppVersionContract.AppVersionContractClient AppVersion { get; }
#endregion #endregion
#region PYMS #region PYMS
@@ -0,0 +1,8 @@
using FrontOffice.BFF.Configuration.Protobuf.Protos.AppVersion;
namespace FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
/// <summary>
/// دریافت نسخه اپلیکیشن برای بررسی نیاز به پاک کردن کش
/// </summary>
public record GetAppVersionQuery(string AppName, string? CurrentClientVersion) : IRequest<GetAppVersionResponseDto>;
@@ -0,0 +1,44 @@
using CMSMicroservice.Protobuf.Protos.AppVersion;
namespace FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
/// <summary>
/// هندلر دریافت نسخه اپلیکیشن از CMS
/// </summary>
public class GetAppVersionQueryHandler : IRequestHandler<GetAppVersionQuery, GetAppVersionResponseDto>
{
private readonly IApplicationContractContext _context;
public GetAppVersionQueryHandler(IApplicationContractContext context)
{
_context = context;
}
public async Task<GetAppVersionResponseDto> Handle(GetAppVersionQuery request, CancellationToken cancellationToken)
{
var cmsRequest = new GetAppVersionRequest
{
AppName = request.AppName
};
if (!string.IsNullOrEmpty(request.CurrentClientVersion))
{
cmsRequest.CurrentClientVersion = request.CurrentClientVersion;
}
var response = await _context.AppVersion.GetAppVersionAsync(cmsRequest, cancellationToken: cancellationToken);
return new GetAppVersionResponseDto
{
Found = response.Found,
AppName = response.AppName,
CurrentVersion = response.CurrentVersion,
MinRequiredVersion = response.MinRequiredVersion,
RequiresFullCacheClear = response.RequiresFullCacheClear,
RequiresUpdate = response.RequiresUpdate,
UpdateMessage = response.UpdateMessage,
ReleaseNotes = response.ReleaseNotes,
LastUpdated = response.LastUpdated?.ToDateTime()
};
}
}
@@ -0,0 +1,17 @@
namespace FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
/// <summary>
/// DTO پاسخ نسخه اپلیکیشن
/// </summary>
public class GetAppVersionResponseDto
{
public bool Found { get; set; }
public string AppName { get; set; } = string.Empty;
public string CurrentVersion { get; set; } = string.Empty;
public string MinRequiredVersion { get; set; } = string.Empty;
public bool RequiresFullCacheClear { get; set; }
public bool RequiresUpdate { get; set; }
public string? UpdateMessage { get; set; }
public string? ReleaseNotes { get; set; }
public DateTime? LastUpdated { get; set; }
}
@@ -15,6 +15,7 @@
<ProjectReference Include="..\FrontOffice.BFF.Domain\FrontOffice.BFF.Domain.csproj" /> <ProjectReference Include="..\FrontOffice.BFF.Domain\FrontOffice.BFF.Domain.csproj" />
<ProjectReference Include="..\Protobufs\FrontOffice.BFF.UserOrder.Protobuf\FrontOffice.BFF.UserOrder.Protobuf.csproj" /> <ProjectReference Include="..\Protobufs\FrontOffice.BFF.UserOrder.Protobuf\FrontOffice.BFF.UserOrder.Protobuf.csproj" />
<ProjectReference Include="..\Protobufs\FrontOffice.BFF.Category.Protobuf\FrontOffice.BFF.Category.Protobuf.csproj" /> <ProjectReference Include="..\Protobufs\FrontOffice.BFF.Category.Protobuf\FrontOffice.BFF.Category.Protobuf.csproj" />
<ProjectReference Include="..\Protobufs\FrontOffice.BFF.Configuration.Protobuf\FrontOffice.BFF.Configuration.Protobuf.csproj" />
<!-- CMS Protobuf for Commission, ClubMembership, NetworkMembership, Configuration --> <!-- CMS Protobuf for Commission, ClubMembership, NetworkMembership, Configuration -->
</ItemGroup> </ItemGroup>
@@ -85,6 +85,7 @@ public class GetMyNetworkTreeQueryHandler : IRequestHandler<GetMyNetworkTreeQuer
JoinedAt = cmsNode.JoinedAt?.ToDateTime(), JoinedAt = cmsNode.JoinedAt?.ToDateTime(),
IsClubActive = cmsNode.IsClubActive, IsClubActive = cmsNode.IsClubActive,
ActivationWeekDefinitionId = cmsNode.ActivationWeekDefinitionId, ActivationWeekDefinitionId = cmsNode.ActivationWeekDefinitionId,
ReferralCode = cmsNode.ReferralCode,
LeftChild = leftChild != null ? BuildNodeRecursive(leftChild, allNodes, nodeDict, level + 1) : null, LeftChild = leftChild != null ? BuildNodeRecursive(leftChild, allNodes, nodeDict, level + 1) : null,
RightChild = rightChild != null ? BuildNodeRecursive(rightChild, allNodes, nodeDict, level + 1) : null RightChild = rightChild != null ? BuildNodeRecursive(rightChild, allNodes, nodeDict, level + 1) : null
}; };
@@ -84,4 +84,9 @@ public class NetworkNodeDto
/// شماره هفته فعال‌سازی /// شماره هفته فعال‌سازی
/// </summary> /// </summary>
public long? ActivationWeekDefinitionId { get; set; } public long? ActivationWeekDefinitionId { get; set; }
/// <summary>
/// کد معرف کاربر
/// </summary>
public string? ReferralCode { get; set; }
} }
@@ -92,6 +92,7 @@ public class GetSubordinateTreeQueryHandler : IRequestHandler<GetSubordinateTree
IsActive = cmsNode.IsActive, IsActive = cmsNode.IsActive,
JoinedAt = cmsNode.JoinedAt?.ToDateTime(), JoinedAt = cmsNode.JoinedAt?.ToDateTime(),
IsClubActive = cmsNode.IsClubActive, IsClubActive = cmsNode.IsClubActive,
ReferralCode = cmsNode.ReferralCode,
ActivationWeekDefinitionId = cmsNode.ActivationWeekDefinitionId, ActivationWeekDefinitionId = cmsNode.ActivationWeekDefinitionId,
LeftChild = leftChild != null ? BuildNodeRecursive(leftChild, allNodes, nodeDict, level + 1) : null, LeftChild = leftChild != null ? BuildNodeRecursive(leftChild, allNodes, nodeDict, level + 1) : null,
RightChild = rightChild != null ? BuildNodeRecursive(rightChild, allNodes, nodeDict, level + 1) : null RightChild = rightChild != null ? BuildNodeRecursive(rightChild, allNodes, nodeDict, level + 1) : null
@@ -31,4 +31,5 @@ public class GetSubordinateTreeResponseDto
/// شناسه parent برای بازگشت به عقب /// شناسه parent برای بازگشت به عقب
/// </summary> /// </summary>
public long? ParentUserId { get; set; } public long? ParentUserId { get; set; }
} }
@@ -7,7 +7,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Afrino.PYMSMicroservice.Protobuf" Version="0.0.11" /> <PackageReference Include="Afrino.PYMSMicroservice.Protobuf" Version="0.0.11" />
<PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.156" /> <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.162" />
<PackageReference Include="Google.Protobuf" Version="3.33.0" /> <PackageReference Include="Google.Protobuf" Version="3.33.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.54.0" /> <PackageReference Include="Grpc.Net.ClientFactory" Version="2.54.0" />
<PackageReference Include="Grpc.Tools" Version="2.76.0"> <PackageReference Include="Grpc.Tools" Version="2.76.0">
@@ -10,6 +10,7 @@ using CMSMicroservice.Protobuf.Protos.UserAddress;
using CMSMicroservice.Protobuf.Protos.UserCarts; using CMSMicroservice.Protobuf.Protos.UserCarts;
using CMSMicroservice.Protobuf.Protos.Commission; using CMSMicroservice.Protobuf.Protos.Commission;
using CMSMicroservice.Protobuf.Protos.Configuration; using CMSMicroservice.Protobuf.Protos.Configuration;
using CMSMicroservice.Protobuf.Protos.AppVersion;
using CMSMicroservice.Protobuf.Protos.UserContract; using CMSMicroservice.Protobuf.Protos.UserContract;
using CMSMicroservice.Protobuf.Protos.UserOrder; using CMSMicroservice.Protobuf.Protos.UserOrder;
using CMSMicroservice.Protobuf.Protos.UserWallet; using CMSMicroservice.Protobuf.Protos.UserWallet;
@@ -90,6 +91,9 @@ public class ApplicationContractContext : IApplicationContractContext
// Geography System (GMS) // Geography System (GMS)
public CityContract.CityContractClient Cities => GetService<CityContract.CityContractClient>(); public CityContract.CityContractClient Cities => GetService<CityContract.CityContractClient>();
// App Version System
public AppVersionContract.AppVersionContractClient AppVersion => GetService<AppVersionContract.AppVersionContractClient>();
#endregion #endregion
#region PYMS #region PYMS
@@ -18,10 +18,13 @@ public class CommissionProfile : IRegister
.Map(dest => dest.Status, src => src.Status); .Map(dest => dest.Status, src => src.Status);
config.NewConfig<ProtoDto.GetMyWeeklyBalancesRequest, GetMyWeeklyBalancesQuery>() config.NewConfig<ProtoDto.GetMyWeeklyBalancesRequest, GetMyWeeklyBalancesQuery>()
.Map(dest => dest.PageNumber, src => src.PageNumber) .MapWith(src => new GetMyWeeklyBalancesQuery
.Map(dest => dest.PageSize, src => src.PageSize) {
.Map(dest => dest.WeekDefinitionId, src => src.WeekDefinitionId != null ? (long?)src.WeekDefinitionId.Value : null) PageNumber = src.PageNumber,
.Map(dest => dest.OnlyActive, src => src.OnlyActive); PageSize = src.PageSize,
WeekDefinitionId = src.WeekDefinitionId != null ? src.WeekDefinitionId.Value : null,
OnlyActive = src.OnlyActive
});
// Response mappings // Response mappings
config.NewConfig<GetMyCommissionPayoutsResponseDto, ProtoDto.GetMyCommissionPayoutsResponse>() config.NewConfig<GetMyCommissionPayoutsResponseDto, ProtoDto.GetMyCommissionPayoutsResponse>()
@@ -36,7 +39,6 @@ public class CommissionProfile : IRegister
.Map(dest => dest.TotalAmount, src => src.TotalAmount) .Map(dest => dest.TotalAmount, src => src.TotalAmount)
.Map(dest => dest.AmountFormatted, src => src.AmountFormatted) .Map(dest => dest.AmountFormatted, src => src.AmountFormatted)
.Map(dest => dest.Status, src => src.Status) .Map(dest => dest.Status, src => src.Status)
.Map(dest => dest.StatusBadgeColor, src => src.StatusBadgeColor)
.Map(dest => dest.CalculatedDate, src => Timestamp.FromDateTime(DateTime.SpecifyKind(src.CalculatedDate, DateTimeKind.Utc))) .Map(dest => dest.CalculatedDate, src => Timestamp.FromDateTime(DateTime.SpecifyKind(src.CalculatedDate, DateTimeKind.Utc)))
.Map(dest => dest.DatePersian, src => src.DatePersian); .Map(dest => dest.DatePersian, src => src.DatePersian);
@@ -53,6 +55,10 @@ public class CommissionProfile : IRegister
.Map(dest => dest.WeekDisplayName, src => src.WeekLabel) .Map(dest => dest.WeekDisplayName, src => src.WeekLabel)
.Map(dest => dest.LeftLegBalances, src => src.LeftLegBalances) .Map(dest => dest.LeftLegBalances, src => src.LeftLegBalances)
.Map(dest => dest.RightLegBalances, src => src.RightLegBalances) .Map(dest => dest.RightLegBalances, src => src.RightLegBalances)
.Map(dest => dest.LeftLegCarryover, src => src.LeftLegCarryover)
.Map(dest => dest.RightLegCarryover, src => src.RightLegCarryover)
.Map(dest => dest.LeftLegNewMembers, src => src.LeftLegNewMembers)
.Map(dest => dest.RightLegNewMembers, src => src.RightLegNewMembers)
.Map(dest => dest.TotalBalances, src => src.TotalBalances) .Map(dest => dest.TotalBalances, src => src.TotalBalances)
.Map(dest => dest.WeeklyPoolContribution, src => src.WeeklyPoolContribution) .Map(dest => dest.WeeklyPoolContribution, src => src.WeeklyPoolContribution)
.Map(dest => dest.IsExpired, src => src.IsExpired) .Map(dest => dest.IsExpired, src => src.IsExpired)
@@ -40,6 +40,7 @@ public class NetworkMembershipProfile : IRegister
.Map(dest => dest.LeftChild, src => src.LeftChild) .Map(dest => dest.LeftChild, src => src.LeftChild)
.Map(dest => dest.RightChild, src => src.RightChild) .Map(dest => dest.RightChild, src => src.RightChild)
.Map(dest => dest.Level, src => src.Level) .Map(dest => dest.Level, src => src.Level)
.Map(dest => dest.ReferralCode, src => src.ReferralCode)
.Map(dest => dest.HasChildren, src => src.HasChildren) .Map(dest => dest.HasChildren, src => src.HasChildren)
.Map(dest => dest.IsActive, src => src.IsActive) .Map(dest => dest.IsActive, src => src.IsActive)
.Map(dest => dest.JoinedAt, src => src.JoinedAt.HasValue ? Timestamp.FromDateTime(DateTime.SpecifyKind(src.JoinedAt.Value, DateTimeKind.Utc)) : null) .Map(dest => dest.JoinedAt, src => src.JoinedAt.HasValue ? Timestamp.FromDateTime(DateTime.SpecifyKind(src.JoinedAt.Value, DateTimeKind.Utc)) : null)
+2 -2
View File
@@ -1,10 +1,10 @@
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base FROM 194.5.195.53:32082/dotnet/aspnet:9.0 AS base
USER $APP_UID USER $APP_UID
WORKDIR /app WORKDIR /app
EXPOSE 8080 EXPOSE 8080
EXPOSE 8081 EXPOSE 8081
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build FROM 194.5.195.53:32082/dotnet/sdk:9.0 AS build
ARG BUILD_CONFIGURATION=Release ARG BUILD_CONFIGURATION=Release
WORKDIR /src WORKDIR /src
COPY ["FrontOffice.BFF.WebApi/NuGet.config", "NuGet.config"] COPY ["FrontOffice.BFF.WebApi/NuGet.config", "NuGet.config"]
@@ -0,0 +1,26 @@
using FrontOffice.BFF.WebApi.Common.Services;
using FrontOffice.BFF.Application.ConfigurationCQ.Queries.GetAppVersion;
using FrontOffice.BFF.Configuration.Protobuf.Protos.AppVersion;
namespace FrontOffice.BFF.WebApi.Services;
/// <summary>
/// سرویس نسخه اپلیکیشن - برای بررسی نیاز به پاک کردن کش
/// </summary>
public class AppVersionGrpcService : AppVersionContract.AppVersionContractBase
{
private readonly IDispatchRequestToCQRS _dispatchRequestToCQRS;
public AppVersionGrpcService(IDispatchRequestToCQRS dispatchRequestToCQRS)
{
_dispatchRequestToCQRS = dispatchRequestToCQRS;
}
/// <summary>
/// دریافت نسخه اپلیکیشن
/// </summary>
public override async Task<GetAppVersionResponse> GetAppVersion(GetAppVersionRequest request, ServerCallContext context)
{
return await _dispatchRequestToCQRS.Handle<GetAppVersionRequest, GetAppVersionQuery, GetAppVersionResponse>(request, context);
}
}
@@ -30,7 +30,7 @@ public class UserWalletService : UserWalletContract.UserWalletContractBase
} }
public override async Task<Empty> WithdrawBalance(WithdrawBalanceRequest request, ServerCallContext context) public override async Task<Empty> WithdrawBalance(WithdrawBalanceRequest request, ServerCallContext context)
{ {
return await _dispatchRequestToCQRS.Handle<WithdrawBalanceRequest, WithdrawBalanceCommand, Empty>(request, context); return await _dispatchRequestToCQRS.Handle<WithdrawBalanceRequest, WithdrawBalanceCommand>(request, context);
} }
public override async Task<GetUserWithdrawalsResponse> GetUserWithdrawals(GetUserWithdrawalsRequest request, ServerCallContext context) public override async Task<GetUserWithdrawalsResponse> GetUserWithdrawals(GetUserWithdrawalsRequest request, ServerCallContext context)
{ {
@@ -10,11 +10,18 @@
} }
}, },
"GrpcChannelOptions": { "GrpcChannelOptions": {
"CMSMSAddress": "https://cms.kbs1.ir", "CMSMSAddress": "http://cms-svc",
"PYMSMSAddress": "https://ipg.afrino.co" "PYMSMSAddress": "https://ipg.afrino.co"
}, },
"CmsSignalR": {
"HubPath": "/hubs/token-notification"
},
"Authentication": { "Authentication": {
"Authority": "https://ids.domain.com/", "Authority": "https://ids.domain.com/",
"Audience": "domain_api" "Audience": "domain_api"
},
"Seq": {
"ServerUrl": "http://seq-svc:5341",
"ApiKey": ""
} }
} }
@@ -0,0 +1,27 @@
{
"JwtSecurityKey": "TvlZVx5TJaHs8e9HgUdGzhGP2CIidoI444nAj+8+g7c=",
"JwtIssuer": "https://localhost",
"JwtAudience": "https://localhost",
"JwtExpiryInDays": 365,
"AllowedHosts": "*",
"Kestrel": {
"EndpointDefaults": {
"Protocols": "Http2"
}
},
"GrpcChannelOptions": {
"CMSMSAddress": "http://cms-svc",
"PYMSMSAddress": "https://ipg.afrino.co"
},
"CmsSignalR": {
"HubPath": "/hubs/token-notification"
},
"Authentication": {
"Authority": "https://ids.domain.com/",
"Audience": "domain_api"
},
"Seq": {
"ServerUrl": "http://seq-svc:5341",
"ApiKey": ""
}
}
+1 -3
View File
@@ -10,9 +10,7 @@
} }
}, },
"GrpcChannelOptions": { "GrpcChannelOptions": {
"CMSMSAddress": "http://cms-svc", "CMSMSAddress": "https://cms.foursat.afrino.co",
// "CMSMSAddress": "https://cms.foursat.afrino.co",
// "CMSMSAddress": "https://localhost:32846/",
"PYMSMSAddress": "https://ipg.afrino.co" "PYMSMSAddress": "https://ipg.afrino.co"
}, },
"CmsSignalR": { "CmsSignalR": {
@@ -3,7 +3,7 @@
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>0.0.3</Version> <Version>0.0.6</Version>
<PackageId>Foursat.FrontOffice.BFF.Commission.Protobuf</PackageId> <PackageId>Foursat.FrontOffice.BFF.Commission.Protobuf</PackageId>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild> <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<DebugSymbols>False</DebugSymbols> <DebugSymbols>False</DebugSymbols>
@@ -63,10 +63,9 @@ message CommissionPayoutModel
int32 balances_earned = 4; int32 balances_earned = 4;
int64 total_amount = 5; int64 total_amount = 5;
string amount_formatted = 6; string amount_formatted = 6;
string status = 7; int32 status = 7; // 0=Pending, 1=Paid, 2=WithdrawRequested, 3=Withdrawn, 4=PaymentFailed, 5=Cancelled
string status_badge_color = 8; google.protobuf.Timestamp calculated_date = 8;
google.protobuf.Timestamp calculated_date = 9; string date_persian = 9;
string date_persian = 10;
} }
// ============ GetMyWeeklyBalances ============ // ============ GetMyWeeklyBalances ============
@@ -92,13 +91,17 @@ message WeeklyBalanceModel
int64 id = 1; int64 id = 1;
int64 week_definition_id = 2; int64 week_definition_id = 2;
string week_display_name = 3; string week_display_name = 3;
int32 left_leg_balances = 4; int32 left_leg_balances = 4; // مجموع پای چپ (NewMembers + Carryover)
int32 right_leg_balances = 5; int32 right_leg_balances = 5; // مجموع پای راست (NewMembers + Carryover)
int32 total_balances = 6; int32 total_balances = 6; // تعداد تعادل = MIN(چپ, راست)
int64 weekly_pool_contribution = 7; int64 weekly_pool_contribution = 7;
bool is_expired = 8; bool is_expired = 8;
google.protobuf.Timestamp calculated_at = 9; google.protobuf.Timestamp calculated_at = 9;
string date_persian = 10; string date_persian = 10;
int32 left_leg_carryover = 11; // انتقالی پای چپ از هفته قبل
int32 right_leg_carryover = 12; // انتقالی پای راست از هفته قبل
int32 left_leg_new_members = 13; // اعضای جدید پای چپ این هفته
int32 right_leg_new_members = 14; // اعضای جدید پای راست این هفته
} }
// ============ GetWeekDefinitions ============ // ============ GetWeekDefinitions ============
@@ -4,7 +4,7 @@
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>0.0.2</Version> <Version>0.0.4</Version>
<DebugType>None</DebugType> <DebugType>None</DebugType>
<DebugSymbols>False</DebugSymbols> <DebugSymbols>False</DebugSymbols>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild> <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
@@ -24,6 +24,16 @@
<ItemGroup> <ItemGroup>
<Protobuf Include="Protos\configuration.proto" ProtoRoot="Protos\" GrpcServices="Both" /> <Protobuf Include="Protos\configuration.proto" ProtoRoot="Protos\" GrpcServices="Both" />
<Protobuf Include="Protos\appversion.proto" ProtoRoot="Protos\" GrpcServices="Both" />
</ItemGroup> </ItemGroup>
<Target Name="PushToFourSat" AfterTargets="Pack">
<PropertyGroup>
<NugetPackagePath>$(PackageOutputPath)$(PackageId).$(Version).nupkg</NugetPackagePath>
<PushCommand>
dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate
</PushCommand>
</PropertyGroup>
<Exec Command="$(PushCommand)" />
</Target>
</Project> </Project>
@@ -0,0 +1,42 @@
syntax = "proto3";
package appversion;
import "google/protobuf/empty.proto";
import "google/protobuf/wrappers.proto";
import "google/protobuf/timestamp.proto";
import "google/api/annotations.proto";
option csharp_namespace = "FrontOffice.BFF.Configuration.Protobuf.Protos.AppVersion";
// Service for tracking app versions and cache invalidation
service AppVersionContract
{
// Get current version for an app - called by frontends to check if cache clear is needed
rpc GetAppVersion(GetAppVersionRequest) returns (GetAppVersionResponse){
option (google.api.http) = {
get: "/AppVersion/Get"
};
};
}
// Request to get current version for specific app
message GetAppVersionRequest
{
string app_name = 1; // e.g., "FrontOffice", "BackOffice", "Mobile"
google.protobuf.StringValue current_client_version = 2; // Current version on client for comparison
}
// Response with version info
message GetAppVersionResponse
{
bool found = 1; // Whether the app was found
string app_name = 2;
string current_version = 3;
string min_required_version = 4;
bool requires_full_cache_clear = 5;
bool requires_update = 6; // True if client version < min_required_version
google.protobuf.StringValue update_message = 7;
google.protobuf.StringValue release_notes = 8;
google.protobuf.Timestamp last_updated = 9;
}
@@ -3,7 +3,7 @@
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>0.0.4</Version> <Version>0.0.5</Version>
<PackageId>Foursat.FrontOffice.BFF.NetworkMembership.Protobuf</PackageId> <PackageId>Foursat.FrontOffice.BFF.NetworkMembership.Protobuf</PackageId>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild> <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<DebugSymbols>False</DebugSymbols> <DebugSymbols>False</DebugSymbols>
@@ -76,6 +76,7 @@ message NetworkNodeModel
google.protobuf.Timestamp joined_at = 11; google.protobuf.Timestamp joined_at = 11;
bool is_club_active = 12; bool is_club_active = 12;
google.protobuf.Int64Value activation_week_definition_id = 13; google.protobuf.Int64Value activation_week_definition_id = 13;
google.protobuf.StringValue referral_code = 14;
} }
// ============ GetMyNetworkStatistics ============ // ============ GetMyNetworkStatistics ============