Nedestruktivni mazani skupin pri syncronizaci, individualni opravneni uzivatele

VERSION

-0.8.0
+0.9.0

lib/SeMeet/Controller/Auth.pm

@@ -31,8 +31,15 @@ sub callback ($c) {
     my @groups      = ();
     my $permissions = {};
 
+    foreach my $permission ( @{ $user->permissions || [] } ) {
+        $permissions->{$permission} = 1;
+    }
+
     my $groups = $c->schema->resultset('Group')->search(
-        { octid => { '-in' => $octopus_user->{groups} }},
+        {
+            deleted => undef,
+            octid   => { '-in' => $octopus_user->{groups} },
+        },
         { columns => ['id', 'permissions'] }
     );
 

lib/SeMeet/Controller/Groups.pm

@@ -6,7 +6,8 @@ sub list($c) {
     my $args = $c->validation->output;
 
     my $groups = $c->schema->resultset('Group')->search({
-        name => { ilike => '%' . $args->{search} . '%' }
+        name    => { ilike => '%' . $args->{search} . '%' },
+        deleted => undef,
     },
     {
         order_by => 'name',

lib/SeMeet/Schema/Result/Group.pm

@@ -17,6 +17,7 @@ __PACKAGE__->add_columns(
         sequence          => 'uid_seq'
     },
     qw(
+        deleted
         octid
         name
         permissions

lib/SeMeet/Schema/Result/User.pm

@@ -25,6 +25,7 @@ __PACKAGE__->add_columns(
         uuid
         username
         displayname
+        permissions
     ),
 );
 
@@ -43,6 +44,12 @@ __PACKAGE__->has_many(
     { 'foreign.owner_id' => 'self.id', },
 );
 
+__PACKAGE__->inflate_column('permissions', {
+    inflate => sub {
+        return [ split /\W+/, shift ];
+    },
+});
+
 sub api_token {
     my $self = shift;
     my $args = shift;

script/sync_octopus_groups

@@ -47,7 +47,9 @@ foreach my $group ( @{ $octopus_groups } ) {
 }
 
 # Cleanup
-$schema->resultset('Group')->search({octid => {-not_in => \@exists}})->delete;
+$schema->resultset('Group')->search({octid => {-not_in => \@exists}})->update({
+    deleted => \'now()'
+});
 
 # Update cache
 my $meets = $schema->resultset('Meet')->search({deleted => undef});

sql/migrations.sql

@@ -84,3 +84,9 @@ join "users" on ("users"."id" = "meets_users"."user_id")
 -- 6 up
 drop table "moderators";
 alter table "users" drop column "octid";
+
+-- 7 up
+alter table "users" add column "permissions" text;
+
+-- 8 up
+alter table "groups" add column "deleted" timestamp(0);