Page MenuHomePhorge
Differential D4585

kolabfiles backend
ClosedPublic
Actions

Authored by mollekopf on Nov 24 2023, 1:11 PM.

Details

Reviewers
machniak
Commits
rCa7637f6424b5: kolabfiles backend

Diff Detail

Repository
rC chwala
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 45832
Build 17731: arc lint + arc unit

Event Timeline

mollekopf requested review of this revision.Nov 24 2023, 1:11 PM
mollekopf created this revision.
Harbormaster completed remote builds in B45832: Diff 13156.Nov 24 2023, 1:12 PM
mollekopf added a reviewer: machniak.Nov 27 2023, 1:38 PM
machniak requested changes to this revision.Nov 27 2023, 3:39 PM
machniak added inline comments.
lib/drivers/kolabfiles/kolabfiles_file_storage.php
46

@var kolabfiles_api

51

Kolabfiles. Also in other places.

247

Maybe set to false what is not implemented.

283

Just return an empty array here.

649

I think we have to implement that in Kolab4 controller class. Look for objectToClient.

755

You don't need two PUT requests. Also, 'library' is from SeaFile. In Kolab4 we have collections, and we should treat them as folders for now, I suppose. I.e. libraries should go away.

This revision now requires changes to proceed.Nov 27 2023, 3:39 PM
mollekopf updated this revision to Diff 13210.Dec 9 2023, 11:11 PM

Cleanup, implemented file/folder moves/renames

Harbormaster completed remote builds in B45943: Diff 13210.Dec 9 2023, 11:11 PM
mollekopf marked 6 inline comments as done.Dec 10 2023, 7:56 AM

While this implementation is not certainly not finished, I'd like to get it merged and take it from there.
If you have a few minor adjustments that you'd like before I merge I'm happy to though.

mollekopf updated this revision to Diff 13213.Dec 10 2023, 8:51 AM

Get timestamps to work

Harbormaster completed remote builds in B45946: Diff 13213.Dec 10 2023, 8:51 AM
machniak accepted this revision.Dec 10 2023, 6:39 PM
This revision is now accepted and ready to land.Dec 10 2023, 6:39 PM
Closed by commit rCa7637f6424b5: kolabfiles backend. · Explain WhyDec 11 2023, 9:44 AM
This revision was automatically updated to reflect the committed changes.
mollekopf added a commit: rCa7637f6424b5: kolabfiles backend.

Revision Contents
Changeset List

PathSize
lib/
drivers/
kolabfiles/
1312 lines

Diff 13156

View Options

lib/drivers/kolabfiles/kolabfiles_file_storage.php

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Linesclass EntitlementObserver
* *
* @param \App\Entitlement $entitlement The entitlement. * @param \App\Entitlement $entitlement The entitlement.
* *
* @return void * @return void
*/ */
public function deleted(Entitlement $entitlement) public function deleted(Entitlement $entitlement)
{ {
if (!$entitlement->entitleable->trashed()) { if (!$entitlement->entitleable->trashed()) {
// TODO: This is useless, remove this, but also maybe refactor the whole method,
// i.e. move job invoking to App\Handlers (don't depend on SKU title).
mollekopfUnsubmitted
Not Done
Inline Actions

So you think this is here to trigger an update job via the listener? Could be, it was added here: 66f0930de7bb3db29a5ead4148c96b3f38f8d370 (for ldap backend support)

This deserves at least a comment though, it's a very in-transparent way to trigger an update job.

mollekopf: So you think this is here to trigger an update job via the listener? Could be, it was added…
vanmeeuwenUnsubmitted
Not Done
Inline Actions

I think this is a circumvention for the bubbling of an \App\User::delete() on to its individual \App\User::entitlements() getting deleted in its observer.

vanmeeuwen: I think this is a circumvention for the bubbling of an `\App\User::delete()` on to its…
// Also make sure the transaction is always being created
$entitlement->entitleable->updated_at = Carbon::now(); $entitlement->entitleable->updated_at = Carbon::now();
$entitlement->entitleable->save(); $entitlement->entitleable->save();
$entitlement->createTransaction(\App\Transaction::ENTITLEMENT_DELETED); $entitlement->createTransaction(\App\Transaction::ENTITLEMENT_DELETED);
} }
// Remove all configured 2FA methods from Roundcube database // Remove all configured 2FA methods from Roundcube database
if ($entitlement->sku->title == '2fa') { if ($entitlement->sku->title == '2fa') {
Show All 12 Linesclass EntitlementObserver
* Handle the entitlement "deleting" event. * Handle the entitlement "deleting" event.
* *
* @param \App\Entitlement $entitlement The entitlement. * @param \App\Entitlement $entitlement The entitlement.
* *
* @return void * @return void
*/ */
public function deleting(Entitlement $entitlement) public function deleting(Entitlement $entitlement)
{ {
$entitlement->wallet->chargeEntitlement($entitlement); // Disable updating of updated_at column on delete, we need it unchanged to later
// charge the wallet for the uncharged period before the entitlement has been deleted
$entitlement->timestamps = false;
} }
} }