From 0a1b44c8dcf4c6ae28a6905e1947839a55d40828 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Fri, 21 Apr 2023 20:48:51 +1000 Subject: [PATCH] Refactor createFromJson function --- lib/inventree/bom.dart | 4 +--- lib/inventree/company.dart | 18 +++--------------- lib/inventree/model.dart | 11 ++--------- lib/inventree/part.dart | 27 +++++---------------------- lib/inventree/purchase_order.dart | 14 +++++--------- lib/inventree/stock.dart | 20 +++++--------------- 6 files changed, 21 insertions(+), 73 deletions(-) diff --git a/lib/inventree/bom.dart b/lib/inventree/bom.dart index 8916360d..cf708c6f 100644 --- a/lib/inventree/bom.dart +++ b/lib/inventree/bom.dart @@ -12,9 +12,7 @@ class InvenTreeBomItem extends InvenTreeModel { InvenTreeBomItem.fromJson(Map json) : super.fromJson(json); @override - InvenTreeModel createFromJson(Map json) { - return InvenTreeBomItem.fromJson(json); - } + InvenTreeModel createFromJson(Map json) => InvenTreeBomItem.fromJson(json); @override String get URL => "bom/"; diff --git a/lib/inventree/company.dart b/lib/inventree/company.dart index c4836121..78f83d39 100644 --- a/lib/inventree/company.dart +++ b/lib/inventree/company.dart @@ -81,11 +81,7 @@ class InvenTreeCompany extends InvenTreeModel { } @override - InvenTreeModel createFromJson(Map json) { - var company = InvenTreeCompany.fromJson(json); - - return company; - } + InvenTreeModel createFromJson(Map json) => InvenTreeCompany.fromJson(json); } @@ -183,11 +179,7 @@ class InvenTreeSupplierPart extends InvenTreeModel { String get note => getString("note"); @override - InvenTreeModel createFromJson(Map json) { - var part = InvenTreeSupplierPart.fromJson(json); - - return part; - } + InvenTreeModel createFromJson(Map json) => InvenTreeSupplierPart.fromJson(json); } @@ -214,9 +206,5 @@ class InvenTreeManufacturerPart extends InvenTreeModel { String get MPN => getString("MPN"); @override - InvenTreeModel createFromJson(Map json) { - var part = InvenTreeManufacturerPart.fromJson(json); - - return part; - } + InvenTreeModel createFromJson(Map json) => InvenTreeManufacturerPart.fromJson(json); } diff --git a/lib/inventree/model.dart b/lib/inventree/model.dart index 54cacc96..97b2f162 100644 --- a/lib/inventree/model.dart +++ b/lib/inventree/model.dart @@ -390,12 +390,7 @@ class InvenTreeModel { String get keywords => getString("keywords"); // Create a new object from JSON data (not a constructor!) - InvenTreeModel createFromJson(Map json) { - - var obj = InvenTreeModel.fromJson(json); - - return obj; - } + InvenTreeModel createFromJson(Map json) => InvenTreeModel.fromJson(json); // Return the API detail endpoint for this Model object String get url => "${URL}/${pk}/".replaceAll("//", "/"); @@ -836,9 +831,7 @@ class InvenTreePlugin extends InvenTreeModel { InvenTreePlugin.fromJson(Map json) : super.fromJson(json); @override - InvenTreeModel createFromJson(Map json) { - return InvenTreePlugin.fromJson(json); - } + InvenTreeModel createFromJson(Map json) => InvenTreePlugin.fromJson(json); @override String get URL { diff --git a/lib/inventree/part.dart b/lib/inventree/part.dart index f4b7060c..99c66733 100644 --- a/lib/inventree/part.dart +++ b/lib/inventree/part.dart @@ -67,11 +67,7 @@ class InvenTreePartCategory extends InvenTreeModel { int get partcount => (jsondata["part_count"] ?? jsondata["parts"] ?? 0) as int; @override - InvenTreeModel createFromJson(Map json) { - var cat = InvenTreePartCategory.fromJson(json); - - return cat; - } + InvenTreeModel createFromJson(Map json) => InvenTreePartCategory.fromJson(json); } @@ -98,11 +94,7 @@ class InvenTreePartTestTemplate extends InvenTreeModel { bool get requiresAttachment => getBool("requires_attachment"); @override - InvenTreeModel createFromJson(Map json) { - var template = InvenTreePartTestTemplate.fromJson(json); - - return template; - } + InvenTreeModel createFromJson(Map json) => InvenTreePartTestTemplate.fromJson(json); bool passFailStatus() { @@ -142,9 +134,7 @@ class InvenTreePartParameter extends InvenTreeModel { String get URL => "part/parameter/"; @override - InvenTreeModel createFromJson(Map json) { - return InvenTreePartParameter.fromJson(json); - } + InvenTreeModel createFromJson(Map json) => InvenTreePartParameter.fromJson(json); @override Map formFields() { @@ -445,12 +435,7 @@ class InvenTreePart extends InvenTreeModel { bool get starred => getBool("starred"); @override - InvenTreeModel createFromJson(Map json) { - - var part = InvenTreePart.fromJson(json); - - return part; - } + InvenTreeModel createFromJson(Map json) => InvenTreePart.fromJson(json); } /* @@ -469,8 +454,6 @@ class InvenTreePartAttachment extends InvenTreeAttachment { String get URL => "part/attachment/"; @override - InvenTreeModel createFromJson(Map json) { - return InvenTreePartAttachment.fromJson(json); - } + InvenTreeModel createFromJson(Map json) => InvenTreePartAttachment.fromJson(json); } diff --git a/lib/inventree/purchase_order.dart b/lib/inventree/purchase_order.dart index 35557cad..28e27afe 100644 --- a/lib/inventree/purchase_order.dart +++ b/lib/inventree/purchase_order.dart @@ -134,9 +134,7 @@ class InvenTreePurchaseOrder extends InvenTreeModel { } @override - InvenTreeModel createFromJson(Map json) { - return InvenTreePurchaseOrder.fromJson(json); - } + InvenTreeModel createFromJson(Map json) => InvenTreePurchaseOrder.fromJson(json); /// Mark this order as "placed" / "issued" Future issueOrder() async { @@ -243,9 +241,8 @@ class InvenTreePOLineItem extends InvenTreeModel { Map get destinationDetail => getMap("destination_detail"); @override - InvenTreeModel createFromJson(Map json) { - return InvenTreePOLineItem.fromJson(json); - } + InvenTreeModel createFromJson(Map json) => InvenTreePOLineItem.fromJson(json); + } /* @@ -264,7 +261,6 @@ class InvenTreePurchaseOrderAttachment extends InvenTreeAttachment { String get URL => "order/po/attachment/"; @override - InvenTreeModel createFromJson(Map json) { - return InvenTreePurchaseOrderAttachment.fromJson(json); - } + InvenTreeModel createFromJson(Map json) => InvenTreePurchaseOrderAttachment.fromJson(json); + } diff --git a/lib/inventree/stock.dart b/lib/inventree/stock.dart index 3ec880fa..4a026172 100644 --- a/lib/inventree/stock.dart +++ b/lib/inventree/stock.dart @@ -63,9 +63,7 @@ class InvenTreeStockItemHistory extends InvenTreeModel { InvenTreeStockItemHistory.fromJson(Map json) : super.fromJson(json); @override - InvenTreeModel createFromJson(Map json) { - return InvenTreeStockItemHistory.fromJson(json); - } + InvenTreeModel createFromJson(Map json) => InvenTreeStockItemHistory.fromJson(json); @override String get URL => "stock/track/"; @@ -472,9 +470,7 @@ class InvenTreeStockItem extends InvenTreeModel { } @override - InvenTreeModel createFromJson(Map json) { - return InvenTreeStockItem.fromJson(json); - } + InvenTreeModel createFromJson(Map json) => InvenTreeStockItem.fromJson(json); /* * Perform stocktake action: @@ -576,9 +572,7 @@ class InvenTreeStockItemAttachment extends InvenTreeAttachment { String get URL => "stock/attachment/"; @override - InvenTreeModel createFromJson(Map json) { - return InvenTreeStockItemAttachment.fromJson(json); - } + InvenTreeModel createFromJson(Map json) => InvenTreeStockItemAttachment.fromJson(json); } @@ -633,10 +627,6 @@ class InvenTreeStockLocation extends InvenTreeModel { int get itemcount => (jsondata["items"] ?? 0) as int; @override - InvenTreeModel createFromJson(Map json) { + InvenTreeModel createFromJson(Map json) => InvenTreeStockLocation.fromJson(json); - var loc = InvenTreeStockLocation.fromJson(json); - - return loc; - } -} \ No newline at end of file +}