Skip to content

Commit

Permalink
Add is_distribution_contact booleans to backend
Browse files Browse the repository at this point in the history
  • Loading branch information
@VincentAntoine
VincentAntoine committed Apr 25, 2024
1 parent 0bbb4ad commit d7c3078
Show file tree
Hide file tree
Showing 10 changed files with 74 additions and 16 deletions.
2 changes: 2 additions & 0 deletions ...n/kotlin/fr/gouv/cacem/monitorenv/domain/entities/controlUnit/ControlUnitContactEntity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ data class ControlUnitContactEntity(
val email: String? = null,
val name: String,
val phone: String? = null,
val isEmailDistributionContact: Boolean? = false,
val isSmsDistributionContact: Boolean? = false,
)
5 changes: 4 additions & 1 deletion ...infrastructure/api/adapters/publicapi/inputs/CreateOrUpdateControlUnitContactDataInput.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ data class CreateOrUpdateControlUnitContactDataInput(
val email: String? = null,
val name: String,
val phone: String? = null,
val isEmailDistributionContact: Boolean? = false,
val isSmsDistributionContact: Boolean? = false,
) {
fun toControlUnitContact(): ControlUnitContactEntity {
return ControlUnitContactEntity(
Expand All @@ -16,6 +18,7 @@ data class CreateOrUpdateControlUnitContactDataInput(
email = this.email,
name = this.name,
phone = this.phone,
)
isEmailDistributionContact = this.isEmailDistributionContact,
isSmsDistributionContact = this.isSmsDistributionContact)
}
}
4 changes: 4 additions & 0 deletions ...itorenv/infrastructure/api/adapters/publicapi/outputs/FullControlUnitContactDataOutput.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ data class FullControlUnitContactDataOutput(
val email: String? = null,
val name: String,
val phone: String? = null,
val isEmailDistributionContact: Boolean? = false,
val isSmsDistributionContact: Boolean? = false,
) {
companion object {
fun fromFullControlUnitContact(
Expand All @@ -23,6 +25,8 @@ data class FullControlUnitContactDataOutput(
email = fullControlUnitContact.controlUnitContact.email,
name = fullControlUnitContact.controlUnitContact.name,
phone = fullControlUnitContact.controlUnitContact.phone,
isEmailDistributionContact = fullControlUnitContact.controlUnitContact.isEmailDistributionContact,
isSmsDistributionContact = fullControlUnitContact.controlUnitContact.isSmsDistributionContact,
)
}
}
Expand Down
15 changes: 13 additions & 2 deletions .../kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/ControlUnitContactModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,14 @@ data class ControlUnitContactModel(
@Column(name = "updated_at_utc", nullable = false)
@UpdateTimestamp
val updatedAtUtc: Instant? = null,
) {

@Column(name = "is_email_distribution_contact", nullable = false)
val isEmailDistributionContact: Boolean? = false,

@Column(name = "is_sms_distribution_contact", nullable = false)
val isSmsDistributionContact: Boolean? = false,

) {
companion object {
fun fromControlUnitContact(
controlUnitContact: ControlUnitContactEntity,
Expand All @@ -49,6 +56,8 @@ data class ControlUnitContactModel(
email = controlUnitContact.email,
name = controlUnitContact.name,
phone = controlUnitContact.phone,
isEmailDistributionContact = controlUnitContact.isEmailDistributionContact,
isSmsDistributionContact = controlUnitContact.isSmsDistributionContact,
)
}
}
Expand All @@ -60,6 +69,8 @@ data class ControlUnitContactModel(
email,
name,
phone,
isEmailDistributionContact,
isSmsDistributionContact,
)
}

Expand All @@ -72,6 +83,6 @@ data class ControlUnitContactModel(

@Override
override fun toString(): String {
return this::class.simpleName + "(id = $id , controlUnitId = ${controlUnit.id} , email = $email , name = $name , phone = $phone)"
return this::class.simpleName + "(id = $id , controlUnitId = ${controlUnit.id} , email = $email , name = $name , phone = $phone, isEmailDistributionContact = $isEmailDistributionContact, isSmsDistributionContact = $isSmsDistributionContact)"
}
}
8 changes: 4 additions & 4 deletions backend/src/main/resources/db/testdata/V666.07__insert_dummy_control_units.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ INSERT INTO public.control_units(
SELECT setval('control_units_id_seq', (SELECT max(id) FROM control_units), true);

INSERT INTO public.control_unit_contacts
( id, control_unit_id, name)
( id, control_unit_id, name, email, phone, is_email_distribution_contact,is_sms_distribution_contact)
VALUES
( 1, 10000, 'Contact 1'),
( 2, 10000, 'Contact 2'),
( 3, 10003, 'Contact 3');
( 1, 10000, 'Contact 1', 'email_1', '06 01 xx xx xx', true, false),
( 2, 10000, 'Contact 2', null, '06 02 xx xx xx', false, true),
( 3, 10003, 'Contact 3', 'email_3', null, false, true);

SELECT setval('control_unit_contacts_id_seq', 3, true);

Expand Down
2 changes: 2 additions & 0 deletions .../fr/gouv/cacem/monitorenv/domain/use_cases/controlUnit/GetControlUnitContactByIdUTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ class GetControlUnitContactByIdUTests {
email = null,
name = "Control Unit Contact Name",
phone = null,
isEmailDistributionContact = false,
isSmsDistributionContact = true,
),
)

Expand Down
4 changes: 4 additions & 0 deletions ...lin/fr/gouv/cacem/monitorenv/domain/use_cases/controlUnit/GetControlUnitContactsUTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class GetControlUnitContactsUTests {
email = "contact1@example.com",
name = "Contact 1",
phone = "123-456-7890",
isEmailDistributionContact = true,
isSmsDistributionContact = false
),
),
FullControlUnitContactDTO(
Expand All @@ -54,6 +56,8 @@ class GetControlUnitContactsUTests {
email = "contact2@example.com",
name = "Contact 2",
phone = "098-765-4321",
isEmailDistributionContact = false,
isSmsDistributionContact = true
),
),
)
Expand Down
10 changes: 10 additions & 0 deletions ...gouv/cacem/monitorenv/infrastructure/api/endpoints/publicapi/ControlUnitContactsITests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class ControlUnitContactsITests {
email = null,
name = "Contact Name",
phone = null,
isEmailDistributionContact = true,
isSmsDistributionContact = false,
)

