Revert "レコメンド機能の作成（フェーズ3）"

PRTIMES · Aug 29, 2024 · ad63356 · ad63356
1 parent 71ea8a0
commit ad63356
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 442 deletions.
diff --git a/backend/.env.example b/backend/.env.example
@@ -62,7 +62,3 @@ AWS_BUCKET=
 AWS_USE_PATH_STYLE_ENDPOINT=false
 
 VITE_APP_NAME="${APP_NAME}"
-
-PRTIMES_API_TOKEN=""
-
-OPENAI_API_TOKEN=""
diff --git a/backend/_ide_helper_models.php b/backend/_ide_helper_models.php
@@ -19,8 +19,6 @@
  * @property string $keyword
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PressRelease> $pressReleases
- * @property-read int|null $press_releases_count
  * @method static \Illuminate\Database\Eloquent\Builder|Keyword newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Keyword newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Keyword query()
@@ -39,23 +37,15 @@ class Keyword extends \Eloquent {}
  * @property int $id
  * @property string $company_id
  * @property string $release_id
- * @property string $title
- * @property string $summary
- * @property string $release_created_at
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Keyword> $keywords
- * @property-read int|null $keywords_count
  * @method static \Illuminate\Database\Eloquent\Builder|PressRelease newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|PressRelease newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|PressRelease query()
  * @method static \Illuminate\Database\Eloquent\Builder|PressRelease whereCompanyId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|PressRelease whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|PressRelease whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|PressRelease whereReleaseCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|PressRelease whereReleaseId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|PressRelease whereSummary($value)
- * @method static \Illuminate\Database\Eloquent\Builder|PressRelease whereTitle($value)
  * @method static \Illuminate\Database\Eloquent\Builder|PressRelease whereUpdatedAt($value)
  */
 	class PressRelease extends \Eloquent {}
@@ -76,8 +66,6 @@ class PressRelease extends \Eloquent {}
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
  * @property-read int|null $notifications_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ViewHistory> $view_histories
- * @property-read int|null $view_histories_count
  * @method static \Database\Factories\UserFactory factory($count = null, $state = [])
  * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|User newQuery()
@@ -95,28 +83,3 @@ class PressRelease extends \Eloquent {}
 	class User extends \Eloquent {}
 }
 
-namespace App\Models{
-/**
- * 
- *
- * @property int $id
- * @property int $score
- * @property int $user_id
- * @property int $keyword_id
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \App\Models\Keyword $keyword
- * @property-read \App\Models\User $user
- * @method static \Illuminate\Database\Eloquent\Builder|ViewHistory newModelQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|ViewHistory newQuery()
- * @method static \Illuminate\Database\Eloquent\Builder|ViewHistory query()
- * @method static \Illuminate\Database\Eloquent\Builder|ViewHistory whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ViewHistory whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ViewHistory whereKeywordId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ViewHistory whereScore($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ViewHistory whereUpdatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ViewHistory whereUserId($value)
- */
-	class ViewHistory extends \Eloquent {}
-}
-
diff --git a/backend/app/Http/Controllers/Api/PressRelease/ViewController.php b/backend/app/Http/Controllers/Api/PressRelease/ViewController.php
diff --git a/backend/app/Jobs/PressReleaseAnalyze.php b/backend/app/Jobs/PressReleaseAnalyze.php
diff --git a/backend/app/Libs/Bedrock.php b/backend/app/Libs/Bedrock.php
@@ -11,7 +11,7 @@ class Bedrock
 
     public function __construct(
         private readonly string $model_id = "anthropic.claude-3-haiku-20240307-v1:0",
-        private readonly string $anthropic_version = "bedrock-2023-05-31",
+        private readonly string $anthropic_version = "anthropic.claude-3-haiku-20240307-v1:0",
         private readonly int $max_token = 1000,
         array $client_configs = [
             "region" => "us-east-1",

diff --git a/backend/app/Models/Keyword.php b/backend/app/Models/Keyword.php
@@ -11,15 +11,15 @@ class Keyword extends Model
     use HasFactory;
 
     protected $fillable = [
-        "keyword"
+        "keyword",
+        "weight"
     ];
 
     /**
      * @return BelongsToMany
      */
     public function pressReleases(): BelongsToMany
     {
-        return $this->belongsToMany(PressRelease::class)
-                    ->withPivot("weight");
+        return $this->belongsToMany(PressRelease::class);
     }
 }
diff --git a/backend/app/Models/PressRelease.php b/backend/app/Models/PressRelease.php
@@ -23,7 +23,6 @@ class PressRelease extends Model
      */
     public function keywords(): BelongsToMany
     {
-        return $this->belongsToMany(Keyword::class)
-                    ->withPivot("weight");
+        return $this->belongsToMany(Keyword::class);
     }
 }
diff --git a/backend/app/Models/User.php b/backend/app/Models/User.php
@@ -2,8 +2,8 @@
 
 namespace App\Models;
 
+// use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
@@ -24,12 +24,4 @@ class User extends Authenticatable
         'age',
         'prefecture'
     ];
-
-    /**
-     * @return HasMany
-     */
-    public function view_histories(): HasMany
-    {
-        return $this->hasMany(ViewHistory::class);
-    }
 }
diff --git a/backend/app/Models/ViewHistory.php b/backend/app/Models/ViewHistory.php
diff --git a/backend/app/UseCases/Keyword/CreateOrFirstAction.php b/backend/app/UseCases/Keyword/CreateOrFirstAction.php
@@ -6,18 +6,15 @@
 
 class CreateOrFirstAction
 {
-    /**
-     * @param string $keyword
-     * @return Keyword
-     */
     public static function run(
-        string $keyword
+        string $keyword,
+        int $weight
     ): Keyword {
         // @todo barryvdh/laravel-ide-helperにより強制的に型付け
         /* @var Keyword */
         return Keyword::createOrFirst(
-            ["keyword" => $keyword],
-            ["keyword" => $keyword]
+            compact("keyword", "weight"),
+            compact("keyword", "weight")
         );
     }
 }