Optimising product category and category names

app/Models/Service/Broadband.php

@@ -105,12 +105,13 @@ class Broadband extends Type implements ServiceUsage
 	 * Return the suppliers offering that this service is providing
 	 *
 	 * @return SupplierType
+	 * @todo This column provided_adsl_plan_id should either be deprecated or renamed.
 	 */
 	public function supplied(): SupplierType
 	{
 		return $this->provided_adsl_plan_id
 			? SupplierBroadband::findOrFail($this->provided_adsl_plan_id)
-			: $this->service->product->type->supplied;
+			: $this->service->offering->supplied;
 	}
 
 	/**

app/Models/Service/Type.php

@@ -91,11 +91,6 @@ abstract class Type extends Model implements ServiceItem
 		return LeenooksCarbon::create($value);
 	}
 
-	public function getTypeAttribute()
-	{
-		return strtolower((new \ReflectionClass($this))->getShortName());
-	}
-
 	/* METHODS */
 
 	/**
@@ -105,6 +100,6 @@ abstract class Type extends Model implements ServiceItem
 	 */
 	public function supplied(): SupplierType
 	{
-		return $this->service->product->type->supplied;
+		return $this->service->offering->supplied ?: new \App\Models\Supplier\Generic();
 	}
 }