From 1f83a82f173cd32af99a4dba0264ad64c2fc708c Mon Sep 17 00:00:00 2001 From: localhorst Date: Sun, 21 Jun 2020 00:13:10 +0200 Subject: [PATCH 1/2] removed user.name and use user.defaultDeliveryAddress.name instead --- prototype/e-commerce.db.old | Bin 0 -> 118784 bytes .../action/user/UpdateUserSettingsAction.java | 2 +- .../ecommerce/components/AdminInitializer.java | 4 +++- .../org/hso/ecommerce/entities/user/User.java | 4 ++-- .../templates/intern/customers/id.html | 2 +- .../templates/intern/customers/index.html | 2 +- .../resources/templates/user/settings.html | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 prototype/e-commerce.db.old diff --git a/prototype/e-commerce.db.old b/prototype/e-commerce.db.old new file mode 100644 index 0000000000000000000000000000000000000000..d50844ccbf98e8ab46dadb69409ea87947eca9ac GIT binary patch literal 118784 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

TM#HLeu0%MFjG2B$ku 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 literal 0 HcmV?d00001 diff --git a/prototype/src/main/java/org/hso/ecommerce/action/user/UpdateUserSettingsAction.java b/prototype/src/main/java/org/hso/ecommerce/action/user/UpdateUserSettingsAction.java index ba17181..682649b 100644 --- a/prototype/src/main/java/org/hso/ecommerce/action/user/UpdateUserSettingsAction.java +++ b/prototype/src/main/java/org/hso/ecommerce/action/user/UpdateUserSettingsAction.java @@ -48,7 +48,7 @@ public class UpdateUserSettingsAction { public UpdateResult updateShippingInfo(String salutation, String name, String address) { this.user.salutation = salutation; - this.user.name = name; + this.user.defaultDeliveryAddress.name = name; this.user.defaultDeliveryAddress.addressString = address; this.repository.save(this.user); return new UpdateResult(true); diff --git a/prototype/src/main/java/org/hso/ecommerce/components/AdminInitializer.java b/prototype/src/main/java/org/hso/ecommerce/components/AdminInitializer.java index 579bbe3..4c51129 100644 --- a/prototype/src/main/java/org/hso/ecommerce/components/AdminInitializer.java +++ b/prototype/src/main/java/org/hso/ecommerce/components/AdminInitializer.java @@ -1,6 +1,7 @@ package org.hso.ecommerce.components; import org.hso.ecommerce.entities.booking.PaymentMethod; +import org.hso.ecommerce.entities.shop.Address; import org.hso.ecommerce.entities.user.User; import org.hso.ecommerce.repos.user.UserRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +24,8 @@ public class AdminInitializer { // create first admin user User firstAdmin = new User(); firstAdmin.created = new Timestamp(System.currentTimeMillis()); - firstAdmin.name = "admin"; + firstAdmin.defaultDeliveryAddress = new Address(); + firstAdmin.defaultDeliveryAddress.name = "admin"; firstAdmin.defaultPayment = new PaymentMethod(); firstAdmin.defaultPayment.creditCardNumber = ""; //set empty number firstAdmin.email = "admin"; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java b/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java index e08c2ee..039f456 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java +++ b/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java @@ -23,10 +23,10 @@ public class User { @NotNull @Column(unique = true) public String email; - +/* @Column(insertable = false, updatable = false) public String name; - +*/ public String salutation; public String passwordHash; diff --git a/prototype/src/main/resources/templates/intern/customers/id.html b/prototype/src/main/resources/templates/intern/customers/id.html index 57263dc..6e76a3c 100644 --- a/prototype/src/main/resources/templates/intern/customers/id.html +++ b/prototype/src/main/resources/templates/intern/customers/id.html @@ -41,7 +41,7 @@ Name - + E-Mail diff --git a/prototype/src/main/resources/templates/intern/customers/index.html b/prototype/src/main/resources/templates/intern/customers/index.html index cd95093..f06cd1b 100644 --- a/prototype/src/main/resources/templates/intern/customers/index.html +++ b/prototype/src/main/resources/templates/intern/customers/index.html @@ -42,7 +42,7 @@ - + diff --git a/prototype/src/main/resources/templates/user/settings.html b/prototype/src/main/resources/templates/user/settings.html index 3e71125..3022494 100644 --- a/prototype/src/main/resources/templates/user/settings.html +++ b/prototype/src/main/resources/templates/user/settings.html @@ -70,7 +70,7 @@

-
-- 2.44.0 From b846b919b7445e679b8ca509ad3bc42de2030655 Mon Sep 17 00:00:00 2001 From: localhorst Date: Sun, 21 Jun 2020 00:14:00 +0200 Subject: [PATCH 2/2] code clean up --- .../src/main/java/org/hso/ecommerce/entities/user/User.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java b/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java index 039f456..5b031f4 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java +++ b/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java @@ -23,10 +23,7 @@ public class User { @NotNull @Column(unique = true) public String email; -/* - @Column(insertable = false, updatable = false) - public String name; -*/ + public String salutation; public String passwordHash; -- 2.44.0