From f378db384c9cd960ff596bf49e89506116a5b3cf Mon Sep 17 00:00:00 2001
From: recursivetree <60423027+recursivetree@users.noreply.github.com>
Date: Wed, 3 Apr 2024 13:49:07 +0200
Subject: [PATCH] feat: add HasTypeIDWithAmount interface (#180)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: add HasTypeIDWithAmount interface

* styleci

* Update src/Contracts/IPriceable.php

Remove redundant extends

Co-authored-by: Loïc Leuilliot <e.elfaus@gmail.com>

---------

Co-authored-by: Crypta Eve <crypta@crypta.tech>
Co-authored-by: Loïc Leuilliot <e.elfaus@gmail.com>
---
 src/Contracts/HasTypeIDWithAmount.php | 35 ++++++++++++++++++
 src/Contracts/IPriceable.php          |  7 +---
 src/Items/EveTypeWithAmount.php       | 52 +++++++++++++++++++++++++++
 src/Items/PriceableEveType.php        | 18 +++-------
 4 files changed, 92 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..5d46d9d8
--- /dev/null
+++ b/src/Contracts/HasTypeIDWithAmount.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of SeAT
+ *
+ * Copyright (C) 2015 to present Leon Jacobs
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+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;
+}
diff --git a/src/Contracts/IPriceable.php b/src/Contracts/IPriceable.php
index f69f5b26..a3383b55 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 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..a8b4a37b
--- /dev/null
+++ b/src/Items/EveTypeWithAmount.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of SeAT
+ *
+ * Copyright (C) 2015 to present Leon Jacobs
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+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;
+    }
+}
diff --git a/src/Items/PriceableEveType.php b/src/Items/PriceableEveType.php
index dbe6b95b..6d00de93 100644
--- a/src/Items/PriceableEveType.php
+++ b/src/Items/PriceableEveType.php
@@ -28,28 +28,18 @@
 /**
  * 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;
     }
 
     /**