Greylist/Request simplify logic
ClosedPublic
Actions

Authored by mollekopf on Aug 27 2021, 11:50 AM.

Details

Reviewers

machniak

Group Reviewers

Restricted Project

Commits

rKa4534ed6c24f: Greylist/Request: simplify logic

Summary

There can only every be one entry for the sender/recipient/net pair (due to the unique constraint)
We already verify in the beginning that we have an entry within the last 7 days (and otherwise purge all entries), so it can't be older than a month.

Diff Detail

Repository

rK kolab

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

mollekopf requested review of this revision.Aug 27 2021, 11:50 AM

mollekopf created this revision.

Harbormaster completed remote builds in B36499: Diff 8182.Aug 27 2021, 11:50 AM

mollekopf added a reviewer: Restricted Project.Aug 27 2021, 11:51 AM

machniak accepted this revision as: machniak.Aug 27 2021, 11:56 AM

This revision is now accepted and ready to land.Aug 27 2021, 11:56 AM

Reuse the existing function to query for the connection

Harbormaster completed remote builds in B36505: Diff 8188.Aug 27 2021, 11:56 AM

Closed by commit rKa4534ed6c24f: Greylist/Request: simplify logic. · Explain WhyAug 27 2021, 12:00 PM

This revision was automatically updated to reflect the committed changes.

machniak added inline comments.Aug 27 2021, 12:02 PM

src/app/Policy/Greylist/Request.php
188	We could skip the query if we know there's no entries, i.e. see line 87.

Revision Contents
Changeset List

Path

Size

src/

app/

Policy/

Greylist/

Request.php

24 lines

Diff 8191

View Options

src/app/Policy/Greylist/Request.php

Show First 20 Lines • Show All 737 Lines • ▼ Show 20 Lines	protected function balanceUpdate(string $type, int\|Payment $amount, $description = null, array $eTIDs = [])
]);		]);

if (!empty($eTIDs)) {		if (!empty($eTIDs)) {
Transaction::whereIn('id', $eTIDs)->update(['transaction_id' => $transaction->id]);		Transaction::whereIn('id', $eTIDs)->update(['transaction_id' => $transaction->id]);
}		}

return $this;		return $this;
}		}


		/**
		* Ensure that this wallet has a positive balance and a minimum number of payments,
		* or a 100% discount (in which case there are no payments).
		*
		* @return bool
		*/
		public function hasMinimumBalanceAndPayments($minimumPayments = 2): bool
		machniakUnsubmitted Not Done Inline Actions The argument is not documented. And maybe it should be `$minPaymentsCount`. machniak: The argument is not documented. And maybe it should be `$minPaymentsCount`.
		{
		if ($this->discount && $this->discount->discount == 100) {
		return true;
		}

		if ($this->balance > 0) {
		$payments = $this->payments()->where('amount', '>', 0)->where('status', 'paid');

		if ($payments->count() >= $minimumPayments) {
		return true;
		}
		}

		return false;
		}
}		}

Greylist/Request simplify logicClosedPublicActions