From 4cb6d7ba58c66143329483b47951b31409a57ad7 Mon Sep 17 00:00:00 2001 From: Najim Date: Tue, 11 Dec 2018 11:31:22 +0000 Subject: [PATCH 1/2] change address to addresses in user --- src/main/scala/com/particeep/api/models/user/User.scala | 2 +- src/main/scala/com/particeep/api/models/user/UserCreation.scala | 2 +- src/main/scala/com/particeep/api/models/user/UserData.scala | 1 - src/main/scala/com/particeep/api/models/user/UserEdition.scala | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/scala/com/particeep/api/models/user/User.scala b/src/main/scala/com/particeep/api/models/user/User.scala index 8b2a0e2..aa309ee 100644 --- a/src/main/scala/com/particeep/api/models/user/User.scala +++ b/src/main/scala/com/particeep/api/models/user/User.scala @@ -30,7 +30,7 @@ case class User( allow_mail_notifications: Option[Boolean] = None, does_pay_taxes: Option[Boolean] = None, has_been_claimed: Option[Boolean] = None, - address: Option[Address] = None, + addresses: Seq[Address] = Seq(), tag: Option[String] = None, custom: Option[JsObject] = None ) diff --git a/src/main/scala/com/particeep/api/models/user/UserCreation.scala b/src/main/scala/com/particeep/api/models/user/UserCreation.scala index 18045c5..f8b7961 100644 --- a/src/main/scala/com/particeep/api/models/user/UserCreation.scala +++ b/src/main/scala/com/particeep/api/models/user/UserCreation.scala @@ -28,7 +28,7 @@ case class UserCreation( viadeo_url: Option[String] = None, allow_mail_notifications: Option[Boolean] = None, does_pay_taxes: Option[Boolean] = None, - address: Option[Address] = None, + addresses: Seq[Address] = Seq(), tag: Option[String] = None, custom: Option[JsObject] = None ) diff --git a/src/main/scala/com/particeep/api/models/user/UserData.scala b/src/main/scala/com/particeep/api/models/user/UserData.scala index df887fa..a744055 100644 --- a/src/main/scala/com/particeep/api/models/user/UserData.scala +++ b/src/main/scala/com/particeep/api/models/user/UserData.scala @@ -30,7 +30,6 @@ case class UserData( does_pay_taxes: Option[Boolean] = None, has_been_claimed: Option[Boolean] = Some(true), city: Option[String] = None, - address_id: Option[String] = None, wallet_id: Option[String] = None, wallet_updated_at: Option[ZonedDateTime] = None, wallet_type: Option[String] = None, diff --git a/src/main/scala/com/particeep/api/models/user/UserEdition.scala b/src/main/scala/com/particeep/api/models/user/UserEdition.scala index 37f6bb4..4eb19f8 100644 --- a/src/main/scala/com/particeep/api/models/user/UserEdition.scala +++ b/src/main/scala/com/particeep/api/models/user/UserEdition.scala @@ -25,7 +25,7 @@ case class UserEdition( viadeo_url: Option[String] = None, allow_mail_notifications: Option[Boolean] = None, does_pay_taxes: Option[Boolean] = None, - address: Option[Address] = None, + addresses: Seq[Address] = Seq(), tag: Option[String] = None, custom: Option[JsObject] = None ) From 034f14aaac6ad7593d0094fb9853f0189f958de1 Mon Sep 17 00:00:00 2001 From: Najim Date: Wed, 12 Dec 2018 15:02:22 +0000 Subject: [PATCH 2/2] addresses to option --- src/main/scala/com/particeep/api/models/user/User.scala | 2 +- src/main/scala/com/particeep/api/models/user/UserCreation.scala | 2 +- src/main/scala/com/particeep/api/models/user/UserEdition.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/com/particeep/api/models/user/User.scala b/src/main/scala/com/particeep/api/models/user/User.scala index aa309ee..c327554 100644 --- a/src/main/scala/com/particeep/api/models/user/User.scala +++ b/src/main/scala/com/particeep/api/models/user/User.scala @@ -30,7 +30,7 @@ case class User( allow_mail_notifications: Option[Boolean] = None, does_pay_taxes: Option[Boolean] = None, has_been_claimed: Option[Boolean] = None, - addresses: Seq[Address] = Seq(), + addresses: Option[Seq[Address]] = None, tag: Option[String] = None, custom: Option[JsObject] = None ) diff --git a/src/main/scala/com/particeep/api/models/user/UserCreation.scala b/src/main/scala/com/particeep/api/models/user/UserCreation.scala index f8b7961..baf230e 100644 --- a/src/main/scala/com/particeep/api/models/user/UserCreation.scala +++ b/src/main/scala/com/particeep/api/models/user/UserCreation.scala @@ -28,7 +28,7 @@ case class UserCreation( viadeo_url: Option[String] = None, allow_mail_notifications: Option[Boolean] = None, does_pay_taxes: Option[Boolean] = None, - addresses: Seq[Address] = Seq(), + addresses: Option[Seq[Address]] = None, tag: Option[String] = None, custom: Option[JsObject] = None ) diff --git a/src/main/scala/com/particeep/api/models/user/UserEdition.scala b/src/main/scala/com/particeep/api/models/user/UserEdition.scala index 4eb19f8..6c453fe 100644 --- a/src/main/scala/com/particeep/api/models/user/UserEdition.scala +++ b/src/main/scala/com/particeep/api/models/user/UserEdition.scala @@ -25,7 +25,7 @@ case class UserEdition( viadeo_url: Option[String] = None, allow_mail_notifications: Option[Boolean] = None, does_pay_taxes: Option[Boolean] = None, - addresses: Seq[Address] = Seq(), + addresses: Option[Seq[Address]] = None, tag: Option[String] = None, custom: Option[JsObject] = None )