feat(Import members from Dolibarr)

2025-11-15 17:09:56 +01:00
parent de5e81fe22
commit f796f2c658
7 changed files with 195 additions and 49 deletions
--- a/app/Console/Commands/SyncDolibarrMembers.php
+++ b/app/Console/Commands/SyncDolibarrMembers.php
@@ -3,26 +3,25 @@
 namespace App\Console\Commands;

 use App\Models\Member;
+use App\Models\Membership;
 use App\Services\DolibarrService;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Http\Client\ConnectionException;
-use function Deployer\timestamp;
+use function Laravel\Prompts\progress;

 class SyncDolibarrMembers extends Command
 {
    /**
     * The name and signature of the console command.
     *
-     * @var string
-     */
-    protected $signature = 'app:sync-dolibarr-members';
+     * @var string */
+    protected $signature = 'sync:dolibarr-members';

    /**
-     * The console command description.
+     * The console command description. *
     *
-     * @var string
-     */
+     * @var string */
    protected $description = 'Retrieve members data from Dolibarr';

    /**
@@ -32,55 +31,120 @@ class SyncDolibarrMembers extends Command
    public function handle(): void
    {
        $this->info('Starting Dolibarr members import...');
-        // Dolibarr API call
-        $client =  new DolibarrService;
+
+        $client = new DolibarrService;
+
+        // $doliMembers = collect($client->getAllMembers())->take(10); // For test
        $doliMembers = collect($client->getAllMembers());

-        $progressBar = $this->output->createProgressBar(count($doliMembers));
+        $progressBar = progress(label: 'Dolibarr Members import', steps: $doliMembers->count());
        $progressBar->start();
-        $i = 0;
+
+        // Stats trackers
+        $createdMembers = 0;
+        $updatedMembers = 0;
+        $createdMemberships = 0;
+        $updatedMemberships = 0;
+
+        // Status mapping from Dolibarr
+        $memberStatuses = [
+            '-2' => 'excluded',
+            '0' => 'cancelled',
+            '1' => 'valid'
+        ];

        foreach ($doliMembers as $member) {
-            dd($member);

-            $newMember = Member::updateOrCreate([
-                'dolibarr_id' => $member->id,
-            ], [
-                'status' => $member['status'], // @todo: faire concorder les statuts
-                'nature' => 'physical',
-                'member_type' => $member['type'],
-                'group_id' => null,
-                'lastname' => $member['firstname'],
-                'firstname' => $member['lastname'],
-                'email' => $member['email'],
-                'personal_email' => '',
-                'company' => '',
-                'website_url' => $member['url'],
-                'date_of_birth' => '',
-                'address' => '',
-                'zipcode' => '',
-                'city' => '',
-                'country' => '',
-                'phone1' => '',
-                'phone2' => '',
-                'public_membership' => '',
-                'created_at' => Carbon::create($member['date_creation'])->format(timestamp()),
-                'updated_at' => '',
-            ]);
+            // CREATE or UPDATE MEMBER
+            $newMember = Member::updateOrCreate(
+                ['dolibarr_id' => $member['id']],
+                [
+                    'status' => $memberStatuses[$member['status']] ?? 'draft',
+                    'nature' => 'physical',
+                    'member_type' => $member['type'],
+                    'group_id' => null,
+                    'lastname' => $member['firstname'],
+                    'firstname' => $member['lastname'],
+                    'email' => $member['email'] ?: null,
+                    'retzien_email' => '',
+                    'company' => $member['societe'],
+                    'website_url' => $member['url'],
+                    'address' => $member['address'],
+                    'zipcode' => $member['zip'],
+                    'city' => $member['town'],
+                    'country' => '',
+                    'phone1' => $member['phone'],
+                    'phone2' => $member['phone_mobile'],
+                    'public_membership' => 0,
+                    'created_at' => $this->toDate($member['date_creation']),
+                ]
+            );

-            // On crée l'adhérent en remplissant les données en bdd avec ses coordonnées, son statut etc ...
+            // Count member creation/update
+            if ($newMember->wasRecentlyCreated) {
+                $createdMembers++;
+            } else {
+                $updatedMembers++;
+            }

-            // On récupère toutes les adhésions/cotisations pour chaque adhérent
-            $memberships = $client->getMemberSubscriptions($member->id);
+            // Get subscriptions for memeber
+            $memberships = collect($client->getMemberSubscriptions($member['id']));

-            // on traite les notes (privée, publique, lien ect) contenues dans dolibarr
+            foreach ($memberships as $membership) {

-            $i++;
+                $membershipStatus = $membership['datef'] < now()->timestamp ? 'expired' : 'active';
+
+                $newMembership = Membership::updateOrCreate(
+                    ['dolibarr_id' => $membership['id']],
+                    [
+                        'member_id' => $newMember->id,
+                        'admin_id' => 1,
+                        'package_id' => 2, // annual subscription
+                        'start_date' => $this->toDate($membership['dateh']),
+                        'end_date' => $this->toDate($membership['datef']),
+                        'status' => $membershipStatus,
+                        'validation_date' => $this->toDate($membership['datem']),
+                        'payment_method' => null,
+                        'amount' => number_format($membership['amount'], 2),
+                        'payment_status' => 'paid',
+                        'note_public' => $membership['note_public'],
+                        'note_private' => $membership['note_private'],
+                        'dolibarr_user_id' => $member['id']
+                    ]
+                );
+
+                // Count membership creation/update
+                if ($newMembership->wasRecentlyCreated) {
+                    $createdMemberships++;
+                } else {
+                    $updatedMemberships++;
+                }
+            }
+
+            $progressBar->advance();
        }

        $progressBar->finish();
-        // Logs

-        $this->info('Import finished. ' .$i.' members have been imported.');
+        //  Report
+        $this->info('');
+        $this->info('===== IMPORT SUMMARY =====');
+        $this->info("Members created : $createdMembers");
+        $this->info("Members updated : $updatedMembers");
+        $this->info("Memberships created : $createdMemberships");
+        $this->info("Memberships updated : $updatedMemberships");
+        $this->info('===========================');
+        $this->info('Import completed successfully.');
+    }
+
+    /**
+     * Convert timestamp to date format safely
+     * @todo: export this in a service or repo
+     */
+    private function toDate($timestamp): ?string
+    {
+        return $timestamp
+            ? Carbon::createFromTimestamp($timestamp)->format('Y-m-d H:i:s')
+            : null;
    }
 }
