diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenCommand.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenCommand.cs new file mode 100644 index 0000000..d9221eb --- /dev/null +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenCommand.cs @@ -0,0 +1,9 @@ +namespace FrontOffice.BFF.Application.UserCQ.Commands.CreateNewOtpToken; +public record CreateNewOtpTokenCommand : IRequest +{ + //موبایل مقصد + public string Mobile { get; init; } + //مقصود + public string Purpose { get; init; } + +} \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenCommandHandler.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenCommandHandler.cs new file mode 100644 index 0000000..d9acd8f --- /dev/null +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenCommandHandler.cs @@ -0,0 +1,16 @@ +namespace FrontOffice.BFF.Application.UserCQ.Commands.CreateNewOtpToken; +public class CreateNewOtpTokenCommandHandler : IRequestHandler +{ + private readonly IApplicationContractContext _context; + + public CreateNewOtpTokenCommandHandler(IApplicationContractContext context) + { + _context = context; + } + + public async Task Handle(CreateNewOtpTokenCommand request, CancellationToken cancellationToken) + { + //TODO: Implement your business logic + return new CreateNewOtpTokenResponseDto(); + } +} diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenCommandValidator.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenCommandValidator.cs new file mode 100644 index 0000000..9574ccb --- /dev/null +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenCommandValidator.cs @@ -0,0 +1,18 @@ +namespace FrontOffice.BFF.Application.UserCQ.Commands.CreateNewOtpToken; +public class CreateNewOtpTokenCommandValidator : AbstractValidator +{ + public CreateNewOtpTokenCommandValidator() + { + RuleFor(model => model.Mobile) + .NotEmpty(); + RuleFor(model => model.Purpose) + .NotEmpty(); + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((CreateNewOtpTokenCommand)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenResponseDto.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenResponseDto.cs new file mode 100644 index 0000000..54bdb21 --- /dev/null +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenResponseDto.cs @@ -0,0 +1,11 @@ +namespace FrontOffice.BFF.Application.UserCQ.Commands.CreateNewOtpToken; +public class CreateNewOtpTokenResponseDto +{ + //موفق؟ + public bool Success { get; set; } + //پیام + public string Message { get; set; } + //کد + public string? Code { get; set; } + +} \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/UpdateUser/UpdateUserCommand.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/UpdateUser/UpdateUserCommand.cs index bcd67c5..3ca2e21 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Commands/UpdateUser/UpdateUserCommand.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/UpdateUser/UpdateUserCommand.cs @@ -7,13 +7,19 @@ public record UpdateUserCommand : IRequest public string? FirstName { get; init; } //نام خانوادگی public string? LastName { get; init; } - //شماره موبایل - public string Mobile { get; init; } //کد ملی public string? NationalCode { get; init; } //آدرس آواتار public string? AvatarPath { get; init; } - //شناسه والد - public long? ParentId { get; init; } + //فایل آواتار + public UserAvatarFileModel? AvatarFile { get; init; } -} \ No newline at end of file +}public class UserAvatarFileModel +{ + //اسم فایل + public string? FileName { get; set; } + //نوع فایل + public string? FileMime { get; set; } + //فایل + public byte[]? File { get; set; } +} diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/UpdateUser/UpdateUserCommandValidator.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/UpdateUser/UpdateUserCommandValidator.cs index e368b87..7385b8a 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Commands/UpdateUser/UpdateUserCommandValidator.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/UpdateUser/UpdateUserCommandValidator.cs @@ -5,8 +5,6 @@ public class UpdateUserCommandValidator : AbstractValidator { RuleFor(model => model.Id) .NotNull(); - RuleFor(model => model.Mobile) - .NotEmpty(); } public Func>> ValidateValue => async (model, propertyName) => { diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommand.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommand.cs new file mode 100644 index 0000000..2f883c7 --- /dev/null +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommand.cs @@ -0,0 +1,11 @@ +namespace FrontOffice.BFF.Application.UserCQ.Commands.VerifyOtpToken; +public record VerifyOtpTokenCommand : IRequest +{ + //موبایل مقصد + public string Mobile { get; init; } + //مقصود + public string Purpose { get; init; } + //کد + public string Code { get; init; } + +} \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs new file mode 100644 index 0000000..078626e --- /dev/null +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs @@ -0,0 +1,16 @@ +namespace FrontOffice.BFF.Application.UserCQ.Commands.VerifyOtpToken; +public class VerifyOtpTokenCommandHandler : IRequestHandler +{ + private readonly IApplicationContractContext _context; + + public VerifyOtpTokenCommandHandler(IApplicationContractContext context) + { + _context = context; + } + + public async Task Handle(VerifyOtpTokenCommand request, CancellationToken cancellationToken) + { + //TODO: Implement your business logic + return new VerifyOtpTokenResponseDto(); + } +} diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandValidator.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandValidator.cs new file mode 100644 index 0000000..5cd1c5a --- /dev/null +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandValidator.cs @@ -0,0 +1,20 @@ +namespace FrontOffice.BFF.Application.UserCQ.Commands.VerifyOtpToken; +public class VerifyOtpTokenCommandValidator : AbstractValidator +{ + public VerifyOtpTokenCommandValidator() + { + RuleFor(model => model.Mobile) + .NotEmpty(); + RuleFor(model => model.Purpose) + .NotEmpty(); + RuleFor(model => model.Code) + .NotEmpty(); + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((VerifyOtpTokenCommand)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenResponseDto.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenResponseDto.cs new file mode 100644 index 0000000..71bdd4a --- /dev/null +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenResponseDto.cs @@ -0,0 +1,11 @@ +namespace FrontOffice.BFF.Application.UserCQ.Commands.VerifyOtpToken; +public class VerifyOtpTokenResponseDto +{ + //موفق؟ + public bool Success { get; set; } + //پیام + public string Message { get; set; } + //شناسه کاربر + public long? UserId { get; set; } + +} \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserCQ/Queries/GetAllUserByFilter/GetAllUserByFilterQuery.cs b/src/FrontOffice.BFF.Application/UserCQ/Queries/GetAllUserByFilter/GetAllUserByFilterQuery.cs index 90ef227..2a2fe42 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Queries/GetAllUserByFilter/GetAllUserByFilterQuery.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Queries/GetAllUserByFilter/GetAllUserByFilterQuery.cs @@ -24,4 +24,8 @@ public record GetAllUserByFilterQuery : IRequest public string? AvatarPath { get; set; } //شناسه والد public long? ParentId { get; set; } + //کد ارجاع + public string? ReferralCode { get; set; } + //موبایل فعال شده؟ + public bool? IsMobileVerified { get; set; } } diff --git a/src/FrontOffice.BFF.Application/UserCQ/Queries/GetAllUserByFilter/GetAllUserByFilterResponseDto.cs b/src/FrontOffice.BFF.Application/UserCQ/Queries/GetAllUserByFilter/GetAllUserByFilterResponseDto.cs index eed90b0..09a3539 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Queries/GetAllUserByFilter/GetAllUserByFilterResponseDto.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Queries/GetAllUserByFilter/GetAllUserByFilterResponseDto.cs @@ -22,4 +22,10 @@ public class GetAllUserByFilterResponseDto public string? AvatarPath { get; set; } //شناسه والد public long? ParentId { get; set; } + //کد ارجاع + public string ReferralCode { get; set; } + //موبایل فعال شده؟ + public bool IsMobileVerified { get; set; } + //تاریخ فعال سازی موبایل + public DateTime? MobileVerifiedAt { get; set; } } diff --git a/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserResponseDto.cs b/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserResponseDto.cs index db70bb6..c489e6d 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserResponseDto.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserResponseDto.cs @@ -15,5 +15,13 @@ public class GetUserResponseDto public string? AvatarPath { get; set; } //شناسه والد public long? ParentId { get; set; } + //توکن + public string Token { get; set; } + //کد ارجاع + public string ReferralCode { get; set; } + //موبایل فعال شده؟ + public bool IsMobileVerified { get; set; } + //تاریخ فعال سازی موبایل + public DateTime? MobileVerifiedAt { get; set; } } \ No newline at end of file diff --git a/src/FrontOffice.BFF.WebApi/Services/PackageService.cs b/src/FrontOffice.BFF.WebApi/Services/PackageService.cs index 206e568..5e08897 100644 --- a/src/FrontOffice.BFF.WebApi/Services/PackageService.cs +++ b/src/FrontOffice.BFF.WebApi/Services/PackageService.cs @@ -1,8 +1,5 @@ using FrontOffice.BFF.Package.Protobuf.Protos.Package; using FrontOffice.BFF.WebApi.Common.Services; -using FrontOffice.BFF.Application.PackageCQ.Commands.CreateNewPackage; -using FrontOffice.BFF.Application.PackageCQ.Commands.UpdatePackage; -using FrontOffice.BFF.Application.PackageCQ.Commands.DeletePackage; using FrontOffice.BFF.Application.PackageCQ.Queries.GetPackage; using FrontOffice.BFF.Application.PackageCQ.Queries.GetAllPackageByFilter; namespace FrontOffice.BFF.WebApi.Services; @@ -14,18 +11,6 @@ public class PackageService : PackageContract.PackageContractBase { _dispatchRequestToCQRS = dispatchRequestToCQRS; } - public override async Task CreateNewPackage(CreateNewPackageRequest request, ServerCallContext context) - { - return await _dispatchRequestToCQRS.Handle(request, context); - } - public override async Task UpdatePackage(UpdatePackageRequest request, ServerCallContext context) - { - return await _dispatchRequestToCQRS.Handle(request, context); - } - public override async Task DeletePackage(DeletePackageRequest request, ServerCallContext context) - { - return await _dispatchRequestToCQRS.Handle(request, context); - } public override async Task GetPackage(GetPackageRequest request, ServerCallContext context) { return await _dispatchRequestToCQRS.Handle(request, context); diff --git a/src/FrontOffice.BFF.WebApi/Services/UserService.cs b/src/FrontOffice.BFF.WebApi/Services/UserService.cs index 6f346af..968523c 100644 --- a/src/FrontOffice.BFF.WebApi/Services/UserService.cs +++ b/src/FrontOffice.BFF.WebApi/Services/UserService.cs @@ -1,10 +1,11 @@ using FrontOffice.BFF.User.Protobuf.Protos.User; using FrontOffice.BFF.WebApi.Common.Services; -using FrontOffice.BFF.Application.UserCQ.Commands.CreateNewUser; using FrontOffice.BFF.Application.UserCQ.Commands.UpdateUser; using FrontOffice.BFF.Application.UserCQ.Commands.DeleteUser; using FrontOffice.BFF.Application.UserCQ.Queries.GetUser; using FrontOffice.BFF.Application.UserCQ.Queries.GetAllUserByFilter; +using FrontOffice.BFF.Application.UserCQ.Commands.CreateNewOtpToken; +using FrontOffice.BFF.Application.UserCQ.Commands.VerifyOtpToken; namespace FrontOffice.BFF.WebApi.Services; public class UserService : UserContract.UserContractBase { @@ -14,10 +15,6 @@ public class UserService : UserContract.UserContractBase { _dispatchRequestToCQRS = dispatchRequestToCQRS; } - public override async Task CreateNewUser(CreateNewUserRequest request, ServerCallContext context) - { - return await _dispatchRequestToCQRS.Handle(request, context); - } public override async Task UpdateUser(UpdateUserRequest request, ServerCallContext context) { return await _dispatchRequestToCQRS.Handle(request, context); @@ -34,4 +31,12 @@ public class UserService : UserContract.UserContractBase { return await _dispatchRequestToCQRS.Handle(request, context); } + public override async Task CreateNewOtpToken(CreateNewOtpTokenRequest request, ServerCallContext context) + { + return await _dispatchRequestToCQRS.Handle(request, context); + } + public override async Task VerifyOtpToken(VerifyOtpTokenRequest request, ServerCallContext context) + { + return await _dispatchRequestToCQRS.Handle(request, context); + } } diff --git a/src/Protobufs/FrontOffice.BFF.Package.Protobuf/Protos/package.proto b/src/Protobufs/FrontOffice.BFF.Package.Protobuf/Protos/package.proto index 7d55c1c..9d66e23 100644 --- a/src/Protobufs/FrontOffice.BFF.Package.Protobuf/Protos/package.proto +++ b/src/Protobufs/FrontOffice.BFF.Package.Protobuf/Protos/package.proto @@ -12,24 +12,6 @@ option csharp_namespace = "FrontOffice.BFF.Package.Protobuf.Protos.Package"; service PackageContract { - rpc CreateNewPackage(CreateNewPackageRequest) returns (CreateNewPackageResponse){ - option (google.api.http) = { - post: "/CreateNewPackage" - body: "*" - }; - }; - rpc UpdatePackage(UpdatePackageRequest) returns (google.protobuf.Empty){ - option (google.api.http) = { - put: "/UpdatePackage" - body: "*" - }; - }; - rpc DeletePackage(DeletePackageRequest) returns (google.protobuf.Empty){ - option (google.api.http) = { - delete: "/DeletePackage" - body: "*" - }; - }; rpc GetPackage(GetPackageRequest) returns (GetPackageResponse){ option (google.api.http) = { get: "/GetPackage" @@ -43,29 +25,6 @@ service PackageContract }; }; } -message CreateNewPackageRequest -{ - string title = 1; - string description = 2; - string image_path = 3; - int64 price = 4; -} -message CreateNewPackageResponse -{ - int64 id = 1; -} -message UpdatePackageRequest -{ - int64 id = 1; - string title = 2; - string description = 3; - string image_path = 4; - int64 price = 5; -} -message DeletePackageRequest -{ - int64 id = 1; -} message GetPackageRequest { int64 id = 1; diff --git a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/ConfigureServices.cs b/src/Protobufs/FrontOffice.BFF.Role.Protobuf/ConfigureServices.cs deleted file mode 100644 index 7c7ff2a..0000000 --- a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/ConfigureServices.cs +++ /dev/null @@ -1,14 +0,0 @@ -using FluentValidation; -using System.Reflection; - -namespace Microsoft.Extensions.DependencyInjection; - -public static class ConfigureServices -{ - public static IServiceCollection AddRoleProtobufServices(this IServiceCollection services) - { - services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly()); - return services; - } -} - diff --git a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/FrontOffice.BFF.Role.Protobuf.csproj b/src/Protobufs/FrontOffice.BFF.Role.Protobuf/FrontOffice.BFF.Role.Protobuf.csproj deleted file mode 100644 index b8691dd..0000000 --- a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/FrontOffice.BFF.Role.Protobuf.csproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - net7.0 - enable - enable - 0.0.111 - None - False - False - Foursat.FrontOffice.BFF.Role.Protobuf - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - - - - $(PackageOutputPath)$(PackageId).$(Version).nupkg - dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate && del "$(NugetPackagePath)" - - - - - diff --git a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Protos/google/api/annotations.proto b/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Protos/google/api/annotations.proto deleted file mode 100644 index 85c361b..0000000 --- a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Protos/google/api/annotations.proto +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 2015, Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/http.proto"; -import "google/protobuf/descriptor.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "AnnotationsProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -extend google.protobuf.MethodOptions { - // See `HttpRule`. - HttpRule http = 72295728; -} diff --git a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Protos/google/api/http.proto b/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Protos/google/api/http.proto deleted file mode 100644 index b8426ba..0000000 --- a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Protos/google/api/http.proto +++ /dev/null @@ -1,377 +0,0 @@ -// Copyright 2019 Google LLC. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -syntax = "proto3"; - -package google.api; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "HttpProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -// Defines the HTTP configuration for an API service. It contains a list of -// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method -// to one or more HTTP REST API methods. -message Http { - // A list of HTTP configuration rules that apply to individual API methods. - // - // **NOTE:** All service configuration rules follow "last one wins" order. - repeated HttpRule rules = 1; - - // When set to true, URL path parameters will be fully URI-decoded except in - // cases of single segment matches in reserved expansion, where "%2F" will be - // left encoded. - // - // The default behavior is to not decode RFC 6570 reserved characters in multi - // segment matches. - bool fully_decode_reserved_expansion = 2; -} - -// # gRPC Transcoding -// -// gRPC Transcoding is a feature for mapping between a gRPC method and one or -// more HTTP REST endpoints. It allows developers to build a single API service -// that supports both gRPC APIs and REST APIs. Many systems, including [Google -// APIs](https://github.com/googleapis/googleapis), -// [Cloud Endpoints](https://cloud.google.com/endpoints), [gRPC -// Gateway](https://github.com/grpc-ecosystem/grpc-gateway), -// and [Envoy](https://github.com/envoyproxy/envoy) proxy support this feature -// and use it for large scale production services. -// -// `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies -// how different portions of the gRPC request message are mapped to the URL -// path, URL query parameters, and HTTP request body. It also controls how the -// gRPC response message is mapped to the HTTP response body. `HttpRule` is -// typically specified as an `google.api.http` annotation on the gRPC method. -// -// Each mapping specifies a URL path template and an HTTP method. The path -// template may refer to one or more fields in the gRPC request message, as long -// as each field is a non-repeated field with a primitive (non-message) type. -// The path template controls how fields of the request message are mapped to -// the URL path. -// -// Example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get: "/v1/{name=messages/*}" -// }; -// } -// } -// message GetMessageRequest { -// string name = 1; // Mapped to URL path. -// } -// message Message { -// string text = 1; // The resource content. -// } -// -// This enables an HTTP REST to gRPC mapping as below: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456` | `GetMessage(name: "messages/123456")` -// -// Any fields in the request message which are not bound by the path template -// automatically become HTTP query parameters if there is no HTTP request body. -// For example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get:"/v1/messages/{message_id}" -// }; -// } -// } -// message GetMessageRequest { -// message SubMessage { -// string subfield = 1; -// } -// string message_id = 1; // Mapped to URL path. -// int64 revision = 2; // Mapped to URL query parameter `revision`. -// SubMessage sub = 3; // Mapped to URL query parameter `sub.subfield`. -// } -// -// This enables a HTTP JSON to RPC mapping as below: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | -// `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: -// "foo"))` -// -// Note that fields which are mapped to URL query parameters must have a -// primitive type or a repeated primitive type or a non-repeated message type. -// In the case of a repeated type, the parameter can be repeated in the URL -// as `...?param=A¶m=B`. In the case of a message type, each field of the -// message is mapped to a separate parameter, such as -// `...?foo.a=A&foo.b=B&foo.c=C`. -// -// For HTTP methods that allow a request body, the `body` field -// specifies the mapping. Consider a REST update method on the -// message resource collection: -// -// service Messaging { -// rpc UpdateMessage(UpdateMessageRequest) returns (Message) { -// option (google.api.http) = { -// patch: "/v1/messages/{message_id}" -// body: "message" -// }; -// } -// } -// message UpdateMessageRequest { -// string message_id = 1; // mapped to the URL -// Message message = 2; // mapped to the body -// } -// -// The following HTTP JSON to RPC mapping is enabled, where the -// representation of the JSON in the request body is determined by -// protos JSON encoding: -// -// HTTP | gRPC -// -----|----- -// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: -// "123456" message { text: "Hi!" })` -// -// The special name `*` can be used in the body mapping to define that -// every field not bound by the path template should be mapped to the -// request body. This enables the following alternative definition of -// the update method: -// -// service Messaging { -// rpc UpdateMessage(Message) returns (Message) { -// option (google.api.http) = { -// patch: "/v1/messages/{message_id}" -// body: "*" -// }; -// } -// } -// message Message { -// string message_id = 1; -// string text = 2; -// } -// -// -// The following HTTP JSON to RPC mapping is enabled: -// -// HTTP | gRPC -// -----|----- -// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: -// "123456" text: "Hi!")` -// -// Note that when using `*` in the body mapping, it is not possible to -// have HTTP parameters, as all fields not bound by the path end in -// the body. This makes this option more rarely used in practice when -// defining REST APIs. The common usage of `*` is in custom methods -// which don't use the URL at all for transferring data. -// -// It is possible to define multiple HTTP methods for one RPC by using -// the `additional_bindings` option. Example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get: "/v1/messages/{message_id}" -// additional_bindings { -// get: "/v1/users/{user_id}/messages/{message_id}" -// } -// }; -// } -// } -// message GetMessageRequest { -// string message_id = 1; -// string user_id = 2; -// } -// -// This enables the following two alternative HTTP JSON to RPC mappings: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")` -// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: -// "123456")` -// -// ## Rules for HTTP mapping -// -// 1. Leaf request fields (recursive expansion nested messages in the request -// message) are classified into three categories: -// - Fields referred by the path template. They are passed via the URL path. -// - Fields referred by the [HttpRule.body][google.api.HttpRule.body]. They are passed via the HTTP -// request body. -// - All other fields are passed via the URL query parameters, and the -// parameter name is the field path in the request message. A repeated -// field can be represented as multiple query parameters under the same -// name. -// 2. If [HttpRule.body][google.api.HttpRule.body] is "*", there is no URL query parameter, all fields -// are passed via URL path and HTTP request body. -// 3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP request body, all -// fields are passed via URL path and URL query parameters. -// -// ### Path template syntax -// -// Template = "/" Segments [ Verb ] ; -// Segments = Segment { "/" Segment } ; -// Segment = "*" | "**" | LITERAL | Variable ; -// Variable = "{" FieldPath [ "=" Segments ] "}" ; -// FieldPath = IDENT { "." IDENT } ; -// Verb = ":" LITERAL ; -// -// The syntax `*` matches a single URL path segment. The syntax `**` matches -// zero or more URL path segments, which must be the last part of the URL path -// except the `Verb`. -// -// The syntax `Variable` matches part of the URL path as specified by its -// template. A variable template must not contain other variables. If a variable -// matches a single path segment, its template may be omitted, e.g. `{var}` -// is equivalent to `{var=*}`. -// -// The syntax `LITERAL` matches literal text in the URL path. If the `LITERAL` -// contains any reserved character, such characters should be percent-encoded -// before the matching. -// -// If a variable contains exactly one path segment, such as `"{var}"` or -// `"{var=*}"`, when such a variable is expanded into a URL path on the client -// side, all characters except `[-_.~0-9a-zA-Z]` are percent-encoded. The -// server side does the reverse decoding. Such variables show up in the -// [Discovery -// Document](https://developers.google.com/discovery/v1/reference/apis) as -// `{var}`. -// -// If a variable contains multiple path segments, such as `"{var=foo/*}"` -// or `"{var=**}"`, when such a variable is expanded into a URL path on the -// client side, all characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. -// The server side does the reverse decoding, except "%2F" and "%2f" are left -// unchanged. Such variables show up in the -// [Discovery -// Document](https://developers.google.com/discovery/v1/reference/apis) as -// `{+var}`. -// -// ## Using gRPC API Service Configuration -// -// gRPC API Service Configuration (service config) is a configuration language -// for configuring a gRPC service to become a user-facing product. The -// service config is simply the YAML representation of the `google.api.Service` -// proto message. -// -// As an alternative to annotating your proto file, you can configure gRPC -// transcoding in your service config YAML files. You do this by specifying a -// `HttpRule` that maps the gRPC method to a REST endpoint, achieving the same -// effect as the proto annotation. This can be particularly useful if you -// have a proto that is reused in multiple services. Note that any transcoding -// specified in the service config will override any matching transcoding -// configuration in the proto. -// -// Example: -// -// http: -// rules: -// # Selects a gRPC method and applies HttpRule to it. -// - selector: example.v1.Messaging.GetMessage -// get: /v1/messages/{message_id}/{sub.subfield} -// -// ## Special notes -// -// When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the -// proto to JSON conversion must follow the [proto3 -// specification](https://developers.google.com/protocol-buffers/docs/proto3#json). -// -// While the single segment variable follows the semantics of -// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String -// Expansion, the multi segment variable **does not** follow RFC 6570 Section -// 3.2.3 Reserved Expansion. The reason is that the Reserved Expansion -// does not expand special characters like `?` and `#`, which would lead -// to invalid URLs. As the result, gRPC Transcoding uses a custom encoding -// for multi segment variables. -// -// The path variables **must not** refer to any repeated or mapped field, -// because client libraries are not capable of handling such variable expansion. -// -// The path variables **must not** capture the leading "/" character. The reason -// is that the most common use case "{var}" does not capture the leading "/" -// character. For consistency, all path variables must share the same behavior. -// -// Repeated message fields must not be mapped to URL query parameters, because -// no client library can support such complicated mapping. -// -// If an API needs to use a JSON array for request or response body, it can map -// the request or response body to a repeated field. However, some gRPC -// Transcoding implementations may not support this feature. -message HttpRule { - // Selects a method to which this rule applies. - // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. - string selector = 1; - - // Determines the URL pattern is matched by this rules. This pattern can be - // used with any of the {get|put|post|delete|patch} methods. A custom method - // can be defined using the 'custom' field. - oneof pattern { - // Maps to HTTP GET. Used for listing and getting information about - // resources. - string get = 2; - - // Maps to HTTP PUT. Used for replacing a resource. - string put = 3; - - // Maps to HTTP POST. Used for creating a resource or performing an action. - string post = 4; - - // Maps to HTTP DELETE. Used for deleting a resource. - string delete = 5; - - // Maps to HTTP PATCH. Used for updating a resource. - string patch = 6; - - // The custom pattern is used for specifying an HTTP method that is not - // included in the `pattern` field, such as HEAD, or "*" to leave the - // HTTP method unspecified for this rule. The wild-card rule is useful - // for services that provide content to Web (HTML) clients. - CustomHttpPattern custom = 8; - } - - // The name of the request field whose value is mapped to the HTTP request - // body, or `*` for mapping all request fields not captured by the path - // pattern to the HTTP body, or omitted for not having any HTTP request body. - // - // NOTE: the referred field must be present at the top-level of the request - // message type. - string body = 7; - - // Optional. The name of the response field whose value is mapped to the HTTP - // response body. When omitted, the entire response message will be used - // as the HTTP response body. - // - // NOTE: The referred field must be present at the top-level of the response - // message type. - string response_body = 12; - - // Additional HTTP bindings for the selector. Nested bindings must - // not contain an `additional_bindings` field themselves (that is, - // the nesting may only be one level deep). - repeated HttpRule additional_bindings = 11; -} - -// A custom pattern is used for defining custom HTTP verb. -message CustomHttpPattern { - // The name of this custom HTTP verb. - string kind = 1; - - // The path matched by this custom verb. - string path = 2; -} - diff --git a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Protos/role.proto b/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Protos/role.proto deleted file mode 100644 index 03902dd..0000000 --- a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Protos/role.proto +++ /dev/null @@ -1,125 +0,0 @@ -syntax = "proto3"; - -package role; - -import "google/protobuf/empty.proto"; -import "google/protobuf/wrappers.proto"; -import "google/protobuf/duration.proto"; -import "google/protobuf/timestamp.proto"; -import "google/api/annotations.proto"; - -option csharp_namespace = "FrontOffice.BFF.Role.Protobuf.Protos.Role"; - -service RoleContract -{ - rpc CreateNewRole(CreateNewRoleRequest) returns (CreateNewRoleResponse){ - option (google.api.http) = { - post: "/CreateNewRole" - body: "*" - }; - }; - rpc UpdateRole(UpdateRoleRequest) returns (google.protobuf.Empty){ - option (google.api.http) = { - put: "/UpdateRole" - body: "*" - }; - }; - rpc DeleteRole(DeleteRoleRequest) returns (google.protobuf.Empty){ - option (google.api.http) = { - delete: "/DeleteRole" - body: "*" - }; - }; - rpc GetRole(GetRoleRequest) returns (GetRoleResponse){ - option (google.api.http) = { - get: "/GetRole" - - }; - }; - rpc GetAllRoleByFilter(GetAllRoleByFilterRequest) returns (GetAllRoleByFilterResponse){ - option (google.api.http) = { - get: "/GetAllRoleByFilter" - - }; - }; -} -message CreateNewRoleRequest -{ - string name = 1; - string title = 2; -} -message CreateNewRoleResponse -{ - int64 id = 1; -} -message UpdateRoleRequest -{ - int64 id = 1; - string name = 2; - string title = 3; -} -message DeleteRoleRequest -{ - int64 id = 1; -} -message GetRoleRequest -{ - int64 id = 1; -} -message GetRoleResponse -{ - int64 id = 1; - string name = 2; - string title = 3; -} -message GetAllRoleByFilterRequest -{ - PaginationState pagination_state = 1; - google.protobuf.StringValue sort_by = 2; - GetAllRoleByFilterFilter filter = 3; -} -message GetAllRoleByFilterFilter -{ - google.protobuf.Int64Value id = 1; - google.protobuf.StringValue name = 2; - google.protobuf.StringValue title = 3; -} -message GetAllRoleByFilterResponse -{ - MetaData meta_data = 1; - repeated GetAllRoleByFilterResponseModel models = 2; -} -message GetAllRoleByFilterResponseModel -{ - int64 id = 1; - string name = 2; - string title = 3; -} - -message PaginationState -{ - int32 page_number = 1; - - int32 page_size = 2; -} -message MetaData -{ - int64 current_page = 1; - - int64 total_page = 2; - - int64 page_size = 3; - - int64 total_count = 4; - - bool has_previous = 5; - - bool has_next = 6; -} -message DecimalValue -{ - - int64 units = 1; - - sfixed32 nanos = 2; -} diff --git a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/CreateNewRoleRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/CreateNewRoleRequestValidator.cs deleted file mode 100644 index 33ffbb0..0000000 --- a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/CreateNewRoleRequestValidator.cs +++ /dev/null @@ -1,21 +0,0 @@ -using FluentValidation; -using FrontOffice.BFF.Role.Protobuf.Protos.Role; -namespace FrontOffice.BFF.Role.Protobuf.Validator; - -public class CreateNewRoleRequestValidator : AbstractValidator -{ - public CreateNewRoleRequestValidator() - { - RuleFor(model => model.Name) - .NotEmpty(); - RuleFor(model => model.Title) - .NotEmpty(); - } - public Func>> ValidateValue => async (model, propertyName) => - { - var result = await ValidateAsync(ValidationContext.CreateWithOptions((CreateNewRoleRequest)model, x => x.IncludeProperties(propertyName))); - if (result.IsValid) - return Array.Empty(); - return result.Errors.Select(e => e.ErrorMessage); - }; -} diff --git a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/DeleteRoleRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/DeleteRoleRequestValidator.cs deleted file mode 100644 index 921a14b..0000000 --- a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/DeleteRoleRequestValidator.cs +++ /dev/null @@ -1,19 +0,0 @@ -using FluentValidation; -using FrontOffice.BFF.Role.Protobuf.Protos.Role; -namespace FrontOffice.BFF.Role.Protobuf.Validator; - -public class DeleteRoleRequestValidator : AbstractValidator -{ - public DeleteRoleRequestValidator() - { - RuleFor(model => model.Id) - .NotNull(); - } - public Func>> ValidateValue => async (model, propertyName) => - { - var result = await ValidateAsync(ValidationContext.CreateWithOptions((DeleteRoleRequest)model, x => x.IncludeProperties(propertyName))); - if (result.IsValid) - return Array.Empty(); - return result.Errors.Select(e => e.ErrorMessage); - }; -} diff --git a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/GetAllRoleByFilterRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/GetAllRoleByFilterRequestValidator.cs deleted file mode 100644 index 247fb47..0000000 --- a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/GetAllRoleByFilterRequestValidator.cs +++ /dev/null @@ -1,17 +0,0 @@ -using FluentValidation; -using FrontOffice.BFF.Role.Protobuf.Protos.Role; -namespace FrontOffice.BFF.Role.Protobuf.Validator; - -public class GetAllRoleByFilterRequestValidator : AbstractValidator -{ - public GetAllRoleByFilterRequestValidator() - { - } - public Func>> ValidateValue => async (model, propertyName) => - { - var result = await ValidateAsync(ValidationContext.CreateWithOptions((GetAllRoleByFilterRequest)model, x => x.IncludeProperties(propertyName))); - if (result.IsValid) - return Array.Empty(); - return result.Errors.Select(e => e.ErrorMessage); - }; -} diff --git a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/GetRoleRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/GetRoleRequestValidator.cs deleted file mode 100644 index 47c5386..0000000 --- a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/GetRoleRequestValidator.cs +++ /dev/null @@ -1,19 +0,0 @@ -using FluentValidation; -using FrontOffice.BFF.Role.Protobuf.Protos.Role; -namespace FrontOffice.BFF.Role.Protobuf.Validator; - -public class GetRoleRequestValidator : AbstractValidator -{ - public GetRoleRequestValidator() - { - RuleFor(model => model.Id) - .NotNull(); - } - public Func>> ValidateValue => async (model, propertyName) => - { - var result = await ValidateAsync(ValidationContext.CreateWithOptions((GetRoleRequest)model, x => x.IncludeProperties(propertyName))); - if (result.IsValid) - return Array.Empty(); - return result.Errors.Select(e => e.ErrorMessage); - }; -} diff --git a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/UpdateRoleRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/UpdateRoleRequestValidator.cs deleted file mode 100644 index 12f2537..0000000 --- a/src/Protobufs/FrontOffice.BFF.Role.Protobuf/Validator/UpdateRoleRequestValidator.cs +++ /dev/null @@ -1,23 +0,0 @@ -using FluentValidation; -using FrontOffice.BFF.Role.Protobuf.Protos.Role; -namespace FrontOffice.BFF.Role.Protobuf.Validator; - -public class UpdateRoleRequestValidator : AbstractValidator -{ - public UpdateRoleRequestValidator() - { - RuleFor(model => model.Id) - .NotNull(); - RuleFor(model => model.Name) - .NotEmpty(); - RuleFor(model => model.Title) - .NotEmpty(); - } - public Func>> ValidateValue => async (model, propertyName) => - { - var result = await ValidateAsync(ValidationContext.CreateWithOptions((UpdateRoleRequest)model, x => x.IncludeProperties(propertyName))); - if (result.IsValid) - return Array.Empty(); - return result.Errors.Select(e => e.ErrorMessage); - }; -} diff --git a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto index ceb1335..7b7092a 100644 --- a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto +++ b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto @@ -12,12 +12,6 @@ option csharp_namespace = "FrontOffice.BFF.User.Protobuf.Protos.User"; service UserContract { - rpc CreateNewUser(CreateNewUserRequest) returns (CreateNewUserResponse){ - option (google.api.http) = { - post: "/CreateNewUser" - body: "*" - }; - }; rpc UpdateUser(UpdateUserRequest) returns (google.protobuf.Empty){ option (google.api.http) = { put: "/UpdateUser" @@ -42,29 +36,33 @@ service UserContract }; }; -} -message CreateNewUserRequest -{ - google.protobuf.StringValue first_name = 1; - google.protobuf.StringValue last_name = 2; - string mobile = 3; - google.protobuf.StringValue national_code = 4; - google.protobuf.StringValue avatar_path = 5; - google.protobuf.Int64Value parent_id = 6; -} -message CreateNewUserResponse -{ - int64 id = 1; + rpc CreateNewOtpToken(CreateNewOtpTokenRequest) returns (CreateNewOtpTokenResponse){ + option (google.api.http) = { + post: "/CreateNewOtpToken" + body: "*" + }; + }; + rpc VerifyOtpToken(VerifyOtpTokenRequest) returns (VerifyOtpTokenResponse){ + option (google.api.http) = { + post: "/VerifyOtpToken" + body: "*" + }; + }; } message UpdateUserRequest { int64 id = 1; google.protobuf.StringValue first_name = 2; google.protobuf.StringValue last_name = 3; - string mobile = 4; - google.protobuf.StringValue national_code = 5; - google.protobuf.StringValue avatar_path = 6; - google.protobuf.Int64Value parent_id = 7; + google.protobuf.StringValue national_code = 4; + google.protobuf.StringValue avatar_path = 5; + UserAvatarFileModel avatar_file = 6; +} +message UserAvatarFileModel +{ + google.protobuf.StringValue file_name = 1; + google.protobuf.StringValue file_mime = 2; + bytes file = 3; } message DeleteUserRequest { @@ -83,6 +81,10 @@ message GetUserResponse google.protobuf.StringValue national_code = 5; google.protobuf.StringValue avatar_path = 6; google.protobuf.Int64Value parent_id = 7; + string token = 8; + string referral_code = 9; + bool is_mobile_verified = 10; + google.protobuf.Timestamp mobile_verified_at = 11; } message GetAllUserByFilterRequest { @@ -99,6 +101,8 @@ message GetAllUserByFilterFilter google.protobuf.StringValue national_code = 5; google.protobuf.StringValue avatar_path = 6; google.protobuf.Int64Value parent_id = 7; + google.protobuf.StringValue referral_code = 8; + google.protobuf.BoolValue is_mobile_verified = 9; } message GetAllUserByFilterResponse { @@ -114,6 +118,32 @@ message GetAllUserByFilterResponseModel google.protobuf.StringValue national_code = 5; google.protobuf.StringValue avatar_path = 6; google.protobuf.Int64Value parent_id = 7; + string referral_code = 8; + bool is_mobile_verified = 9; + google.protobuf.Timestamp mobile_verified_at = 10; +} +message CreateNewOtpTokenRequest +{ + string mobile = 1; + string purpose = 2; +} +message CreateNewOtpTokenResponse +{ + bool success = 1; + string message = 2; + google.protobuf.StringValue code = 3; +} +message VerifyOtpTokenRequest +{ + string mobile = 1; + string purpose = 2; + string code = 3; +} +message VerifyOtpTokenResponse +{ + bool success = 1; + string message = 2; + google.protobuf.Int64Value user_id = 3; } message PaginationState diff --git a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/CreateNewOtpTokenRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/CreateNewOtpTokenRequestValidator.cs new file mode 100644 index 0000000..820d488 --- /dev/null +++ b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/CreateNewOtpTokenRequestValidator.cs @@ -0,0 +1,21 @@ +using FluentValidation; +using FrontOffice.BFF.User.Protobuf.Protos.User; +namespace FrontOffice.BFF.User.Protobuf.Validator; + +public class CreateNewOtpTokenRequestValidator : AbstractValidator +{ + public CreateNewOtpTokenRequestValidator() + { + RuleFor(model => model.Mobile) + .NotEmpty(); + RuleFor(model => model.Purpose) + .NotEmpty(); + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((CreateNewOtpTokenRequest)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/UpdateUserRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/UpdateUserRequestValidator.cs index 9ae5eba..ca1adf2 100644 --- a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/UpdateUserRequestValidator.cs +++ b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/UpdateUserRequestValidator.cs @@ -8,8 +8,6 @@ public class UpdateUserRequestValidator : AbstractValidator { RuleFor(model => model.Id) .NotNull(); - RuleFor(model => model.Mobile) - .NotEmpty(); } public Func>> ValidateValue => async (model, propertyName) => { diff --git a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/VerifyOtpTokenRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/VerifyOtpTokenRequestValidator.cs new file mode 100644 index 0000000..cc8b4be --- /dev/null +++ b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/VerifyOtpTokenRequestValidator.cs @@ -0,0 +1,23 @@ +using FluentValidation; +using FrontOffice.BFF.User.Protobuf.Protos.User; +namespace FrontOffice.BFF.User.Protobuf.Validator; + +public class VerifyOtpTokenRequestValidator : AbstractValidator +{ + public VerifyOtpTokenRequestValidator() + { + RuleFor(model => model.Mobile) + .NotEmpty(); + RuleFor(model => model.Purpose) + .NotEmpty(); + RuleFor(model => model.Code) + .NotEmpty(); + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((VerifyOtpTokenRequest)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/ConfigureServices.cs b/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/ConfigureServices.cs deleted file mode 100644 index 5331f03..0000000 --- a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/ConfigureServices.cs +++ /dev/null @@ -1,14 +0,0 @@ -using FluentValidation; -using System.Reflection; - -namespace Microsoft.Extensions.DependencyInjection; - -public static class ConfigureServices -{ - public static IServiceCollection AddUserRoleProtobufServices(this IServiceCollection services) - { - services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly()); - return services; - } -} - diff --git a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/FrontOffice.BFF.UserRole.Protobuf.csproj b/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/FrontOffice.BFF.UserRole.Protobuf.csproj deleted file mode 100644 index 85b9568..0000000 --- a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/FrontOffice.BFF.UserRole.Protobuf.csproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - net7.0 - enable - enable - 0.0.111 - None - False - False - Foursat.FrontOffice.BFF.UserRole.Protobuf - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - - - - $(PackageOutputPath)$(PackageId).$(Version).nupkg - dotnet nuget push **/*.nupkg --source https://git.afrino.co/api/packages/FourSat/nuget/index.json --api-key 061a5cb15517c6da39c16cfce8556c55ae104d0d --skip-duplicate && del "$(NugetPackagePath)" - - - - - diff --git a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Protos/google/api/annotations.proto b/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Protos/google/api/annotations.proto deleted file mode 100644 index 85c361b..0000000 --- a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Protos/google/api/annotations.proto +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 2015, Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/http.proto"; -import "google/protobuf/descriptor.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "AnnotationsProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -extend google.protobuf.MethodOptions { - // See `HttpRule`. - HttpRule http = 72295728; -} diff --git a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Protos/google/api/http.proto b/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Protos/google/api/http.proto deleted file mode 100644 index b8426ba..0000000 --- a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Protos/google/api/http.proto +++ /dev/null @@ -1,377 +0,0 @@ -// Copyright 2019 Google LLC. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -syntax = "proto3"; - -package google.api; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "HttpProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -// Defines the HTTP configuration for an API service. It contains a list of -// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method -// to one or more HTTP REST API methods. -message Http { - // A list of HTTP configuration rules that apply to individual API methods. - // - // **NOTE:** All service configuration rules follow "last one wins" order. - repeated HttpRule rules = 1; - - // When set to true, URL path parameters will be fully URI-decoded except in - // cases of single segment matches in reserved expansion, where "%2F" will be - // left encoded. - // - // The default behavior is to not decode RFC 6570 reserved characters in multi - // segment matches. - bool fully_decode_reserved_expansion = 2; -} - -// # gRPC Transcoding -// -// gRPC Transcoding is a feature for mapping between a gRPC method and one or -// more HTTP REST endpoints. It allows developers to build a single API service -// that supports both gRPC APIs and REST APIs. Many systems, including [Google -// APIs](https://github.com/googleapis/googleapis), -// [Cloud Endpoints](https://cloud.google.com/endpoints), [gRPC -// Gateway](https://github.com/grpc-ecosystem/grpc-gateway), -// and [Envoy](https://github.com/envoyproxy/envoy) proxy support this feature -// and use it for large scale production services. -// -// `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies -// how different portions of the gRPC request message are mapped to the URL -// path, URL query parameters, and HTTP request body. It also controls how the -// gRPC response message is mapped to the HTTP response body. `HttpRule` is -// typically specified as an `google.api.http` annotation on the gRPC method. -// -// Each mapping specifies a URL path template and an HTTP method. The path -// template may refer to one or more fields in the gRPC request message, as long -// as each field is a non-repeated field with a primitive (non-message) type. -// The path template controls how fields of the request message are mapped to -// the URL path. -// -// Example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get: "/v1/{name=messages/*}" -// }; -// } -// } -// message GetMessageRequest { -// string name = 1; // Mapped to URL path. -// } -// message Message { -// string text = 1; // The resource content. -// } -// -// This enables an HTTP REST to gRPC mapping as below: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456` | `GetMessage(name: "messages/123456")` -// -// Any fields in the request message which are not bound by the path template -// automatically become HTTP query parameters if there is no HTTP request body. -// For example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get:"/v1/messages/{message_id}" -// }; -// } -// } -// message GetMessageRequest { -// message SubMessage { -// string subfield = 1; -// } -// string message_id = 1; // Mapped to URL path. -// int64 revision = 2; // Mapped to URL query parameter `revision`. -// SubMessage sub = 3; // Mapped to URL query parameter `sub.subfield`. -// } -// -// This enables a HTTP JSON to RPC mapping as below: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | -// `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: -// "foo"))` -// -// Note that fields which are mapped to URL query parameters must have a -// primitive type or a repeated primitive type or a non-repeated message type. -// In the case of a repeated type, the parameter can be repeated in the URL -// as `...?param=A¶m=B`. In the case of a message type, each field of the -// message is mapped to a separate parameter, such as -// `...?foo.a=A&foo.b=B&foo.c=C`. -// -// For HTTP methods that allow a request body, the `body` field -// specifies the mapping. Consider a REST update method on the -// message resource collection: -// -// service Messaging { -// rpc UpdateMessage(UpdateMessageRequest) returns (Message) { -// option (google.api.http) = { -// patch: "/v1/messages/{message_id}" -// body: "message" -// }; -// } -// } -// message UpdateMessageRequest { -// string message_id = 1; // mapped to the URL -// Message message = 2; // mapped to the body -// } -// -// The following HTTP JSON to RPC mapping is enabled, where the -// representation of the JSON in the request body is determined by -// protos JSON encoding: -// -// HTTP | gRPC -// -----|----- -// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: -// "123456" message { text: "Hi!" })` -// -// The special name `*` can be used in the body mapping to define that -// every field not bound by the path template should be mapped to the -// request body. This enables the following alternative definition of -// the update method: -// -// service Messaging { -// rpc UpdateMessage(Message) returns (Message) { -// option (google.api.http) = { -// patch: "/v1/messages/{message_id}" -// body: "*" -// }; -// } -// } -// message Message { -// string message_id = 1; -// string text = 2; -// } -// -// -// The following HTTP JSON to RPC mapping is enabled: -// -// HTTP | gRPC -// -----|----- -// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: -// "123456" text: "Hi!")` -// -// Note that when using `*` in the body mapping, it is not possible to -// have HTTP parameters, as all fields not bound by the path end in -// the body. This makes this option more rarely used in practice when -// defining REST APIs. The common usage of `*` is in custom methods -// which don't use the URL at all for transferring data. -// -// It is possible to define multiple HTTP methods for one RPC by using -// the `additional_bindings` option. Example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get: "/v1/messages/{message_id}" -// additional_bindings { -// get: "/v1/users/{user_id}/messages/{message_id}" -// } -// }; -// } -// } -// message GetMessageRequest { -// string message_id = 1; -// string user_id = 2; -// } -// -// This enables the following two alternative HTTP JSON to RPC mappings: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")` -// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: -// "123456")` -// -// ## Rules for HTTP mapping -// -// 1. Leaf request fields (recursive expansion nested messages in the request -// message) are classified into three categories: -// - Fields referred by the path template. They are passed via the URL path. -// - Fields referred by the [HttpRule.body][google.api.HttpRule.body]. They are passed via the HTTP -// request body. -// - All other fields are passed via the URL query parameters, and the -// parameter name is the field path in the request message. A repeated -// field can be represented as multiple query parameters under the same -// name. -// 2. If [HttpRule.body][google.api.HttpRule.body] is "*", there is no URL query parameter, all fields -// are passed via URL path and HTTP request body. -// 3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP request body, all -// fields are passed via URL path and URL query parameters. -// -// ### Path template syntax -// -// Template = "/" Segments [ Verb ] ; -// Segments = Segment { "/" Segment } ; -// Segment = "*" | "**" | LITERAL | Variable ; -// Variable = "{" FieldPath [ "=" Segments ] "}" ; -// FieldPath = IDENT { "." IDENT } ; -// Verb = ":" LITERAL ; -// -// The syntax `*` matches a single URL path segment. The syntax `**` matches -// zero or more URL path segments, which must be the last part of the URL path -// except the `Verb`. -// -// The syntax `Variable` matches part of the URL path as specified by its -// template. A variable template must not contain other variables. If a variable -// matches a single path segment, its template may be omitted, e.g. `{var}` -// is equivalent to `{var=*}`. -// -// The syntax `LITERAL` matches literal text in the URL path. If the `LITERAL` -// contains any reserved character, such characters should be percent-encoded -// before the matching. -// -// If a variable contains exactly one path segment, such as `"{var}"` or -// `"{var=*}"`, when such a variable is expanded into a URL path on the client -// side, all characters except `[-_.~0-9a-zA-Z]` are percent-encoded. The -// server side does the reverse decoding. Such variables show up in the -// [Discovery -// Document](https://developers.google.com/discovery/v1/reference/apis) as -// `{var}`. -// -// If a variable contains multiple path segments, such as `"{var=foo/*}"` -// or `"{var=**}"`, when such a variable is expanded into a URL path on the -// client side, all characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. -// The server side does the reverse decoding, except "%2F" and "%2f" are left -// unchanged. Such variables show up in the -// [Discovery -// Document](https://developers.google.com/discovery/v1/reference/apis) as -// `{+var}`. -// -// ## Using gRPC API Service Configuration -// -// gRPC API Service Configuration (service config) is a configuration language -// for configuring a gRPC service to become a user-facing product. The -// service config is simply the YAML representation of the `google.api.Service` -// proto message. -// -// As an alternative to annotating your proto file, you can configure gRPC -// transcoding in your service config YAML files. You do this by specifying a -// `HttpRule` that maps the gRPC method to a REST endpoint, achieving the same -// effect as the proto annotation. This can be particularly useful if you -// have a proto that is reused in multiple services. Note that any transcoding -// specified in the service config will override any matching transcoding -// configuration in the proto. -// -// Example: -// -// http: -// rules: -// # Selects a gRPC method and applies HttpRule to it. -// - selector: example.v1.Messaging.GetMessage -// get: /v1/messages/{message_id}/{sub.subfield} -// -// ## Special notes -// -// When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the -// proto to JSON conversion must follow the [proto3 -// specification](https://developers.google.com/protocol-buffers/docs/proto3#json). -// -// While the single segment variable follows the semantics of -// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String -// Expansion, the multi segment variable **does not** follow RFC 6570 Section -// 3.2.3 Reserved Expansion. The reason is that the Reserved Expansion -// does not expand special characters like `?` and `#`, which would lead -// to invalid URLs. As the result, gRPC Transcoding uses a custom encoding -// for multi segment variables. -// -// The path variables **must not** refer to any repeated or mapped field, -// because client libraries are not capable of handling such variable expansion. -// -// The path variables **must not** capture the leading "/" character. The reason -// is that the most common use case "{var}" does not capture the leading "/" -// character. For consistency, all path variables must share the same behavior. -// -// Repeated message fields must not be mapped to URL query parameters, because -// no client library can support such complicated mapping. -// -// If an API needs to use a JSON array for request or response body, it can map -// the request or response body to a repeated field. However, some gRPC -// Transcoding implementations may not support this feature. -message HttpRule { - // Selects a method to which this rule applies. - // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. - string selector = 1; - - // Determines the URL pattern is matched by this rules. This pattern can be - // used with any of the {get|put|post|delete|patch} methods. A custom method - // can be defined using the 'custom' field. - oneof pattern { - // Maps to HTTP GET. Used for listing and getting information about - // resources. - string get = 2; - - // Maps to HTTP PUT. Used for replacing a resource. - string put = 3; - - // Maps to HTTP POST. Used for creating a resource or performing an action. - string post = 4; - - // Maps to HTTP DELETE. Used for deleting a resource. - string delete = 5; - - // Maps to HTTP PATCH. Used for updating a resource. - string patch = 6; - - // The custom pattern is used for specifying an HTTP method that is not - // included in the `pattern` field, such as HEAD, or "*" to leave the - // HTTP method unspecified for this rule. The wild-card rule is useful - // for services that provide content to Web (HTML) clients. - CustomHttpPattern custom = 8; - } - - // The name of the request field whose value is mapped to the HTTP request - // body, or `*` for mapping all request fields not captured by the path - // pattern to the HTTP body, or omitted for not having any HTTP request body. - // - // NOTE: the referred field must be present at the top-level of the request - // message type. - string body = 7; - - // Optional. The name of the response field whose value is mapped to the HTTP - // response body. When omitted, the entire response message will be used - // as the HTTP response body. - // - // NOTE: The referred field must be present at the top-level of the response - // message type. - string response_body = 12; - - // Additional HTTP bindings for the selector. Nested bindings must - // not contain an `additional_bindings` field themselves (that is, - // the nesting may only be one level deep). - repeated HttpRule additional_bindings = 11; -} - -// A custom pattern is used for defining custom HTTP verb. -message CustomHttpPattern { - // The name of this custom HTTP verb. - string kind = 1; - - // The path matched by this custom verb. - string path = 2; -} - diff --git a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Protos/userrole.proto b/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Protos/userrole.proto deleted file mode 100644 index bbf6400..0000000 --- a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Protos/userrole.proto +++ /dev/null @@ -1,125 +0,0 @@ -syntax = "proto3"; - -package userrole; - -import "google/protobuf/empty.proto"; -import "google/protobuf/wrappers.proto"; -import "google/protobuf/duration.proto"; -import "google/protobuf/timestamp.proto"; -import "google/api/annotations.proto"; - -option csharp_namespace = "FrontOffice.BFF.UserRole.Protobuf.Protos.UserRole"; - -service UserRoleContract -{ - rpc CreateNewUserRole(CreateNewUserRoleRequest) returns (CreateNewUserRoleResponse){ - option (google.api.http) = { - post: "/CreateNewUserRole" - body: "*" - }; - }; - rpc UpdateUserRole(UpdateUserRoleRequest) returns (google.protobuf.Empty){ - option (google.api.http) = { - put: "/UpdateUserRole" - body: "*" - }; - }; - rpc DeleteUserRole(DeleteUserRoleRequest) returns (google.protobuf.Empty){ - option (google.api.http) = { - delete: "/DeleteUserRole" - body: "*" - }; - }; - rpc GetUserRole(GetUserRoleRequest) returns (GetUserRoleResponse){ - option (google.api.http) = { - get: "/GetUserRole" - - }; - }; - rpc GetAllUserRoleByFilter(GetAllUserRoleByFilterRequest) returns (GetAllUserRoleByFilterResponse){ - option (google.api.http) = { - get: "/GetAllUserRoleByFilter" - - }; - }; -} -message CreateNewUserRoleRequest -{ - int64 role_id = 1; - int64 user_id = 2; -} -message CreateNewUserRoleResponse -{ - int64 id = 1; -} -message UpdateUserRoleRequest -{ - int64 id = 1; - int64 role_id = 2; - int64 user_id = 3; -} -message DeleteUserRoleRequest -{ - int64 id = 1; -} -message GetUserRoleRequest -{ - int64 id = 1; -} -message GetUserRoleResponse -{ - int64 id = 1; - int64 role_id = 2; - int64 user_id = 3; -} -message GetAllUserRoleByFilterRequest -{ - PaginationState pagination_state = 1; - google.protobuf.StringValue sort_by = 2; - GetAllUserRoleByFilterFilter filter = 3; -} -message GetAllUserRoleByFilterFilter -{ - google.protobuf.Int64Value id = 1; - google.protobuf.Int64Value role_id = 2; - google.protobuf.Int64Value user_id = 3; -} -message GetAllUserRoleByFilterResponse -{ - MetaData meta_data = 1; - repeated GetAllUserRoleByFilterResponseModel models = 2; -} -message GetAllUserRoleByFilterResponseModel -{ - int64 id = 1; - int64 role_id = 2; - int64 user_id = 3; -} - -message PaginationState -{ - int32 page_number = 1; - - int32 page_size = 2; -} -message MetaData -{ - int64 current_page = 1; - - int64 total_page = 2; - - int64 page_size = 3; - - int64 total_count = 4; - - bool has_previous = 5; - - bool has_next = 6; -} -message DecimalValue -{ - - int64 units = 1; - - sfixed32 nanos = 2; -} diff --git a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/CreateNewUserRoleRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/CreateNewUserRoleRequestValidator.cs deleted file mode 100644 index 5535bf3..0000000 --- a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/CreateNewUserRoleRequestValidator.cs +++ /dev/null @@ -1,21 +0,0 @@ -using FluentValidation; -using FrontOffice.BFF.UserRole.Protobuf.Protos.UserRole; -namespace FrontOffice.BFF.UserRole.Protobuf.Validator; - -public class CreateNewUserRoleRequestValidator : AbstractValidator -{ - public CreateNewUserRoleRequestValidator() - { - RuleFor(model => model.RoleId) - .NotNull(); - RuleFor(model => model.UserId) - .NotNull(); - } - public Func>> ValidateValue => async (model, propertyName) => - { - var result = await ValidateAsync(ValidationContext.CreateWithOptions((CreateNewUserRoleRequest)model, x => x.IncludeProperties(propertyName))); - if (result.IsValid) - return Array.Empty(); - return result.Errors.Select(e => e.ErrorMessage); - }; -} diff --git a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/DeleteUserRoleRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/DeleteUserRoleRequestValidator.cs deleted file mode 100644 index b7fddb5..0000000 --- a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/DeleteUserRoleRequestValidator.cs +++ /dev/null @@ -1,19 +0,0 @@ -using FluentValidation; -using FrontOffice.BFF.UserRole.Protobuf.Protos.UserRole; -namespace FrontOffice.BFF.UserRole.Protobuf.Validator; - -public class DeleteUserRoleRequestValidator : AbstractValidator -{ - public DeleteUserRoleRequestValidator() - { - RuleFor(model => model.Id) - .NotNull(); - } - public Func>> ValidateValue => async (model, propertyName) => - { - var result = await ValidateAsync(ValidationContext.CreateWithOptions((DeleteUserRoleRequest)model, x => x.IncludeProperties(propertyName))); - if (result.IsValid) - return Array.Empty(); - return result.Errors.Select(e => e.ErrorMessage); - }; -} diff --git a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/GetAllUserRoleByFilterRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/GetAllUserRoleByFilterRequestValidator.cs deleted file mode 100644 index 0fc1ab2..0000000 --- a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/GetAllUserRoleByFilterRequestValidator.cs +++ /dev/null @@ -1,17 +0,0 @@ -using FluentValidation; -using FrontOffice.BFF.UserRole.Protobuf.Protos.UserRole; -namespace FrontOffice.BFF.UserRole.Protobuf.Validator; - -public class GetAllUserRoleByFilterRequestValidator : AbstractValidator -{ - public GetAllUserRoleByFilterRequestValidator() - { - } - public Func>> ValidateValue => async (model, propertyName) => - { - var result = await ValidateAsync(ValidationContext.CreateWithOptions((GetAllUserRoleByFilterRequest)model, x => x.IncludeProperties(propertyName))); - if (result.IsValid) - return Array.Empty(); - return result.Errors.Select(e => e.ErrorMessage); - }; -} diff --git a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/GetUserRoleRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/GetUserRoleRequestValidator.cs deleted file mode 100644 index 8fee00a..0000000 --- a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/GetUserRoleRequestValidator.cs +++ /dev/null @@ -1,19 +0,0 @@ -using FluentValidation; -using FrontOffice.BFF.UserRole.Protobuf.Protos.UserRole; -namespace FrontOffice.BFF.UserRole.Protobuf.Validator; - -public class GetUserRoleRequestValidator : AbstractValidator -{ - public GetUserRoleRequestValidator() - { - RuleFor(model => model.Id) - .NotNull(); - } - public Func>> ValidateValue => async (model, propertyName) => - { - var result = await ValidateAsync(ValidationContext.CreateWithOptions((GetUserRoleRequest)model, x => x.IncludeProperties(propertyName))); - if (result.IsValid) - return Array.Empty(); - return result.Errors.Select(e => e.ErrorMessage); - }; -} diff --git a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/UpdateUserRoleRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/UpdateUserRoleRequestValidator.cs deleted file mode 100644 index 8c62116..0000000 --- a/src/Protobufs/FrontOffice.BFF.UserRole.Protobuf/Validator/UpdateUserRoleRequestValidator.cs +++ /dev/null @@ -1,23 +0,0 @@ -using FluentValidation; -using FrontOffice.BFF.UserRole.Protobuf.Protos.UserRole; -namespace FrontOffice.BFF.UserRole.Protobuf.Validator; - -public class UpdateUserRoleRequestValidator : AbstractValidator -{ - public UpdateUserRoleRequestValidator() - { - RuleFor(model => model.Id) - .NotNull(); - RuleFor(model => model.RoleId) - .NotNull(); - RuleFor(model => model.UserId) - .NotNull(); - } - public Func>> ValidateValue => async (model, propertyName) => - { - var result = await ValidateAsync(ValidationContext.CreateWithOptions((UpdateUserRoleRequest)model, x => x.IncludeProperties(propertyName))); - if (result.IsValid) - return Array.Empty(); - return result.Errors.Select(e => e.ErrorMessage); - }; -}