Changeset 2611

Timestamp:

05/13/24 21:16:03 (2 weeks ago)

Author:

nanardon

Message:

Allow to use another attribute as key for sync

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases.pm (modified) (1 diff)
• Bases/Sql.pm (modified) (1 diff)
• Bases/Sql/User.pm (modified) (1 diff)
• Bases/Sql/objects.pm (modified) (1 diff)
• Bases/Sql/upgrade.pm (modified) (1 diff)
• Synchro.pm (modified) (3 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases.pm

@@ -1099 +1099 @@
         $data{$attrname} = $srcobj->GetAttributeValue($srcattrname);
     }
-    if (my $dstobj = $self->get_object($srcobj->type, $srcobj->id)) {
+
+    my $KeyAttribute = $self->config( 'keyAttribute.' . $srcobj->base->label . '.' . $srcobj->type  );
+
+    my $destid = $options{ KeyAttribute }
+        ? $srcobj->get_attibutes( $options{ KeyAttribute } )
+        : $srcobj->id;
+    if (my $dstobj = $self->get_object($srcobj->type, $destid)) {
         keys %data or return 'SYNCED';
         foreach (keys %data) {

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm

@@ -461 +461 @@
 }
 
+sub key_field {
+    my ( $self, $otype ) = @_;
+
+    my $pclass = $self->_load_obj_class($otype) or return;
+    return $pclass->_key_field;
+}
+
 sub current_rev {
     my ($self) = @_;

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -162 +162 @@
             },
             uidnumber => { inline => 1, hide => 1, monitored => 1 },
+            partageid => { inline => 1, monitored => 1 },
             gidNumber => {
                 inline => 1,

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -52 +52 @@
 }
 
+# $keyAttribute must be a internal attribute
+
 sub list_from_rev {
-    my ($class, $base, $rev) = @_;
+    my ($class, $base, $rev, $keyAttribute) = @_;
+    defined( $rev ) or die '$rev must be defined when calling list_from_rev()';
+    $keyAttribute ||= $base->db->quote_identifier($class->_key_field);
     my $sth = $base->db->prepare_cached(
         sprintf(
-            q{select %s as k from %s where rev > ? and internobject = false
-                and oalias IS NULL  %s order by %s},
-            $base->db->quote_identifier($class->_key_field),
+            q{select %s as k from %s where rev > ? AND internobject = false
+                AND oalias IS NULL AND %s IS NOT NULL %s order by %s},
+            $keyAttribute,
             $base->db->quote_identifier($class->_object_table),
+            $keyAttribute,
             ($base->{wexported} ? '' : 'and exported = true'),
             $base->db->quote_identifier($class->_key_field),

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/upgrade.pm

@@ -1521 +1521 @@
             recompute => 1,
         },
+        {
+            ver => 41,
+            sql => [
+                q{
+                ALTER TABLE "user" ADD COLUMN partageid TEXT
+                CREATE INDEX user_partageid_uniqidx
+                ON partageid
+                USING btree
+                (value);
+                }
+            ],
+        },
     );
 

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Synchro.pm

@@ -283 +283 @@
             $destbase->is_supported_object($otype) or next;
 
+            my $SyncKeyAttribute = $self->from->key_field( $otype );
+            if ( my $attr = $destbase->config( 'keyAttribute.' . $self->from->label . '.' . $otype ) ) {
+                $SyncKeyAttribute = $attr;
+            }
+
             my %existings;
             my %filtering;
 
             $existings{$otype} = { map { $_ => 1 }
-                $self->from->listRealObjects($otype) };
+                $self->from->list_objects_from_rev( $otype, 0, $SyncKeyAttribute ) };
 
             # Is there a filter to apply:
@@ -293 +298 @@
             if (my $filter = $self->{options}->{$filtername}) {
                 la_log(LA_DEBUG, "Found %s param, using it: %s", $filtername, $filter);
-                $filtering{$otype} = { map { $_ => 1 }
-                    $self->from->search_objects($otype, $filter, 'oalias=NULL') };
+                    foreach ( my $id = $self->from->search_objects($otype, $filter, 'oalias=NULL') ) {
+                        my $obj = $self->from->get_object( $otype, $id );
+                        my $id = $obj->get_attributes( $SyncKeyAttribute );
+                        $filtering{$otype}{ $id } = 1;
+                    }
             } else {
                 $filtering{$otype} = $existings{$otype};
@@ -385 +393 @@
                     }
 
-                    my $res = $destbase->sync_object_from($self->from, $otype, $_,
-                        %options, firstpass => $pass);
+                    my $res = $destbase->sync_object_from(
+                        $self->from, $otype, $_,
+                        %options, firstpass => $pass );
                     if (defined $res) {
                         if ($res) {