Stability fixes, Laravel compatibility updates, EPO OPS improvements & initial implementation of USPTO ODP

app/Http/Controllers/ActorPivotController.php

@@ -34,6 +34,15 @@ public function store(Request $request)
             'date' => 'date',
         ]);
 
+        $existingLink = ActorPivot::where('matter_id', $request->matter_id)
+            ->where('role', $request->role)
+            ->where('actor_id', $request->actor_id)
+            ->first();
+
+        if ($existingLink) {
+            return $existingLink;
+        }
+
         // Fix display order indexes if wrong
         $roleGroup = ActorPivot::where('matter_id', $request->matter_id)->where('role', $request->role);
         $max = $roleGroup->max('display_order');

app/Http/Controllers/Auth/LoginController.php

@@ -3,29 +3,18 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\ValidationException;
 
 /**
  * Handles user authentication and login.
  *
- * Uses Laravel's AuthenticatesUsers trait to provide standard login functionality.
- * Configured to use the 'login' field instead of 'email' for authentication.
+ * This implementation intentionally avoids framework-internal auth traits so it
+ * remains stable across Laravel versions.
  */
 class LoginController extends Controller
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Login Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles authenticating users for the application and
-    | redirecting them to your home screen. The controller uses a trait
-    | to conveniently provide its functionality to your applications.
-    |
-    */
-
-    use AuthenticatesUsers;
-
     /**
      * Where to redirect users after login.
      *
@@ -45,14 +34,117 @@ public function __construct()
     }
 
     /**
-     * Get the login username field.
+     * Display the login form.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function showLoginForm()
+    {
+        return view('auth.login');
+    }
+
+    /**
+     * Handle an authentication attempt.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\RedirectResponse
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function login(Request $request)
+    {
+        $this->validateLogin($request);
+
+        if (! Auth::attempt($this->credentials($request), $request->has('remember'))) {
+            return $this->sendFailedLoginResponse($request);
+        }
+
+        $request->session()->regenerate();
+
+        if (method_exists($this, 'authenticated')) {
+            $response = $this->authenticated($request, Auth::user());
+
+            if ($response) {
+                return $response;
+            }
+        }
+
+        return redirect()->intended($this->redirectPath());
+    }
+
+    /**
+     * Log the user out of the application.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function logout(Request $request)
+    {
+        Auth::logout();
+
+        $request->session()->invalidate();
+        $request->session()->regenerateToken();
+
+        return redirect('/');
+    }
+
+    /**
+     * Validate the user login request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return void
+     */
+    protected function validateLogin(Request $request)
+    {
+        $request->validate([
+            $this->username() => ['required', 'string'],
+            'password' => ['required', 'string'],
+        ]);
+    }
+
+    /**
+     * Get the needed authorization credentials from the request.
      *
-     * Uses the 'login' column instead of Laravel's default 'email' field.
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    protected function credentials(Request $request)
+    {
+        return $request->only($this->username(), 'password');
+    }
+
+    /**
+     * Get the login username field.
      *
      * @return string
      */
     public function username()
     {
         return 'login';
     }
