From b0726b4199756a5bb04019ed580506e3c6520532 Mon Sep 17 00:00:00 2001 From: Gilbert Kimutai Date: Fri, 15 Feb 2019 07:55:11 +0300 Subject: [PATCH] Added Customer and order services and reviewed coupon model --- app/build.gradle | 2 +- .../java/me/gilo/woodroid/Woocommerce.java | 10 +- .../java/me/gilo/woodroid/models/Coupon.java | 307 +++++++++++------- .../{CouponData.java => CouponService.java} | 4 +- .../woodroid/services/CustomerService.java | 42 +++ .../gilo/woodroid/services/OrderService.java | 42 +++ 6 files changed, 285 insertions(+), 122 deletions(-) rename woodroid/src/main/java/me/gilo/woodroid/services/{CouponData.java => CouponService.java} (88%) create mode 100644 woodroid/src/main/java/me/gilo/woodroid/services/CustomerService.java create mode 100644 woodroid/src/main/java/me/gilo/woodroid/services/OrderService.java diff --git a/app/build.gradle b/app/build.gradle index 61ba494..65eb202 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' - compile project(path: ':woodroid') + implementation project(path: ':woodroid') implementation 'com.squareup.retrofit2:retrofit:2.3.0' } diff --git a/woodroid/src/main/java/me/gilo/woodroid/Woocommerce.java b/woodroid/src/main/java/me/gilo/woodroid/Woocommerce.java index e7a6aea..4a3daad 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/Woocommerce.java +++ b/woodroid/src/main/java/me/gilo/woodroid/Woocommerce.java @@ -2,7 +2,7 @@ package me.gilo.woodroid; import me.gilo.woodroid.models.Product; import me.gilo.woodroid.repo.ProductRepository; -import me.gilo.woodroid.services.CouponData; +import me.gilo.woodroid.services.CouponService; import retrofit2.Call; import java.util.List; @@ -16,7 +16,7 @@ public class Woocommerce { private String consumerSecret; final ProductRepository productRepository; - final CouponData couponData; + final CouponService couponService; public Woocommerce(String siteUrl, String apiVerion, String consumerKey, String consumerSecret) { this.siteUrl = siteUrl; @@ -27,7 +27,7 @@ public class Woocommerce { this.baseUrl = siteUrl + "/wp-json/wc/v" + apiVerion + "/"; productRepository = new ProductRepository(baseUrl, consumerKey, consumerSecret); - couponData = new CouponData(baseUrl, consumerKey, consumerSecret); + couponService = new CouponService(baseUrl, consumerKey, consumerSecret); } @@ -72,7 +72,7 @@ public class Woocommerce { return productRepository.products(); } - public CouponData Coupon() { - return couponData; + public CouponService Coupon() { + return couponService; } } diff --git a/woodroid/src/main/java/me/gilo/woodroid/models/Coupon.java b/woodroid/src/main/java/me/gilo/woodroid/models/Coupon.java index 8f944c3..b4a1d76 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/models/Coupon.java +++ b/woodroid/src/main/java/me/gilo/woodroid/models/Coupon.java @@ -2,59 +2,42 @@ package me.gilo.woodroid.models; import java.io.Serializable; -/** - * Created by Aron on 1/24/2016. - */ public class Coupon implements Serializable{ - private String[] customer_emails; - private double maximum_amount; - private int usage_limit_per_user; - private String exclude_sale_items; - private String code; - private boolean individual_use; - private String type; - private int[] product_ids; - private int amount; - private int limit_usage_to_x_items; - private int[] product_category_ids; - private String description; - private double minimum_amount; - private String expiry_date; - private int[] exclude_product_ids; - private boolean enable_free_shipping; - private int[] exclude_product_category_ids; private int usage_limit; - public String[] getCustomer_emails() { - return customer_emails; + private String code; + private String free_shipping; + private String description; + private String minimum_amount; + private String[] email_restrictions; + private String exclude_sale_items; + private String[] excluded_product_ids; + private String usage_count; + private String individual_use; + private int usage_limit_per_user; + private int limit_usage_to_x_items; + private String[] meta_data; + private String id; + private String date_modified_gmt; + private String amount; + private String date_created; + private String date_created_gmt; + private String maximum_amount; + private String discount_type; + private String[] used_by; + private String date_modified; + private String[] product_ids; + private String[] product_categories; + private String date_expires; + private String[] excluded_product_categories; + private String date_expires_gmt; + + public int getUsage_limit() { + return usage_limit; } - public void setCustomer_emails(String[] customer_emails) { - this.customer_emails = customer_emails; - } - - public double getMaximum_amount() { - return maximum_amount; - } - - public void setMaximum_amount(double maximum_amount) { - this.maximum_amount = maximum_amount; - } - - public int getUsage_limit_per_user() { - return usage_limit_per_user; - } - - public void setUsage_limit_per_user(int usage_limit_per_user) { - this.usage_limit_per_user = usage_limit_per_user; - } - - public String getExclude_sale_items() { - return exclude_sale_items; - } - - public void setExclude_sale_items(String exclude_sale_items) { - this.exclude_sale_items = exclude_sale_items; + public void setUsage_limit(int usage_limit) { + this.usage_limit = usage_limit; } public String getCode() { @@ -65,52 +48,12 @@ public class Coupon implements Serializable{ this.code = code; } - public boolean isIndividual_use() { - return individual_use; + public String getFree_shipping() { + return free_shipping; } - public void setIndividual_use(boolean individual_use) { - this.individual_use = individual_use; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public int[] getProduct_ids() { - return product_ids; - } - - public void setProduct_ids(int[] product_ids) { - this.product_ids = product_ids; - } - - public int getAmount() { - return amount; - } - - public void setAmount(int amount) { - this.amount = amount; - } - - public int getLimit_usage_to_x_items() { - return limit_usage_to_x_items; - } - - public void setLimit_usage_to_x_items(int limit_usage_to_x_items) { - this.limit_usage_to_x_items = limit_usage_to_x_items; - } - - public int[] getProduct_category_ids() { - return product_category_ids; - } - - public void setProduct_category_ids(int[] product_category_ids) { - this.product_category_ids = product_category_ids; + public void setFree_shipping(String free_shipping) { + this.free_shipping = free_shipping; } public String getDescription() { @@ -121,51 +64,187 @@ public class Coupon implements Serializable{ this.description = description; } - public double getMinimum_amount() { + public String getMinimum_amount() { return minimum_amount; } - public void setMinimum_amount(double minimum_amount) { + public void setMinimum_amount(String minimum_amount) { this.minimum_amount = minimum_amount; } - public String getExpiry_date() { - return expiry_date; + public String[] getEmail_restrictions() { + return email_restrictions; } - public void setExpiry_date(String expiry_date) { - this.expiry_date = expiry_date; + public void setEmail_restrictions(String[] email_restrictions) { + this.email_restrictions = email_restrictions; } - public int[] getExclude_product_ids() { - return exclude_product_ids; + public String getExclude_sale_items() { + return exclude_sale_items; } - public void setExclude_product_ids(int[] exclude_product_ids) { - this.exclude_product_ids = exclude_product_ids; + public void setExclude_sale_items(String exclude_sale_items) { + this.exclude_sale_items = exclude_sale_items; } - public boolean isEnable_free_shipping() { - return enable_free_shipping; + public String[] getExcluded_product_ids() { + return excluded_product_ids; } - public void setEnable_free_shipping(boolean enable_free_shipping) { - this.enable_free_shipping = enable_free_shipping; + public void setExcluded_product_ids(String[] excluded_product_ids) { + this.excluded_product_ids = excluded_product_ids; } - public int[] getExclude_product_category_ids() { - return exclude_product_category_ids; + public String getUsage_count() { + return usage_count; } - public void setExclude_product_category_ids(int[] exclude_product_category_ids) { - this.exclude_product_category_ids = exclude_product_category_ids; + public void setUsage_count(String usage_count) { + this.usage_count = usage_count; } - public int getUsage_limit() { - return usage_limit; + public String getIndividual_use() { + return individual_use; } - public void setUsage_limit(int usage_limit) { - this.usage_limit = usage_limit; + public void setIndividual_use(String individual_use) { + this.individual_use = individual_use; + } + + public int getUsage_limit_per_user() { + return usage_limit_per_user; + } + + public void setUsage_limit_per_user(int usage_limit_per_user) { + this.usage_limit_per_user = usage_limit_per_user; + } + + public int getLimit_usage_to_x_items() { + return limit_usage_to_x_items; + } + + public void setLimit_usage_to_x_items(int limit_usage_to_x_items) { + this.limit_usage_to_x_items = limit_usage_to_x_items; + } + + public String[] getMeta_data() { + return meta_data; + } + + public void setMeta_data(String[] meta_data) { + this.meta_data = meta_data; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getDate_modified_gmt() { + return date_modified_gmt; + } + + public void setDate_modified_gmt(String date_modified_gmt) { + this.date_modified_gmt = date_modified_gmt; + } + + public String getAmount() { + return amount; + } + + public void setAmount(String amount) { + this.amount = amount; + } + + public String getDate_created() { + return date_created; + } + + public void setDate_created(String date_created) { + this.date_created = date_created; + } + + public String getDate_created_gmt() { + return date_created_gmt; + } + + public void setDate_created_gmt(String date_created_gmt) { + this.date_created_gmt = date_created_gmt; + } + + public String getMaximum_amount() { + return maximum_amount; + } + + public void setMaximum_amount(String maximum_amount) { + this.maximum_amount = maximum_amount; + } + + public String getDiscount_type() { + return discount_type; + } + + public void setDiscount_type(String discount_type) { + this.discount_type = discount_type; + } + + public String[] getUsed_by() { + return used_by; + } + + public void setUsed_by(String[] used_by) { + this.used_by = used_by; + } + + public String getDate_modified() { + return date_modified; + } + + public void setDate_modified(String date_modified) { + this.date_modified = date_modified; + } + + public String[] getProduct_ids() { + return product_ids; + } + + public void setProduct_ids(String[] product_ids) { + this.product_ids = product_ids; + } + + public String[] getProduct_categories() { + return product_categories; + } + + public void setProduct_categories(String[] product_categories) { + this.product_categories = product_categories; + } + + public String getDate_expires() { + return date_expires; + } + + public void setDate_expires(String date_expires) { + this.date_expires = date_expires; + } + + public String[] getExcluded_product_categories() { + return excluded_product_categories; + } + + public void setExcluded_product_categories(String[] excluded_product_categories) { + this.excluded_product_categories = excluded_product_categories; + } + + public String getDate_expires_gmt() { + return date_expires_gmt; + } + + public void setDate_expires_gmt(String date_expires_gmt) { + this.date_expires_gmt = date_expires_gmt; } } diff --git a/woodroid/src/main/java/me/gilo/woodroid/services/CouponData.java b/woodroid/src/main/java/me/gilo/woodroid/services/CouponService.java similarity index 88% rename from woodroid/src/main/java/me/gilo/woodroid/services/CouponData.java rename to woodroid/src/main/java/me/gilo/woodroid/services/CouponService.java index ab1bcfd..41c9f19 100644 --- a/woodroid/src/main/java/me/gilo/woodroid/services/CouponData.java +++ b/woodroid/src/main/java/me/gilo/woodroid/services/CouponService.java @@ -6,11 +6,11 @@ import retrofit2.Call; import java.util.List; -public class CouponData { +public class CouponService { final CouponRepository couponRepository; - public CouponData(String baseUrl, String consumerKey, String consumerSecret) { + public CouponService(String baseUrl, String consumerKey, String consumerSecret) { couponRepository = new CouponRepository(baseUrl, consumerKey, consumerSecret); } diff --git a/woodroid/src/main/java/me/gilo/woodroid/services/CustomerService.java b/woodroid/src/main/java/me/gilo/woodroid/services/CustomerService.java new file mode 100644 index 0000000..8e8a97b --- /dev/null +++ b/woodroid/src/main/java/me/gilo/woodroid/services/CustomerService.java @@ -0,0 +1,42 @@ +package me.gilo.woodroid.services; + +import me.gilo.woodroid.models.Customer; +import me.gilo.woodroid.repo.CustomerRepository; +import retrofit2.Call; + +import java.util.List; + +public class CustomerService { + + final CustomerRepository customerRepository; + + public CustomerService(String baseUrl, String consumerKey, String consumerSecret) { + customerRepository = new CustomerRepository(baseUrl, consumerKey, consumerSecret); + } + + public Call create(Customer customer) { + return customerRepository.create(customer); + } + + + public Call customer(int id) { + return customerRepository.customer(id); + } + + public Call> customers() { + return customerRepository.customers(); + } + + public Call update(int id, Customer customer) { + return customerRepository.update(id, customer); + } + + public Call delete(int id) { + return customerRepository.delete(id); + } + + public Call delete(int id, boolean force) { + return customerRepository.delete(id, force); + } + +} diff --git a/woodroid/src/main/java/me/gilo/woodroid/services/OrderService.java b/woodroid/src/main/java/me/gilo/woodroid/services/OrderService.java new file mode 100644 index 0000000..98e37d3 --- /dev/null +++ b/woodroid/src/main/java/me/gilo/woodroid/services/OrderService.java @@ -0,0 +1,42 @@ +package me.gilo.woodroid.services; + +import me.gilo.woodroid.models.Order; +import me.gilo.woodroid.repo.OrderRepository; +import retrofit2.Call; + +import java.util.List; + +public class OrderService { + + final OrderRepository orderRepository; + + public OrderService(String baseUrl, String consumerKey, String consumerSecret) { + orderRepository = new OrderRepository(baseUrl, consumerKey, consumerSecret); + } + + public Call create(Order order) { + return orderRepository.create(order); + } + + + public Call order(int id) { + return orderRepository.order(id); + } + + public Call> orders() { + return orderRepository.orders(); + } + + public Call update(int id, Order order) { + return orderRepository.update(id, order); + } + + public Call delete(int id) { + return orderRepository.delete(id); + } + + public Call delete(int id, boolean force) { + return orderRepository.delete(id, force); + } + +}