val newControlUnitContactData = CreateOrUpdateControlUnitContactDataInput(
Expand Down Expand Up @@ -98,6 +100,8 @@ class ControlUnitContactsITests {
email = null,
name = "Contact Name",
phone = null,
isEmailDistributionContact = true,
isSmsDistributionContact = false,
),
)

Expand Down Expand Up @@ -130,6 +134,8 @@ class ControlUnitContactsITests {
email = null,
name = "Contact Name",
phone = null,
isEmailDistributionContact = true,
isSmsDistributionContact = false,
),
),

Expand All @@ -149,6 +155,8 @@ class ControlUnitContactsITests {
email = null,
name = "Contact Name 2",
phone = null,
isEmailDistributionContact = true,
isSmsDistributionContact = false,
),
),
)
Expand All @@ -170,6 +178,8 @@ class ControlUnitContactsITests {
email = null,
name = "Updated Contact Name",
phone = null,
isEmailDistributionContact = true,
isSmsDistributionContact = false,
)

val nextControlUnitContactData = CreateOrUpdateControlUnitContactDataInput(
Expand Down
18 changes: 16 additions & 2 deletions .../monitorenv/infrastructure/database/repositories/JpaControlUnitContactRepositoryITests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ class JpaControlUnitContactRepositoryITests : AbstractDBTests() {
id = 1,
controlUnitId = 10000,
name = "Contact 1",
phone = null,
phone = "06 01 xx xx xx",
email = "email_1",
isEmailDistributionContact = true,
isSmsDistributionContact = false,
),
),
)
Expand All @@ -56,6 +59,9 @@ class JpaControlUnitContactRepositoryITests : AbstractDBTests() {
controlUnitId = 10003,
name = "Contact 3",
phone = null,
email = "email_3",
isEmailDistributionContact = false,
isSmsDistributionContact = true,
),
),
)
Expand All @@ -81,7 +87,10 @@ class JpaControlUnitContactRepositoryITests : AbstractDBTests() {
id = 1,
controlUnitId = 10000,
name = "Contact 1",
phone = null,
email = "email_1",
phone = "06 01 xx xx xx",
isEmailDistributionContact = true,
isSmsDistributionContact = false,
),
),
)
Expand All @@ -97,6 +106,9 @@ class JpaControlUnitContactRepositoryITests : AbstractDBTests() {
controlUnitId = 10000,
name = "Contact Name",
phone = "0123456789",
email = "Adresse email",
isEmailDistributionContact = false,
isSmsDistributionContact = true,
)

val createdControlUnitContact = jpaControlUnitContactRepository.save(newControlUnitContact)
Expand All @@ -111,6 +123,8 @@ class JpaControlUnitContactRepositoryITests : AbstractDBTests() {
controlUnitId = 10001,
name = "Updated Contact Name",
phone = "9876543210",
isEmailDistributionContact = true,
isSmsDistributionContact = true,
)

val updatedControlUnitContact = jpaControlUnitContactRepository.save(nextControlUnitContact)
Expand Down
22 changes: 15 additions & 7 deletions ...v/cacem/monitorenv/infrastructure/database/repositories/JpaControlUnitRepositoryITests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,20 @@ class JpaControlUnitRepositoryITests : AbstractDBTests() {
ControlUnitContactEntity(
id = 1,
controlUnitId = 10000,
email = null,
name = "Contact 1",
phone = null,
phone = "06 01 xx xx xx",
email = "email_1",
isEmailDistributionContact = true,
isSmsDistributionContact = false,
),
ControlUnitContactEntity(
id = 2,
controlUnitId = 10000,
email = null,
name = "Contact 2",
phone = null,
email = null,
phone="06 02 xx xx xx",
isEmailDistributionContact = false,
isSmsDistributionContact = true,
),
),
controlUnitResources =
Expand Down Expand Up @@ -303,16 +307,20 @@ class JpaControlUnitRepositoryITests : AbstractDBTests() {
ControlUnitContactEntity(
id = 1,
controlUnitId = 10000,
email = null,
email = "email_1",
name = "Contact 1",
phone = null,
phone = "06 01 xx xx xx",
isEmailDistributionContact = true,
isSmsDistributionContact = false,
),
ControlUnitContactEntity(
id = 2,
controlUnitId = 10000,
email = null,
name = "Contact 2",
phone = null,
phone="06 02 xx xx xx",
isEmailDistributionContact = false,
isSmsDistributionContact = true,
),
),
controlUnitResources =
Expand Down

0 comments on commit d7c3078

Please sign in to comment.