Track siteId for each stats record

statikbe · Mar 8, 2024 · ec1d8d1 · ec1d8d1
1 parent 5dd285f
commit ec1d8d1
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 30 deletions.
diff --git a/src/CarbonTracker.php b/src/CarbonTracker.php
@@ -31,7 +31,7 @@
  */
 class CarbonTracker extends Plugin
 {
-    public string $schemaVersion = '1.0.0';
+    public string $schemaVersion = '1.1.0';
     public bool $hasCpSettings = true;
 
     /**
@@ -80,7 +80,7 @@ private function attachEventHandlers(): void
             function(ModelEvent $event) {
                 /** @var Entry $entry */
                 $entry = $event->sender;
-                if (!ElementHelper::isDraftOrRevision($entry) && $entry->getUrl()) {
+                if (!ElementHelper::isDraftOrRevision($entry) && $entry->getUrl() && !$entry->propagating) {
                     Queue::push(new CarbonStatsJob([
                         'entryId' => $entry->id,
                         'siteId' => $entry->siteId,

diff --git a/src/migrations/m240307_121231_addSiteIdCol.php b/src/migrations/m240307_121231_addSiteIdCol.php
@@ -2,7 +2,6 @@
 
 namespace statikbe\carbontracker\migrations;
 
-use Craft;
 use craft\db\Migration;
 use statikbe\carbontracker\records\SiteStatisticsRecord;
 

diff --git a/src/models/SiteStatisticsModel.php b/src/models/SiteStatisticsModel.php
@@ -10,6 +10,7 @@
 class SiteStatisticsModel extends Model
 {
     public int $entryId;
+    public int $siteId;
     public string $url = "https://";
     public bool $green = false;
     public int $bytes = 0;
@@ -23,8 +24,8 @@ class SiteStatisticsModel extends Model
     public function rules(): array
     {
         return [
-            [['entryId', 'url', 'green', 'bytes', 'cleanerThan', 'rating', 'dateUpdated'], 'required'],
-            [['entryId', 'url', 'green', 'bytes', 'cleanerThan', 'rating', 'dateUpdated'], 'safe'],
+            [['entryId', 'siteId', 'url', 'green', 'bytes', 'cleanerThan', 'rating', 'dateUpdated'], 'required'],
+            [['entryId', 'siteId', 'url', 'green', 'bytes', 'cleanerThan', 'rating', 'dateUpdated'], 'safe'],
         ];
     }
 }
diff --git a/src/records/SiteStatisticsRecord.php b/src/records/SiteStatisticsRecord.php
@@ -6,6 +6,7 @@
 
 /**
  * @property int $entryId entryId
+ * @property int $siteId siteId
  * @property string $url url
  * @property boolean $green green
  * @property float $cleanerThan cleanerThan

diff --git a/src/services/ApiService.php b/src/services/ApiService.php
@@ -5,6 +5,7 @@
 use craft\base\Component;
 use craft\elements\Entry;
 use GuzzleHttp\Client;
+use statikbe\carbontracker\CarbonTracker;
 use statikbe\carbontracker\models\SiteStatisticsModel;
 
 class ApiService extends Component
@@ -22,7 +23,7 @@ public function init(): void
         parent::init();
     }
 
-    public function getSite(Entry $entry): SiteStatisticsModel
+    public function getSite(Entry $entry): SiteStatisticsModel|bool
     {
         $model = new SiteStatisticsModel();
 
@@ -32,26 +33,32 @@ public function getSite(Entry $entry): SiteStatisticsModel
             $url = $entry->getUrl();
         }
 
-        $data = $this->makeRequest('/site', [
-            'query' => [
-                'url' => $url,
-            ],
-        ]);
+        try {
+            $data = $this->makeRequest('/site', [
+                'query' => [
+                    'url' => $url,
+                ],
+            ]);
 
-        if (empty($data)) {
-            return $model;
-        }
+            if (empty($data)) {
+                return $model;
+            }
 
-        $model->setAttributes([
-            'entryId' => $entry->id,
-            'url' => $data['url'],
-            'green' => $data['green'],
-            'bytes' => $data['bytes'],
-            'cleanerThan' => $data['cleanerThan'],
-            'rating' => $data['rating'],
-        ]);
+            $model->setAttributes([
+                'entryId' => $entry->id,
+                'siteId' => $entry->siteId,
+                'url' => $data['url'],
+                'green' => $data['green'],
+                'bytes' => $data['bytes'],
+                'cleanerThan' => $data['cleanerThan'],
+                'rating' => $data['rating'],
+            ]);
 
-        return $model;
+            return $model;
+        } catch (\Exception $e) {
+            \Craft::error($e->getMessage(), CarbonTracker::class);
+            return false;
+        }
     }
 
     /**

diff --git a/src/services/StatsService.php b/src/services/StatsService.php
@@ -31,6 +31,7 @@ public function upsertDataForEntry(Entry $entry): void
         $date = DateTimeHelper::currentUTCDateTime()->modify('-1 day');
         $record = SiteStatisticsRecord::find()
             ->where(['=', 'entryId', $entry->id])
+            ->andWhere(['=', 'siteId', $entry->siteId])
             ->andWhere(['>=', 'dateCreated', $date->format('c')])
             ->one();
 
@@ -41,12 +42,15 @@ public function upsertDataForEntry(Entry $entry): void
         }
 
         $stats = CarbonTracker::getInstance()->api->getSite($entry);
-        $record = new SiteStatisticsRecord();
-        $record->entryId = $stats->entryId;
-        $record->url = $stats->url;
-        $record->green = $stats->green;
-        $record->cleanerThan = $stats->cleanerThan;
-        $record->rating = $stats->rating;
-        $record->save();
+        if ($stats) {
+            $record = new SiteStatisticsRecord();
+            $record->entryId = $stats->entryId;
+            $record->siteId = $stats->siteId;
+            $record->url = $stats->url;
+            $record->green = $stats->green;
+            $record->cleanerThan = $stats->cleanerThan;
+            $record->rating = $stats->rating;
+            $record->save();
+        }
     }
 }