Skip to content

Commit d87b6e4

Browse files
authored
Merge pull request #3192 from SeedCompany/refactor/owner
2 parents 14069d3 + a774c89 commit d87b6e4

37 files changed

+1043
-112
lines changed

dbschema/comments.esdl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module Comments {
33
commentThreads := .<container[is Thread];
44
}
55

6-
type Thread extending default::Resource, Mixin::Embedded, Mixin::Owned {
6+
type Thread extending default::Resource, Mixin::Embedded {
77
overloaded required single link container: Aware {
88
on target delete delete source;
99
};
@@ -12,7 +12,7 @@ module Comments {
1212
latestComment := (select .comments order by .createdAt desc limit 1);
1313
}
1414

15-
type Comment extending default::Resource, Mixin::Owned {
15+
type Comment extending default::Resource {
1616
required thread: Thread {
1717
on target delete delete source;
1818
};

dbschema/common.esdl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
module default {
2-
global currentUserId: uuid;
3-
alias currentUser := <User>(global currentUserId);
4-
2+
global currentActorId: uuid;
3+
global currentActor := (select Actor filter .id = global currentActorId);
4+
global currentUser := (select User filter .id = global currentActorId);
5+
global currentRoles := (global currentActor).roles;
6+
57
scalar type ReportPeriod extending enum<Monthly, Quarterly>;
68

79
# Helper function to workaround native support for sort ignoring accents

dbschema/engagement.esdl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ module default {
7676
insert Engagement::DedicationCeremony {
7777
createdAt := datetime_of_statement(),
7878
modifiedAt := datetime_of_statement(),
79+
createdBy := assert_exists(global currentActor),
80+
modifiedBy := assert_exists(global currentActor),
7981
engagement := __new__,
8082
project := __new__.project,
8183
projectContext := __new__.projectContext,
@@ -128,6 +130,8 @@ module default {
128130
insert Engagement::CertificationCeremony {
129131
createdAt := datetime_of_statement(),
130132
modifiedAt := datetime_of_statement(),
133+
createdBy := assert_exists(global currentActor),
134+
modifiedBy := assert_exists(global currentActor),
131135
engagement := __new__,
132136
project := __new__.project,
133137
projectContext := __new__.projectContext,

dbschema/file.esdl

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,9 @@ module File {
2525
# optional to have tri-state. idk if needed but that's what I implemented in neo4j
2626
public: bool;
2727

28-
required createdBy: default::User {
29-
default := default::currentUser;
30-
};
31-
required modifiedBy: default::User {
32-
default := default::currentUser;
33-
rewrite update using (default::currentUser);
34-
# TODO trigger change up the tree
35-
# TODO trigger re-eval on node delete?
36-
};
28+
# TODO trigger change up the tree
29+
# TODO trigger re-eval on node delete?
30+
# modifiedBy: default::User
3731

3832
# TODO trigger directories evaluate
3933
required size: int64;

0 commit comments

Comments
 (0)