From 103ebe7de7096cb2baf966317723a82caa788a06 Mon Sep 17 00:00:00 2001 From: Najim Date: Tue, 30 Jul 2019 19:45:34 +0000 Subject: [PATCH] add is_pro in user and required_pro in fund/fundraise_equity --- .../com/particeep/api/models/fundraise/FundraiseData.scala | 3 ++- .../api/models/fundraise/equity/FundraiseEquity.scala | 1 + .../models/fundraise/equity/FundraiseEquityCreation.scala | 1 + .../models/fundraise/equity/FundraiseEquityEdition.scala | 1 + src/main/scala/com/particeep/api/models/user/User.scala | 1 + .../scala/com/particeep/api/models/user/UserCreation.scala | 6 ++++-- src/main/scala/com/particeep/api/models/user/UserData.scala | 1 + .../scala/com/particeep/api/models/user/UserEdition.scala | 1 + .../scala/com/particeep/api/models/user/UserSearch.scala | 3 ++- 9 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/scala/com/particeep/api/models/fundraise/FundraiseData.scala b/src/main/scala/com/particeep/api/models/fundraise/FundraiseData.scala index ee5f1ae..33f506b 100644 --- a/src/main/scala/com/particeep/api/models/fundraise/FundraiseData.scala +++ b/src/main/scala/com/particeep/api/models/fundraise/FundraiseData.scala @@ -34,7 +34,8 @@ case class FundraiseData( score: Option[String] = None, visible: Option[Boolean] = None, private_group_id: Option[String] = None, - targeting_roles: Option[String] = None + targeting_roles: Option[String] = None, + required_pro: Option[Boolean] = None ) object FundraiseData { diff --git a/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquity.scala b/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquity.scala index e808477..c7adf91 100644 --- a/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquity.scala +++ b/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquity.scala @@ -32,6 +32,7 @@ case class FundraiseEquity( custom: Option[JsObject] = None, restricted_to_group: Option[String] = None, private_group_id: Option[String] = None, + required_pro: Option[Boolean] = None, offer: EquityOffer = EquityOffer() ) diff --git a/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquityCreation.scala b/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquityCreation.scala index fa98c00..4065e47 100644 --- a/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquityCreation.scala +++ b/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquityCreation.scala @@ -26,6 +26,7 @@ case class FundraiseEquityCreation( tag: Option[String] = None, custom: Option[JsObject] = None, restricted_to_group: Option[String] = None, + required_pro: Option[Boolean] = None, offer: Option[EquityOffer] = None ) diff --git a/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquityEdition.scala b/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquityEdition.scala index 303cbc9..ab6d930 100644 --- a/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquityEdition.scala +++ b/src/main/scala/com/particeep/api/models/fundraise/equity/FundraiseEquityEdition.scala @@ -25,6 +25,7 @@ case class FundraiseEquityEdition( tag: Option[String] = None, custom: Option[JsObject] = None, restricted_to_group: Option[String] = None, + required_pro: Option[Boolean] = None, offer: Option[EquityOffer] = None ) 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..4d7cad1 100644 --- a/src/main/scala/com/particeep/api/models/user/User.scala +++ b/src/main/scala/com/particeep/api/models/user/User.scala @@ -31,6 +31,7 @@ case class User( does_pay_taxes: Option[Boolean] = None, has_been_claimed: Option[Boolean] = None, address: Option[Address] = None, + is_pro: Option[Boolean] = 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 18045c5..0ac4a9f 100644 --- a/src/main/scala/com/particeep/api/models/user/UserCreation.scala +++ b/src/main/scala/com/particeep/api/models/user/UserCreation.scala @@ -6,7 +6,8 @@ import com.particeep.api.core.Formatter import com.particeep.api.models.Address import com.particeep.api.models.enums.Gender.Gender import com.particeep.api.models.enums.InvestorType.InvestorType -import play.api.libs.json.{ JsObject, Json } +import play.api.libs.json.JsObject +import ai.x.play.json.Jsonx case class UserCreation( email: String, @@ -29,11 +30,12 @@ case class UserCreation( allow_mail_notifications: Option[Boolean] = None, does_pay_taxes: Option[Boolean] = None, address: Option[Address] = None, + is_pro: Option[Boolean] = None, tag: Option[String] = None, custom: Option[JsObject] = None ) object UserCreation { implicit val date_format = Formatter.ZonedDateTimeWrites - val format = Json.format[UserCreation] + val format = Jsonx.formatCaseClass[UserCreation] } 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..865e6e9 100644 --- a/src/main/scala/com/particeep/api/models/user/UserData.scala +++ b/src/main/scala/com/particeep/api/models/user/UserData.scala @@ -38,6 +38,7 @@ case class UserData( roles: Option[String] = None, targeting_roles: Option[String] = None, investor_score: Option[Long] = None, + is_pro: Option[Boolean] = 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 37f6bb4..1bf91db 100644 --- a/src/main/scala/com/particeep/api/models/user/UserEdition.scala +++ b/src/main/scala/com/particeep/api/models/user/UserEdition.scala @@ -26,6 +26,7 @@ case class UserEdition( allow_mail_notifications: Option[Boolean] = None, does_pay_taxes: Option[Boolean] = None, address: Option[Address] = None, + is_pro: Option[Boolean] = None, tag: Option[String] = None, custom: Option[JsObject] = None ) diff --git a/src/main/scala/com/particeep/api/models/user/UserSearch.scala b/src/main/scala/com/particeep/api/models/user/UserSearch.scala index 314fed6..fe5b711 100644 --- a/src/main/scala/com/particeep/api/models/user/UserSearch.scala +++ b/src/main/scala/com/particeep/api/models/user/UserSearch.scala @@ -22,5 +22,6 @@ case class UserSearch( tag: Option[String] = None, roles: Option[String] = None, targeting_roles: Option[String] = None, - ids: Option[String] = None + ids: Option[String] = None, + is_pro: Option[Boolean] = None )