Cleanup

Contract Achievementable —> HasAchievements;
Trait Achievementable –> InteractsWitchAchievements

README.md

@@ -22,11 +22,11 @@ php artisan vendor:publish --provider="tizis\achievements\Providers\ServiceProvi
 
 
 ```php
-use tizis\achievements\Contracts\Achievementable as AchievementableContract;
-use tizis\achievements\Traits\Achievementable;
+use tizis\achievements\Contracts\HasAchievements;
+use tizis\achievements\Traits\InteractsWithAchievements;
 
-class User extends Authenticatable implements AchievementableContract {
-	use Achievementable;
+class User extends Authenticatable implements HasAchievements {
+	use InteractsWithAchievements;
 }
 ```   
 

src/AchievementHelper.php

@@ -2,18 +2,18 @@
 
 namespace tizis\achievements;
 
-use tizis\achievements\Contracts\Achievementable;
+use tizis\achievements\Contracts\HasAchievements;
 
 class AchievementHelper
 {
-    public static function count(Achievementable $user)
+    public static function count(HasAchievements $user)
     {
         return $user->achievements()
             ->wherePivot('unlocked_at', '!=', null)
             ->count();
     }
 
-    public static function lastUnlockedAchievements(Achievementable $user, int $take = 10)
+    public static function lastUnlockedAchievements(HasAchievements $user, int $take = 10)
     {
         return $user->achievements()
             ->wherePivot('unlocked_at', '!=', null)
@@ -22,15 +22,15 @@ public static function lastUnlockedAchievements(Achievementable $user, int $take
             ->get();
     }
 
-    public static function lastUnlockedAchievement(Achievementable $user)
+    public static function lastUnlockedAchievement(HasAchievements $user)
     {
         return $user->achievements()
             ->wherePivot('unlocked_at', '!=', null)
             ->orderBy('achievements_progress.unlocked_at', 'desc')
             ->first();
     }
 
-    public static function getUnlockedUniqueAchievementsOfUser(Achievementable $user)
+    public static function getUnlockedUniqueAchievementsOfUser(HasAchievements $user)
     {
         $collection = collect();
 
@@ -63,7 +63,7 @@ public static function getUnlockedUniqueAchievementsOfUser(Achievementable $user
         return $collection;
     }
 
-    public static function unlockedAchievementsOnlyGroups(Achievementable $user)
+    public static function unlockedAchievementsOnlyGroups(HasAchievements $user)
     {
         $collection = collect();
 

src/Contracts/Achievementable.php

@@ -2,7 +2,7 @@
 
 namespace tizis\achievements\Contracts;
 
-interface Achievementable
+interface HasAchievements
 {
     public function achievements(): \Illuminate\Database\Eloquent\Relations\BelongsToMany;
 

src/Services/AchievementService.php

@@ -2,14 +2,14 @@
 
 namespace tizis\achievements\Services;
 
-use Illuminate\Database\Eloquent\Model;
 use tizis\achievements\Contracts\Achievement;
+use tizis\achievements\Contracts\HasAchievements;
 
 class AchievementService
 {
-    protected Model $user;
+    protected HasAchievements $user;
 
-    public function __construct(Model $user)
+    public function __construct(HasAchievements $user)
     {
         $this->user = $user;
     }

src/Services/GroupAchievementService.php

@@ -2,14 +2,14 @@
 
 namespace tizis\achievements\Services;
 
-use Illuminate\Database\Eloquent\Model;
 use tizis\achievements\Contracts\Group;
+use tizis\achievements\Contracts\HasAchievements;
 
 class GroupAchievementService
 {
-    protected $user;
+    protected HasAchievements $user;
 
-    public function __construct(Model $user)
+    public function __construct(HasAchievements $user)
     {
         $this->user = $user;
     }

src/Traits/Achievementable.php → src/Traits/InteractsWithAchievements.php

@@ -5,7 +5,7 @@
 use tizis\achievements\Contracts\Achievement;
 use tizis\achievements\Contracts\Group;
 
-trait Achievementable
+trait InteractsWithAchievements
 {
     public function achievements(): \Illuminate\Database\Eloquent\Relations\BelongsToMany
     {