From ea1677519a15e8b3614a61d468295d6ab68e2a8f Mon Sep 17 00:00:00 2001
From: recursive_tree <recursivetreemail@gmail.com>
Date: Thu, 28 Mar 2024 16:14:58 +0100
Subject: [PATCH] feat: add HasTypeIDWithAmount interface

---
 src/Contracts/HasTypeIDWithAmount.php | 15 +++++++++++++
 src/Contracts/IPriceable.php          |  7 +-----
 src/Items/EveTypeWithAmount.php       | 32 +++++++++++++++++++++++++++
 src/Items/PriceableEveType.php        | 19 +++++-----------
 4 files changed, 53 insertions(+), 20 deletions(-)
 create mode 100644 src/Contracts/HasTypeIDWithAmount.php
 create mode 100644 src/Items/EveTypeWithAmount.php

diff --git a/src/Contracts/HasTypeIDWithAmount.php b/src/Contracts/HasTypeIDWithAmount.php
new file mode 100644
index 00000000..ebd3ada2
--- /dev/null
+++ b/src/Contracts/HasTypeIDWithAmount.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Seat\Services\Contracts;
+
+/**
+ * This interface is something between HasTypeID and IPriceable for things that have an amount and type but no price, like an asset list.
+ * The goal is to improve cross-plugin item handling compatibility.
+ */
+interface HasTypeIDWithAmount extends HasTypeID
+{
+    /**
+     * @return int The amount of items
+     */
+    public function getAmount(): int;
+}
\ No newline at end of file
diff --git a/src/Contracts/IPriceable.php b/src/Contracts/IPriceable.php
index f69f5b26..c9ae51fc 100644
--- a/src/Contracts/IPriceable.php
+++ b/src/Contracts/IPriceable.php
@@ -27,13 +27,8 @@
  * This interface is in the services package to encourage making classes that describe items compatible across both the
  * seat core and plugin, even if they don't depend on recursivetree/seat-prices-core.
  */
-interface IPriceable extends HasTypeID
+interface IPriceable extends HasTypeID, HasTypeIDWithAmount
 {
-    /**
-     * @return int The amount of items to be appraised by a price provider
-     */
-    public function getAmount(): int;
-
     /**
      * Set the price of this object.
      *
diff --git a/src/Items/EveTypeWithAmount.php b/src/Items/EveTypeWithAmount.php
new file mode 100644
index 00000000..1303c98d
--- /dev/null
+++ b/src/Items/EveTypeWithAmount.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Seat\Services\Items;
+
+use Seat\Services\Contracts\HasTypeID;
+use Seat\Services\Contracts\HasTypeIDWithAmount;
+
+/**
+ * A simple implementation on HasTypeIDWithAmount
+ */
+class EveTypeWithAmount extends EveType implements HasTypeIDWithAmount
+{
+    private int $amount;
+
+    /**
+     * @param int|HasTypeID $type_id
+     * @param int $amount
+     */
+    public function __construct(int|HasTypeID $type_id, int $amount)
+    {
+        parent::__construct($type_id);
+        $this->amount = $amount;
+    }
+
+    /**
+     * @return int The amount of items
+     */
+    public function getAmount(): int
+    {
+        return $this->amount;
+    }
+}
\ No newline at end of file
diff --git a/src/Items/PriceableEveType.php b/src/Items/PriceableEveType.php
index dbe6b95b..18662f56 100644
--- a/src/Items/PriceableEveType.php
+++ b/src/Items/PriceableEveType.php
@@ -23,33 +23,24 @@
 namespace Seat\Services\Items;
 
 use Seat\Services\Contracts\HasTypeID;
+use Seat\Services\Contracts\HasTypeIDWithAmount;
 use Seat\Services\Contracts\IPriceable;
 
 /**
  * A basic implementation od IPriceable.
  */
-class PriceableEveType extends EveType implements IPriceable
+class PriceableEveType extends EveTypeWithAmount implements IPriceable
 {
     protected float $price;
-    protected float $amount;
 
     /**
      * @param  int|HasTypeID  $type_id  The eve type to be appraised
-     * @param  float  $amount  The amount of this type to be appraised
+     * @param  float|int  $amount  The amount of this type to be appraised
      */
-    public function __construct(int|HasTypeID $type_id, float $amount)
+    public function __construct(int|HasTypeID $type_id, float|int $amount)
     {
-        parent::__construct($type_id);
+        parent::__construct($type_id, (int) $amount);
         $this->price = 0;
-        $this->amount = $amount;
-    }
-
-    /**
-     * @return int The amount of this item to be appraised
-     */
-    public function getAmount(): int
-    {
-        return $this->amount;
     }
 
     /**