feat: bug fixes and other updates

Steinbeck-Lab · May 15, 2024 · 6772b7c · 6772b7c
1 parent 9b3cac4
commit 6772b7c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/app/Console/Commands/ImportEntries.php b/app/Console/Commands/ImportEntries.php
@@ -16,7 +16,7 @@ class ImportEntries extends Command
      *
      * @var string
      */
-    protected $signature = 'entries:import {collection_id}';
+    protected $signature = 'entries:import {collection_id?}';
 
     /**
      * The console command description.
@@ -35,7 +35,7 @@ public function handle()
         if (! is_null($collection_id)) {
             $collections = Collection::where('id', $collection_id)->get();
         } else {
-            $collections = Collection::where('status', 'PUBLISHED')->get();
+            $collections = Collection::where('status', 'DRAFT')->get();
         }
 
         foreach ($collections as $collection) {

diff --git a/app/Filament/Dashboard/Resources/CollectionResource.php b/app/Filament/Dashboard/Resources/CollectionResource.php
@@ -6,6 +6,7 @@
 use App\Filament\Dashboard\Resources\CollectionResource\RelationManagers\CitationsRelationManager;
 use App\Filament\Dashboard\Resources\CollectionResource\RelationManagers\EntriesRelationManager;
 use App\Filament\Dashboard\Resources\CollectionResource\Widgets\CollectionStats;
+use App\Filament\Dashboard\Resources\CollectionResource\Widgets\EntriesOverview;
 use App\Livewire\ShowJobStatus;
 use App\Models\Collection;
 use Filament\Forms\Components\Livewire;
@@ -112,6 +113,7 @@ public static function getWidgets(): array
     {
         return [
             CollectionStats::class,
+            EntriesOverview::class
         ];
     }
 }
diff --git a/app/Filament/Dashboard/Resources/CollectionResource/Widgets/CollectionStats.php b/app/Filament/Dashboard/Resources/CollectionResource/Widgets/CollectionStats.php
@@ -14,7 +14,16 @@ class CollectionStats extends BaseWidget
     protected function getStats(): array
     {
         return [
-            Stat::make('Total Entries',  $this->record->entries->count()),
+            Stat::make('Entries', $this->record->entries->count())
+                ->description('Total count')
+                ->color('primary'),
+            Stat::make('Passed Entries', $this->record->entries->where('status', 'PASSED')->count())
+                ->description('Successful count')
+                ->color('success'),
+            Stat::make('Entries', $this->record->entries->where('status', 'REJECTED')->count())
+                ->description('Failed entries')
+                ->color('danger'),
+            // Stat::make('Total Entries',  $this->record->entries->count()),
             Stat::make('Total Molecules', $this->record->molecules->count()),
             Stat::make('Total Citations',  $this->record->citations->count()),
             // Stat::make('Total Organisms', Cache::rememberForever('stats.collections'.$this->record->id.'organisms.count', function () {

diff --git a/app/Jobs/ImportEntry.php b/app/Jobs/ImportEntry.php
@@ -36,6 +36,7 @@ public function __construct($entry)
     public function handle(): void
     {
         if ($this->entry->status == 'PASSED') {
+            $molecule = null;
             if ($this->entry->has_stereocenters) {
                 $data = $this->getRepresentations('parent');
                 $parent = $this->firstOrCreateMolecule($data['canonical_smiles'], $data['standard_inchi']);
@@ -288,7 +289,8 @@ public function fetchDOICitation($doi, $molecule)
                     } else {
                         // fetch citation from CrossRef
                         $crossrefUrl = env('CROSSREF_WS_API').$doi;
-                        $crossrefResponse = $this->makeRequest($crossrefUrl)->json();
+                        $response = $this->makeRequest($crossrefUrl);
+                        $crossrefResponse = $response ? $response->json() : null;
                         if ($crossrefResponse && isset($crossrefResponse['message'])) {
                             $citationResponse = $this->formatCitationResponse($crossrefResponse['message'], 'crossref');
                         } else {