From 58a5fd8188e9d5f294e14783595137550e85fb08 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 18 Sep 2015 09:12:12 +0200 Subject: [PATCH] =?utf8?q?Added=20all=20missing=20fields=20(from=20databas?= =?utf8?q?e)=20+=20updated=20jar=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore.jar | Bin 28781 -> 29624 bytes .../jshopcore/model/customer/Customer.java | 71 ++++++++++++++++ .../model/customer/ShopCustomer.java | 76 ++++++++++++++++++ 3 files changed, 147 insertions(+) diff --git a/lib/jcore.jar b/lib/jcore.jar index 84fd55cbf297f4759a11f63539e65fa2d8a7b388..12190beef63bed67f80a91b64eeee71aede608fc 100644 GIT binary patch delta 7152 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 delta 6396 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 diff --git a/src/org/mxchange/jshopcore/model/customer/Customer.java b/src/org/mxchange/jshopcore/model/customer/Customer.java index 5cf92d3..792d639 100644 --- a/src/org/mxchange/jshopcore/model/customer/Customer.java +++ b/src/org/mxchange/jshopcore/model/customer/Customer.java @@ -16,6 +16,7 @@ */ package org.mxchange.jshopcore.model.customer; +import java.sql.Timestamp; import org.mxchange.jcore.model.contact.Contact; /** @@ -39,6 +40,48 @@ public interface Customer extends Contact { */ public long getContactId(); + /** + * Getter for confirmation key + * + * @return Confirmation key + */ + public String getCustomerConfirmKey (); + + /** + * Setter for confirmation key + * + * @param customerConfirmKey Confirmation key + */ + public void setCustomerConfirmKey (final String customerConfirmKey); + + /** + * Getter for "created" timestamp + * + * @return "created" timestamp + */ + public Timestamp getCustomerCreated (); + + /** + * Setter for "created" timestamp + * + * @param customerCreated "created" timestamp + */ + public void setCustomerCreated (final Timestamp customerCreated); + + /** + * Getter for "locked" timestamp + * + * @return "locked" timestamp + */ + public Timestamp getCustomerLocked (); + + /** + * Getter for "locked" timestamp + * + * @param customerLocked "locked" timestamp + */ + public void setCustomerLocked (final Timestamp customerLocked); + /** * Setter for customer number * @@ -52,4 +95,32 @@ public interface Customer extends Contact { * @return Customer number */ public String getCustomerNumber (); + + /** + * Getter for password hash + * + * @return Password hash + */ + public String getCustomerPasswordHash (); + + /** + * Setter for password hash + * + * @param customerPasswordHash Password hash + */ + public void setCustomerPasswordHash (final String customerPasswordHash); + + /** + * Getter for account status + * + * @return Account status + */ + public String getCustomerStatus (); + + /** + * Setter for account status + * + * @param customerStatus Account status + */ + public void setCustomerStatus (final String customerStatus); } diff --git a/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java b/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java index 7ed3df9..509c06c 100644 --- a/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java +++ b/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java @@ -16,6 +16,7 @@ */ package org.mxchange.jshopcore.model.customer; +import java.sql.Timestamp; import org.mxchange.jcore.model.contact.BaseContact; /** @@ -29,6 +30,21 @@ public class ShopCustomer extends BaseContact implements Customer { */ private long contactId; + /** + * Confirmation key + */ + private String customerConfirmKey; + + /** + * "created" timestamp + */ + private Timestamp customerCreated; + + /** + * "locked" timestamp + */ + private Timestamp customerLocked; + /** * Customer number, this is different to the database entry id. */ @@ -39,6 +55,16 @@ public class ShopCustomer extends BaseContact implements Customer { */ private static final long serialVersionUID = 4_328_454_581_751L; + /** + * Password hash + */ + private String customerPasswordHash; + + /** + * Account status + */ + private String customerStatus; + @Override public long getContactId () { return this.contactId; @@ -49,6 +75,36 @@ public class ShopCustomer extends BaseContact implements Customer { this.contactId = contactId; } + @Override + public String getCustomerConfirmKey () { + return this.customerConfirmKey; + } + + @Override + public void setCustomerConfirmKey (final String customerConfirmKey) { + this.customerConfirmKey = customerConfirmKey; + } + + @Override + public Timestamp getCustomerCreated () { + return this.customerCreated; + } + + @Override + public void setCustomerCreated (final Timestamp customerCreated) { + this.customerCreated = customerCreated; + } + + @Override + public Timestamp getCustomerLocked () { + return this.customerLocked; + } + + @Override + public void setCustomerLocked (final Timestamp customerLocked) { + this.customerLocked = customerLocked; + } + @Override public String getCustomerNumber () { return this.customerNumber; @@ -58,4 +114,24 @@ public class ShopCustomer extends BaseContact implements Customer { public void setCustomerNumber (final String customerNumber) { this.customerNumber = customerNumber; } + + @Override + public String getCustomerPasswordHash () { + return this.customerPasswordHash; + } + + @Override + public void setCustomerPasswordHash (final String customerPasswordHash) { + this.customerPasswordHash = customerPasswordHash; + } + + @Override + public String getCustomerStatus () { + return this.customerStatus; + } + + @Override + public void setCustomerStatus (final String customerStatus) { + this.customerStatus = customerStatus; + } } -- 2.39.5