Switch off node for a specific currency #446
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chibie
requested changes
Mar 25, 2025
types/types.go
Outdated
| MobileNumber string `json:"mobileNumber"` | ||
| DateOfBirth time.Time `json:"dateOfBirth"` | ||
| BusinessName string `json:"businessName"` | ||
| CurrenciesAvailability map[string]bool `json:"currencies_availability,omitempty"` |
There was a problem hiding this comment.
a new field isn't necessary.
the currency being updated could be fetched from payload.Tokens[0].Currency, given only one currency can be updated per time
utils/utils.go
Outdated
Comment on lines
582
to
609
| // UpdateRedisQueue updates the Redis queue for a provider's availability for a specific currency. | ||
| func UpdateRedisQueue(ctx context.Context, redisClient *redis.Client, provider *ent.ProviderProfile, currency string, isAvailable bool) error { | ||
| // Fetch relevant buckets for the provider | ||
| buckets, err := storage.Client.ProvisionBucket. | ||
| Query(). | ||
| Where(provisionbucket.HasProviderProfilesWith(providerprofile.IDEQ(provider.ID))). | ||
| All(ctx) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to query buckets: %v", err) | ||
| } | ||
|
|
||
| for _, bucket := range buckets { | ||
| redisKey := fmt.Sprintf("bucket_%s_%s_%s", currency, bucket.MinAmount, bucket.MaxAmount) | ||
| if !isAvailable { | ||
| err := redisClient.SRem(ctx, redisKey, provider.ID).Err() | ||
| if err != nil { | ||
| return fmt.Errorf("failed to remove provider %s from Redis queue %s: %w", provider.ID, redisKey, err) | ||
| } | ||
| } else { | ||
| err := redisClient.SAdd(ctx, redisKey, provider.ID).Err() | ||
| if err != nil { | ||
| // Fixed a typo in the original error message ("Redisqueen" -> "Redis queue") | ||
| return fmt.Errorf("failed to add provider %s to Redis queue %s: %w", provider.ID, redisKey, err) | ||
| } | ||
| } | ||
| } | ||
| return nil | ||
| } |
There was a problem hiding this comment.
was this tested?
seems only the "DELETED_PROVIDER" approach works... this same util here should be used --> https://github.com/paycrest/aggregator/pull/443/files#diff-0df82f8689d3e8d881be0653ab4e9f8221c5835ec95a14930d11669e9c7f07ef
controllers/accounts/profile.go
Outdated
Comment on lines
312
to
362
| // Handle currency-specific availability | ||
| if len(payload.CurrenciesAvailability) > 0 { | ||
| for currencyCode, isAvailable := range payload.CurrenciesAvailability { | ||
| currency, err := storage.Client.FiatCurrency.Query(). | ||
| Where(fiatcurrency.CodeEQ(currencyCode)). | ||
| Only(ctx) | ||
| if err != nil { | ||
| u.APIResponse(ctx, http.StatusBadRequest, "error", | ||
| fmt.Sprintf("Currency not found: %s", currencyCode), nil) | ||
| return | ||
| } | ||
|
|
||
| existingAvailability, err := storage.Client.ProviderCurrencyAvailability. | ||
| Query(). | ||
| Where( | ||
| providercurrencyavailability.HasProviderWith(providerprofile.IDEQ(provider.ID)), | ||
| providercurrencyavailability.HasCurrencyWith(fiatcurrency.IDEQ(currency.ID)), | ||
| ). | ||
| Only(ctx) | ||
|
|
||
| if ent.IsNotFound(err) { | ||
| // Create new availability entry | ||
| _, err := storage.Client.ProviderCurrencyAvailability. | ||
| Create(). | ||
| SetProvider(provider). | ||
| SetCurrency(currency). | ||
| SetIsAvailable(isAvailable). | ||
| Save(ctx) | ||
| if err != nil { | ||
| logger.Errorf("Failed to create availability record: %v", err) | ||
| continue | ||
| } | ||
| } else { | ||
| // Update existing record | ||
| _, err = existingAvailability.Update(). | ||
| SetIsAvailable(isAvailable). | ||
| Save(ctx) | ||
| if err != nil { | ||
| logger.Errorf("Failed to update availability for provider %s, currency %s: %v", provider.ID, currencyCode, err) | ||
| continue | ||
| } | ||
| } | ||
|
|
||
| // Update Redis queue | ||
| err = utils.UpdateRedisQueue(ctx, storage.RedisClient, provider, currency.Code, isAvailable) | ||
| if err != nil { | ||
| logger.Errorf("Failed to update Redis queue for provider %s, currency %s: %v", provider.ID, currencyCode, err) | ||
| } | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
fix this given removal of CurrenciesAvailability in another comment
ent/schema/providerprofile.go
Outdated
| @@ -75,6 +75,7 @@ func (ProviderProfile) Edges() []ent.Edge { | |||
| Unique(), | |||
| edge.To("assigned_orders", LockPaymentOrder.Type). | |||
| Annotations(entsql.OnDelete(entsql.Cascade)), | |||
| edge.To("currency_availability", ProviderCurrencyAvailability.Type), | |||
ent/schema/fiatcurrency.go
Outdated
| @@ -46,5 +46,6 @@ func (FiatCurrency) Edges() []ent.Edge { | |||
| edge.To("institutions", Institution.Type), | |||
| edge.To("provider_order_tokens", ProviderOrderToken.Type). | |||
| Annotations(entsql.OnDelete(entsql.Cascade)), | |||
| edge.To("provider_availability", ProviderCurrencyAvailability.Type), | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR implements a feature allowing Paycrest/Aggregator users to switch off a provider’s node for a specific currency while keeping the provider available for other currencies.
Key Changes
Schema Addition: Added a new ProviderCurrencyAvailability join table to track per-currency availability for providers, with fields
provider_id, currency_id, and is_available.
Profile Update Logic: Modified UpdateProviderProfile in the accounts package to:
Redis Queue Management: Added UpdateRedisQueue in the utils package to add/remove providers from Redis queues (key format:
bucket_) based on is_available.
References
Closes #436
Testing
Checklist
mainBy submitting a PR, I agree to Paycrest's Contributor Code of Conduct and Contribution Guide.