Merge pull request #38 from lsst-epo/EPO-7944

Epo 7944

CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.4] - 04-12-2023
+
+### Changed
+
+- Namespace change from rosas -> lsst
+
+### Fixed
+
+- Tech debt clean-up:
+  - PhpStorm-isms for method/class annotations
+  - Miscellaneous tech debt clean-up
+  - Changed return type of exception logic in Assets service to string
+  - Changed logging to Craft::warn() for stdout

composer.json

@@ -4,7 +4,7 @@
     "type": "craft-plugin",
     "keywords": ["dam", "digital", "asset", "manager"],
     "license": "MIT",
-    "version": "v0.3.1-alpha",
+    "version": "v0.4",
     "authors": [
       {
         "name": "Eric Rosas",

src/DamPlugin.php

@@ -45,6 +45,7 @@ class DamPlugin extends Plugin
     public static Plugin $plugin;
 
     public bool $hasCpSettings = true;
+    public string $schemaVersion = "2.0.0";
 
     /**
      * @param $id

src/gql/interfaces/DAMAssetInterface.php

@@ -21,11 +21,12 @@ class DAMAssetInterface extends AssetInterface {
      */
     public static function getType($fields = null): Type
     {
-        if ($type = GqlEntityRegistry::getEntity(self::class)) {
+        $name = "DAMAssetInterface";
+        if ($type = GqlEntityRegistry::getEntity($name)) {
             return $type;
         }
 
-        $type = GqlEntityRegistry::createEntity(self::class, new InterfaceType([
+        $type = GqlEntityRegistry::createEntity($name, new InterfaceType([
             'name' => static::getName(),
             'fields' => self::class . '::getFieldDefinitions',
             'description' => 'This is the interface implemented by all DAM assets.',

src/migrations/m230412_233209_namespace_change_migration.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace lsst\dam\migrations;
+
+use Craft;
+use craft\db\Migration;
+
+/**
+ * m230412_233209_namespace_change_migration migration.
+ */
+class m230412_233209_namespace_change_migration extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp(): bool
+    {
+        echo "m230412_233209_namespace_change_migration executing...\n";
+
+        $this->update('{{%fields}}', [
+            "type" => 'lsst\dam\fields\DAMAsset'
+            ],[
+            "type" => 'rosas\dam\fields\DAMAsset'
+            ]
+        );
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown(): bool
+    {
+        echo "m230412_233209_namespace_change_migration is be reverted.\n";
+
+        $this->update('{{%fields}}', [
+            "type" => 'rosas\dam\fields\DAMAsset'
+        ],[
+            "type" => 'lsst\dam\fields\DAMAsset'
+        ]
+        );
+        return true;
+    }
+}

src/services/Assets.php

@@ -291,18 +291,12 @@ public function getAuthToken($validateOnly = false) : string {
 
                 return $authToken;
             } else {
-                Craft::info("An exception occurred in getAuthToken()", "UDAMI");
-                return [
-                    "status" => "error",
-                    'errorMessage' => 'An error occurred fetching auth token!'
-                ];
+                Craft::warn("An exception occurred in getAuthToken()", "UDAMI");
+                return 'An error occurred fetching auth token!';
             }
         } else {
-            Craft::info("An exception occurred in getAuthToken()", "UDAMI");
-            return [
-                "status" => "error",
-                'errorMessage' => 'DamPlugin is not configured to authenticate!'
-            ];
+            Craft::warn("An exception occurred in getAuthToken()", "UDAMI");
+            return 'DamPlugin is not configured to authenticate!';
         }
 
     }