--- a/app/Models/Member.php
+++ b/app/Models/Member.php
@@ -11,13 +11,16 @@ use Illuminate\Notifications\Notifiable;
 /**
 * @property int $id
 * @property int|null $user_id
+ * @property string|null $dolibarr_id
 * @property string|null $keycloak_id
 * @property string $status
 * @property string $nature
+ * @property int|null $type_id
 * @property int|null $group_id
 * @property string|null $lastname
 * @property string|null $firstname
 * @property string $email
+ * @property string|null $retzien_email
 * @property string|null $company
 * @property string|null $date_of_birth
 * @property string|null $address
@@ -27,6 +30,7 @@ use Illuminate\Notifications\Notifiable;
 * @property string|null $phone1
 * @property string|null $phone2
 * @property int $public_membership
+ * @property string|null $website_url
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property string|null $deleted_at
@@ -34,6 +38,8 @@ use Illuminate\Notifications\Notifiable;
 * @property-read \App\Models\MemberGroup|null $group
 * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Membership> $memberships
 * @property-read int|null $memberships_count
+ * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
+ * @property-read int|null $notifications_count
 * @property-read \App\Models\User|null $user
 * @method static \Database\Factories\MemberFactory factory($count = null, $state = [])
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member newModelQuery()
@@ -46,6 +52,7 @@ use Illuminate\Notifications\Notifiable;
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereDateOfBirth($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereDolibarrId($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereEmail($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereFirstname($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereGroupId($value)
@@ -56,9 +63,12 @@ use Illuminate\Notifications\Notifiable;
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member wherePhone1($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member wherePhone2($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member wherePublicMembership($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereRetzienEmail($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereTypeId($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereUpdatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereWebsiteUrl($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Member whereZipcode($value)
 * @mixin \Eloquent
 */
@@ -67,9 +77,11 @@ class Member extends Model
    use HasFactory, Notifiable;
    protected $fillable = [
        'user_id',
+        'dolibarr_id',
        'keycloak_id',
        'status',
        'nature',
+        'type_id',
        'group_id',
        'lastname',
        'firstname',
@@ -83,9 +95,7 @@ class Member extends Model
        'phone1',
        'phone2',
        'public_membership',
-        'package_id',
-        'amount',
-        'payment_status'
+        'website_url'
    ];

    public static function getAttributeLabel(string $attribute): string
--- a/app/Models/Membership.php
+++ b/app/Models/Membership.php
@@ -13,11 +13,17 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 * @property int $member_id
 * @property int|null $admin_id
 * @property int $package_id
- * @property string $start_date
+ * @property string|null $start_date
 * @property string|null $end_date
 * @property string $status
+ * @property string|null $validation_date
+ * @property string|null $payment_method
 * @property string $amount
 * @property string $payment_status
+ * @property string|null $note_public
+ * @property string|null $note_private
+ * @property string|null $dolibarr_id
+ * @property string|null $dolibarr_user_id
 * @property \Illuminate\Support\Carbon|null $created_at
 * @property \Illuminate\Support\Carbon|null $updated_at
 * @property string|null $deleted_at
@@ -33,14 +39,20 @@ use Illuminate\Database\Eloquent\Relations\HasOne;
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereAmount($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereCreatedAt($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereDolibarrId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereDolibarrUserId($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereEndDate($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereId($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereMemberId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereNotePrivate($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereNotePublic($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership wherePackageId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership wherePaymentMethod($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership wherePaymentStatus($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereStartDate($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereStatus($value)
 * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereValidationDate($value)
 * @mixin \Eloquent
 */
 class Membership extends Model
@@ -52,8 +64,14 @@ class Membership extends Model
        'start_date',
        'end_date',
        'status',
+        'validation_date',
+        'payment_method',
        'amount',
        'payment_status',
+        'note_public',
+        'note_private',
+        'dolibarr_id',
+        'dolibarr_user_id'
    ];