Provider - check debit notes acceptance #897
Merged
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
…check-debit-notes-acceptance
…which uses dynamic negotiation logic
nieznanysprawiciel
force-pushed
the
provider/check-debit-notes-acceptance
branch
from
0a2757b to
b698012
Compare
…o breaking Agreement
…check-debit-notes-acceptance
nieznanysprawiciel
force-pushed
the
provider/check-debit-notes-acceptance
branch
from
2b361aa to
56b32a5
Compare
Comment on lines
+69
to
+79
| let result = self.components.negotiate_step(&proposal, offer_proposal)?; | ||
| match result { | ||
| NegotiationResult::Reject { reason } => Ok(ProposalResponse::RejectProposal { reason }), | ||
| NegotiationResult::Ready { offer } | NegotiationResult::Negotiating { offer } => { | ||
| let offer = NewOffer { | ||
| properties: serde_json::Value::Object(flatten(offer.json)), | ||
| constraints, | ||
| }; | ||
| Ok(ProposalResponse::CounterProposal { offer }) | ||
| } | ||
| } |
There was a problem hiding this comment.
Error should result in Rejecting Proposal. (Can be done in different PR)
tworec
force-pushed
the
provider/check-debit-notes-acceptance
branch
from
e026270 to
8d98376
Compare
| }, | ||
| ); | ||
|
|
||
| self.update_deadline(ctx).unwrap(); |
There was a problem hiding this comment.
Unwrap inside
| self.deadlines.insert(msg.agreement_id.to_string(), vec![]); | ||
| } | ||
|
|
||
| let deadlines = self.deadlines.get_mut(&msg.agreement_id).unwrap(); |
There was a problem hiding this comment.
Maybe entry
tworec
reviewed
Jan 26, 2021
| min_agreement_expiration: std::time::Duration::from_secs(5 * 60), | ||
| max_agreement_expiration: std::time::Duration::from_secs(30 * 60), | ||
| max_agreement_expiration_without_deadline: std::time::Duration::from_secs(10 * 60), | ||
| debit_note_acceptance_deadline: std::time::Duration::from_secs(120), |
There was a problem hiding this comment.
Suggested change
| debit_note_acceptance_deadline: std::time::Duration::from_secs(120), | |
| debit_note_acceptance_timeout: std::time::Duration::from_secs(120), |
tworec
approved these changes
Jan 26, 2021
| fn debit_deadline_from(proposal: &ProposalView) -> Result<Option<Duration>> { | ||
| match proposal.pointer_typed::<i64>("/golem/com/payment/debit-notes/acceptance-timeout") { | ||
| // Requestor is able to accept DebitNotes, because he set this property. | ||
| Ok(deadline) => Ok(Some(Duration::seconds(deadline))), |
There was a problem hiding this comment.
Suggested change
| Ok(deadline) => Ok(Some(Duration::seconds(deadline))), | |
| Ok(timeout) => Ok(Some(Duration::seconds(timeout))), |
| Ok(Utc.timestamp_millis(timestamp)) | ||
| } | ||
|
|
||
| fn debit_deadline_from(proposal: &ProposalView) -> Result<Option<Duration>> { |
There was a problem hiding this comment.
Suggested change
| fn debit_deadline_from(proposal: &ProposalView) -> Result<Option<Duration>> { | |
| fn debit_timeout_from(proposal: &ProposalView) -> Result<Option<Duration>> { |
| // Requestor doesn't support DebitNotes acceptance, so we should | ||
| // remove our property from Proposal to match with his. | ||
| (None, Some(_)) => { | ||
| offer.remove_property("/golem/com/payment/debit-notes/acceptance-timeout")?; |
| pub payment_model: Arc<dyn PaymentModel>, | ||
| pub activities: HashMap<String, ActivityPayment>, | ||
|
|
||
| pub update_interval: std::time::Duration, | ||
| pub payment_deadline: Option<chrono::Duration>, |
There was a problem hiding this comment.
Suggested change
| pub payment_deadline: Option<chrono::Duration>, | |
| pub payment_timeout: Option<chrono::Duration>, |
| @@ -95,7 +100,16 @@ impl AgreementPayment { | |||
| pub fn new(agreement: &AgreementView) -> Result<AgreementPayment> { | |||
| let payment_description = PaymentDescription::new(agreement)?; | |||
| let update_interval = payment_description.get_update_interval()?; | |||
| let payment_model = PaymentModelFactory::create(payment_description)?; | |||
| let debit_deadline = payment_description.get_debit_note_deadline()?; | |||
There was a problem hiding this comment.
Suggested change
| let debit_deadline = payment_description.get_debit_note_deadline()?; | |
| let debit_timeout = payment_description.get_debit_note_deadline()?; |
| #[rtype(result = "()")] | ||
| pub struct DeadlineElapsed { | ||
| pub agreement_id: String, | ||
| pub deadline: DateTime<Utc>, |
There was a problem hiding this comment.
here the deadline is proper name, as it's describing specific point of the time
| @@ -216,18 +244,38 @@ async fn send_debit_note( | |||
| &debit_note_info.activity_id | |||
| ); | |||
|
|
|||
| if let Some(deadline) = debit_note_info | |||
| .payment_deadline | |||
| .map(|deadline| Utc::now() + deadline) | |||
There was a problem hiding this comment.
Suggested change
| .map(|deadline| Utc::now() + deadline) | |
| .map(|timeout| Utc::now() + timeout) |
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.
resolves: #886
ResponseFuture.It would be good to update rest of actix dependencies.