large commit

app/Classes/Modules/Addresses/DataTransferObjects/AddressObject.php

@@ -2,69 +2,46 @@
 
 namespace App\Classes\Modules\Addresses\DataTransferObjects;
 
-use App\Classes\Interfaces\DataTransferObject;
+use App\Classes\General\Interfaces\DataTransferObject;
 
 class AddressObject implements DataTransferObject
 {
 
-    /** @var int */
-    private $companyId;
-
     /** @var string */
     private $streetOne;
 
     /** @var string|null */
     private $streetTwo;
 
-    /** @var string */
-    private $city;
+    /** @var int */
+    private $countryId;
 
-    /** @var string */
-    private $state;
+    /** @var int */
+    private $stateId;
 
-    /** @var string */
+    /** @var int */
+    private $districtId;
+
+    /** @var int */
     private $postCode;
 
-    /** @var string */
-    private $country;
-
-    /** @var int */
-    private $default;
-
-    /** @var int */
-    private $billing;
-
     /**
      * AddressObject constructor.
-     * @param int $companyId
      * @param string $streetOne
      * @param null|string $streetTwo
-     * @param string $city
-     * @param string $state
-     * @param string $postCode
-     * @param string $country
-     * @param int $default
-     * @param int $billing
+     * @param int $countryId
+     * @param int $stateId
+     * @param int $districtId
+     * @param int $postCode
      */
-    public function __construct(int $companyId, string $streetOne, ?string $streetTwo, string $city, string $state, string $postCode, string $country, int $default, int $billing)
+    public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode)
     {
-        $this->companyId = $companyId;
         $this->streetOne = $streetOne;
         $this->streetTwo = $streetTwo;
-        $this->city = $city;
-        $this->state = $state;
+        $this->countryId = $countryId;
+        $this->stateId = $stateId;
+        $this->districtId = $districtId;
         $this->postCode = $postCode;
-        $this->country = $country;
-        $this->default = $default;
-        $this->billing = $billing;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCompanyId(): int
-    {
-        return $this->companyId;
     }
 
     /**
@@ -84,52 +61,36 @@ class AddressObject implements DataTransferObject
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getCity(): string
+    public function getCountryId(): int
     {
-        return $this->city;
+        return $this->countryId;
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getState(): string
+    public function getStateId(): int
     {
-        return $this->state;
+        return $this->stateId;
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getPostCode(): string
+    public function getDistrictId(): int
+    {
+        return $this->districtId;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPostCode(): int
     {
         return $this->postCode;
     }
 
-    /**
-     * @return string
-     */
-    public function getCountry(): string
-    {
-        return $this->country;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDefault(): int
-    {
-        return $this->default;
-    }
-
-    /**
-     * @return int
-     */
-    public function getBilling(): int
-    {
-        return $this->billing;
-    }
-
 
 }