Skip to content

Feature/licensing infrastructure #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fupelaqu merged 3 commits into from
Apr 16, 2026
Merged

Feature/licensing infrastructure #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a820fce
Merge branch 'main' into feature/licensingInfrastructure
fupelaqu Apr 14, 2026
8acc97b
feat: add NaturalUser name/additionalProperties fields and Stripe Tax…
fupelaqu Apr 16, 2026
06029a3
chore: update stripe-java version upgrade notes in build.sbt
fupelaqu Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ThisBuild / organization := "app.softnetwork"

name := "payment"

ThisBuild / version := "0.9.1"
ThisBuild / version := "0.9.2"

ThisBuild / scalaVersion := scala212

Expand Down
8 changes: 5 additions & 3 deletions client/src/main/protobuf/model/payment/paymentUser.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ message NaturalUser {
option (scalapb.message).extends = "ProtobufDomainObject";
option (scalapb.message).extends = "NaturalUserDecorator";
option (scalapb.message).companion_extends = "NaturalUserCompanion";
required string firstName = 1;
required string lastName = 2;
required string firstName = 1 [default = ""];
required string lastName = 2 [default = ""];
required string email = 3;
required string nationality = 4 [default = "FR"];
required string birthday = 5;
required string birthday = 5 [default = ""];
required string countryOfResidence = 6 [default = "FR"];
optional string userId = 7;
optional string walletId = 8;
Expand All @@ -98,6 +98,8 @@ message NaturalUser {
optional string phone = 14;
optional Business business = 15;
optional string title = 16;
optional string name = 17;
map<string, string> additionalProperties = 18;
}

message LegalUser {
Expand Down
8 changes: 6 additions & 2 deletions client/src/main/scala/app/softnetwork/payment/model/NaturalUserDecorator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ case class NaturalUserView(
address: Option[Address] = None,
phone: Option[String] = None,
business: Option[Business] = None,
title: Option[String] = None
title: Option[String] = None,
name: Option[String] = None,
additionalProperties: Map[String, String] = Map.empty
) extends User

object NaturalUserView {
Expand All @@ -42,7 +44,9 @@ object NaturalUserView {
address,
phone,
business,
title
title,
paymentUser.name,
paymentUser.additionalProperties
)
}
}
4 changes: 4 additions & 0 deletions common/src/main/protobuf/message/payment/payment.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,10 @@ message PaymentAccountCreatedOrUpdatedEvent {
required string externalUuid = 1;
required google.protobuf.Timestamp lastUpdated = 2 [(scalapb.field).type = "java.time.Instant"];
optional string profile = 3;
oneof user {
app.softnetwork.payment.model.NaturalUser naturalUser = 4;
app.softnetwork.payment.model.LegalUser legalUser = 5;
}
}

message CancelMandateCommandEvent {
Expand Down
21 changes: 19 additions & 2 deletions core/src/main/scala/app/softnetwork/payment/persistence/typed/PaymentBehavior.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ trait PaymentBehavior

override protected val manifestWrapper: ManifestW = ManifestW()

private def toEventUser(
user: PaymentAccount.User
): PaymentAccountCreatedOrUpdatedEvent.User = user match {
case PaymentAccount.User.NaturalUser(value) =>
PaymentAccountCreatedOrUpdatedEvent.User.NaturalUser(value)
case PaymentAccount.User.LegalUser(value) =>
PaymentAccountCreatedOrUpdatedEvent.User.LegalUser(value)
case _ =>
PaymentAccountCreatedOrUpdatedEvent.User.Empty
}

def paymentDao: PaymentDao = PaymentDao

def softPayAccountDao: SoftPayAccountDao = SoftPayAccountDao
Expand Down Expand Up @@ -283,7 +294,10 @@ trait PaymentBehavior
PaymentAccountCreatedOrUpdatedEvent.defaultInstance
.withLastUpdated(lastUpdated)
.withExternalUuid(updatedPaymentAccount.externalUuid)
.copy(profile = updatedPaymentAccount.profile)
.copy(
profile = updatedPaymentAccount.profile,
user = toEventUser(updatedPaymentAccount.user)
)
) :+
PaymentAccountUpsertedEvent.defaultInstance
.withDocument(updatedPaymentAccount)
Expand Down Expand Up @@ -1376,7 +1390,10 @@ trait PaymentBehavior
PaymentAccountCreatedOrUpdatedEvent.defaultInstance
.withLastUpdated(lastUpdated)
.withExternalUuid(updatedPaymentAccount.externalUuid)
.copy(profile = updatedPaymentAccount.profile)
.copy(
profile = updatedPaymentAccount.profile,
user = toEventUser(updatedPaymentAccount.user)
)
)

if (
Expand Down
2 changes: 1 addition & 1 deletion stripe/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ name := "stripe-core"

libraryDependencies ++= Seq(
// stripe
"com.stripe" % "stripe-java" % "26.12.0" // TODO upgrade to v31.4.1
"com.stripe" % "stripe-java" % "26.12.0" // TODO upgrade to v27.1.2, v28.4.0, v29.5.0, v30.2.0 and then v31.4.1
)
Loading
Loading