+
+    /**
+     * Get the post-login redirect path.
+     *
+     * @return string
+     */
+    protected function redirectPath()
+    {
+        return property_exists($this, 'redirectTo') ? $this->redirectTo : '/home';
+    }
+
+    /**
+     * Get the failed login response instance.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return never
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    protected function sendFailedLoginResponse(Request $request)
+    {
+        throw ValidationException::withMessages([
+            $this->username() => [trans('auth.failed')],
+        ]);
+    }
 }

app/Http/Controllers/MatterController.php

@@ -8,8 +8,8 @@
 use App\Models\ActorPivot;
 use App\Models\Matter;
 use App\Services\DocumentMergeService;
+use App\Services\FamilyDataService;
 use App\Services\MatterExportService;
-use App\Services\OPSService;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -26,24 +26,24 @@ class MatterController extends Controller
 {
     protected DocumentMergeService $documentMergeService;
     protected MatterExportService $matterExportService;
-    protected OPSService $opsService;
+    protected FamilyDataService $familyDataService;
 
     /**
      * Initialize the controller with required services.
      *
      * @param DocumentMergeService $documentMergeService Service for merging matter data into documents.
      * @param MatterExportService $matterExportService Service for exporting matters to CSV.
-     * @param OPSService $opsService Service for interacting with EPO OPS API.
+     * @param FamilyDataService $familyDataService Service for retrieving family data from OPS/USPTO.
      */
     public function __construct(
         DocumentMergeService $documentMergeService,
         MatterExportService  $matterExportService,
-        OPSService $opsService
+        FamilyDataService $familyDataService
     )
     {
         $this->documentMergeService = $documentMergeService;
         $this->matterExportService = $matterExportService;
-        $this->opsService = $opsService;
+        $this->familyDataService = $familyDataService;
     }
 
     /**
@@ -359,7 +359,7 @@ public function storeFamily(Request $request)
             'client_id' => 'required',
         ]);
 
-        $apps = collect($this->opsService->getFamilyMembers($request->docnum));
+        $apps = collect($this->familyDataService->getFamilyMembers($request->docnum));
         if ($apps->has('errors') || $apps->has('exception')) {
             return response()->json($apps);
         }
@@ -444,7 +444,7 @@ public function storeFamily(Request $request)
                     $new_matter->classifiersNative()->create(['type_code' => 'TIT', 'value' => $app['title']]);
                 }
                 $new_matter->actorPivot()->create(['actor_id' => $request->client_id, 'role' => 'CLI', 'shared' => 1]);
-                if (array_key_exists('applicants', $app)) {
+                if (array_key_exists('applicants', $app) && !empty($app['applicants'])) {
                     if (strtolower($app['applicants'][0]) == strtolower(Actor::find($request->client_id)->name)) {
                         $new_matter->actorPivot()->create(
                             [
@@ -489,7 +489,7 @@ public function storeFamily(Request $request)
                     }
                     $new_matter->notes = 'Applicants: ' . collect($app['applicants'])->implode('; ');
                 }
-                if (array_key_exists('inventors', $app)) {
+                if (array_key_exists('inventors', $app) && !empty($app['inventors'])) {
                     foreach ($app['inventors'] as $inventor) {
                         // Search for phonetically equivalent in the actor table, and take first
                         if (substr($inventor, -1) == ',') {
@@ -796,7 +796,7 @@ public function mergeFile(Matter $matter, MergeFileRequest $request)
      */
     public function getOPSfamily(string $docnum)
     {
-        return $this->opsService->getFamilyMembers($docnum);
+        return $this->familyDataService->getFamilyMembers($docnum);
     }
 
     /**

app/Services/FamilyDataService.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Services;
+
+/**
+ * Family data orchestrator with dynamic provider selection.
+ *
+ * Default behavior uses OPS for full family retrieval, then enriches US members
+ * from USPTO ODP when enabled/configured.
+ */
+class FamilyDataService
+{
+    public function __construct(
+        private OPSService $opsService,
+        private USPTOService $usptoService
+    ) {
+    }
+
+    /**
+     * Get family members with OPS primary source and USPTO fallback/enrichment.
+     *
+     * @param string $docnum
+     * @return array
+     */
+    public function getFamilyMembers(string $docnum): array
+    {
+        $apps = $this->opsService->getFamilyMembers($docnum);
+        if (array_key_exists('errors', $apps) || array_key_exists('exception', $apps)) {
+            // If the requested number looks US, return a synthetic single-member family
+            // from USPTO ODP when possible.
+            if ($this->isUSDocument($docnum)) {
+                $member = $this->buildUSMemberFromODP($docnum);
+                if (!empty($member)) {
+                    return [$member];
+                }
+            }
+
+            return $apps;
+        }
+
+        return $this->usptoService->enrichFamilyMembers($apps);
+    }
+
+    private function isUSDocument(string $docnum): bool
+    {
+        return str_starts_with(strtoupper(trim($docnum)), 'US');
+    }
+
+    private function buildUSMemberFromODP(string $docnum): array
+    {
+        $number = preg_replace('/\D/', '', $docnum);
+        if (!$number) {
+            return [];
+        }
+
+        $odData = $this->usptoService->getApplicationData($number);
+        if (empty($odData)) {
+            return [];
+        }
+
+        return [
+            'id' => 'US' . $number,
+            'app' => [
+                'country' => 'US',
+                'number' => ltrim($number, '0'),
+                'kind' => 'A',
+                'date' => null,
+            ],
+            'pri' => [],
+            'pct' => null,
+            'div' => null,
+            'cnt' => null,
+            'title' => $odData['title'] ?? null,
+            'applicants' => $odData['applicants'] ?? [],
+            'inventors' => $odData['inventors'] ?? [],
+            'procedure' => $odData['procedure'] ?? [],
+        ];
+    }
+}
+

app/Services/OPSService.php

@@ -165,14 +165,28 @@ public function getFamilyMembers(string $docnum): array
                     ->last()['$'];
 
                 // Each inventor is under [i]['inventor-name']['name']['$'] both in "epodoc" and "original" format
-                $inventors = collect($member[0]['exchange-document']['bibliographic-data']['parties']['inventors']['inventor'])
-                    ->where('@data-format', 'original');
-                $apps[0]['inventors'] = $inventors->values()->pluck('inventor-name.name.$');
+                $inventors = collect($member[0]['exchange-document']['bibliographic-data']['parties']['inventors']['inventor'] ?? [])
+                    ->where('@data-format', 'original')
+                    ->values()
+                    ->pluck('inventor-name.name.$')
+                    ->filter()
+                    ->values()
+                    ->all();
+                if (!empty($inventors)) {
+                    $apps[0]['inventors'] = $inventors;
+                }
 
                 // Each applicant is under [i]['applicant-name']['name']['$']
-                $applicants = collect($member[0]['exchange-document']['bibliographic-data']['parties']['applicants']['applicant'])
-                    ->where('@data-format', 'original');
-                $apps[0]['applicants'] = $applicants->values()->pluck('applicant-name.name.$');
+                $applicants = collect($member[0]['exchange-document']['bibliographic-data']['parties']['applicants']['applicant'] ?? [])
+                    ->where('@data-format', 'original')
+                    ->values()
+                    ->pluck('applicant-name.name.$')
+                    ->filter()
+                    ->values()
+                    ->all();
+                if (!empty($applicants)) {
+                    $apps[0]['applicants'] = $applicants;
+                }
 
                 $procedureSteps = $this->getProceduralSteps($app_number);
                 if (!empty($procedureSteps)) {