Gleipnir/nidus-sync
4
0
Fork 0
Code Issues 18 Pull requests Projects Releases Packages Wiki Activity Actions

Move properties of phones to the phone, not contact_phone

Browse source 
This makes sense because there will naturally be cases where multiple
districts have the same phone number mapped to different contacts.
This commit is contained in:
Eli Ribble 2026-05-22 20:56:22 +00:00
parent f957dc6982
commit 7b04822a9b
No known key found for this signature in database
14 changed files with 143 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

11
db/gen/nidus-sync/comms/model/contact_phone.go
View file

@ -8,11 +8,8 @@
package model
type ContactPhone struct {
CanSms bool
ConfirmedMessageID *int32
ContactID int32
E164 string
IsSubscribed bool
StopMessageID *int32
ID int32 `sql:"primary_key"`
ContactID int32
E164 string
IsSubscribed bool
ID int32 `sql:"primary_key"`
}

8
db/gen/nidus-sync/comms/model/phone.go
View file

@ -8,8 +8,8 @@
package model
type Phone struct {
E164 string `sql:"primary_key"`
IsSubscribed bool
Status Phonestatustype
CanSms bool
E164 string `sql:"primary_key"`
CanSms bool
ConfirmedMessageID *int32
StopMessageID *int32
}

39
db/gen/nidus-sync/comms/table/contact_phone.go
View file

@ -17,13 +17,10 @@ type contactPhoneTable struct {
postgres.Table
// Columns
CanSms postgres.ColumnBool
ConfirmedMessageID postgres.ColumnInteger
ContactID postgres.ColumnInteger
E164 postgres.ColumnString
IsSubscribed postgres.ColumnBool
StopMessageID postgres.ColumnInteger
ID postgres.ColumnInteger
ContactID postgres.ColumnInteger
E164 postgres.ColumnString
IsSubscribed postgres.ColumnBool
ID postgres.ColumnInteger
AllColumns postgres.ColumnList
MutableColumns postgres.ColumnList
@ -65,29 +62,23 @@ func newContactPhoneTable(schemaName, tableName, alias string) *ContactPhoneTabl
func newContactPhoneTableImpl(schemaName, tableName, alias string) contactPhoneTable {
var (
CanSmsColumn = postgres.BoolColumn("can_sms")
ConfirmedMessageIDColumn = postgres.IntegerColumn("confirmed_message_id")
ContactIDColumn = postgres.IntegerColumn("contact_id")
E164Column = postgres.StringColumn("e164")
IsSubscribedColumn = postgres.BoolColumn("is_subscribed")
StopMessageIDColumn = postgres.IntegerColumn("stop_message_id")
IDColumn = postgres.IntegerColumn("id")
allColumns = postgres.ColumnList{CanSmsColumn, ConfirmedMessageIDColumn, ContactIDColumn, E164Column, IsSubscribedColumn, StopMessageIDColumn, IDColumn}
mutableColumns = postgres.ColumnList{CanSmsColumn, ConfirmedMessageIDColumn, ContactIDColumn, E164Column, IsSubscribedColumn, StopMessageIDColumn}
defaultColumns = postgres.ColumnList{IDColumn}
ContactIDColumn = postgres.IntegerColumn("contact_id")
E164Column = postgres.StringColumn("e164")
IsSubscribedColumn = postgres.BoolColumn("is_subscribed")
IDColumn = postgres.IntegerColumn("id")
allColumns = postgres.ColumnList{ContactIDColumn, E164Column, IsSubscribedColumn, IDColumn}
mutableColumns = postgres.ColumnList{ContactIDColumn, E164Column, IsSubscribedColumn}
defaultColumns = postgres.ColumnList{IDColumn}
)
return contactPhoneTable{
Table: postgres.NewTable(schemaName, tableName, alias, allColumns...),
//Columns
CanSms: CanSmsColumn,
ConfirmedMessageID: ConfirmedMessageIDColumn,
ContactID: ContactIDColumn,
E164: E164Column,
IsSubscribed: IsSubscribedColumn,
StopMessageID: StopMessageIDColumn,
ID: IDColumn,
ContactID: ContactIDColumn,
E164: E164Column,
IsSubscribed: IsSubscribedColumn,
ID: IDColumn,
AllColumns: allColumns,
MutableColumns: mutableColumns,

30
db/gen/nidus-sync/comms/table/phone.go
View file

@ -17,10 +17,10 @@ type phoneTable struct {
postgres.Table
// Columns
E164 postgres.ColumnString
IsSubscribed postgres.ColumnBool
Status postgres.ColumnString
CanSms postgres.ColumnBool
E164 postgres.ColumnString
CanSms postgres.ColumnBool
ConfirmedMessageID postgres.ColumnInteger
StopMessageID postgres.ColumnInteger
AllColumns postgres.ColumnList
MutableColumns postgres.ColumnList
@ -62,23 +62,23 @@ func newPhoneTable(schemaName, tableName, alias string) *PhoneTable {
func newPhoneTableImpl(schemaName, tableName, alias string) phoneTable {
var (
E164Column = postgres.StringColumn("e164")
IsSubscribedColumn = postgres.BoolColumn("is_subscribed")
StatusColumn = postgres.StringColumn("status")
CanSmsColumn = postgres.BoolColumn("can_sms")
allColumns = postgres.ColumnList{E164Column, IsSubscribedColumn, StatusColumn, CanSmsColumn}
mutableColumns = postgres.ColumnList{IsSubscribedColumn, StatusColumn, CanSmsColumn}
defaultColumns = postgres.ColumnList{}
E164Column = postgres.StringColumn("e164")
CanSmsColumn = postgres.BoolColumn("can_sms")
ConfirmedMessageIDColumn = postgres.IntegerColumn("confirmed_message_id")
StopMessageIDColumn = postgres.IntegerColumn("stop_message_id")
allColumns = postgres.ColumnList{E164Column, CanSmsColumn, ConfirmedMessageIDColumn, StopMessageIDColumn}
mutableColumns = postgres.ColumnList{CanSmsColumn, ConfirmedMessageIDColumn, StopMessageIDColumn}
defaultColumns = postgres.ColumnList{}
)
return phoneTable{
Table: postgres.NewTable(schemaName, tableName, alias, allColumns...),
//Columns
E164: E164Column,
IsSubscribed: IsSubscribedColumn,
Status: StatusColumn,
CanSms: CanSmsColumn,
E164: E164Column,
CanSms: CanSmsColumn,
ConfirmedMessageID: ConfirmedMessageIDColumn,
StopMessageID: StopMessageIDColumn,
AllColumns: allColumns,
MutableColumns: mutableColumns,

10
db/migrations/00154_comms_contact_phone_rework.sql Normal file
View file

@ -0,0 +1,10 @@
-- +goose Up
ALTER TABLE comms.contact_phone
DROP COLUMN can_sms,
DROP COLUMN confirmed_message_id,
DROP COLUMN stop_message_id;
ALTER TABLE comms.phone
ADD COLUMN confirmed_message_id INTEGER REFERENCES comms.text_log(id),
ADD COLUMN stop_message_id INTEGER REFERENCES comms.text_log(id),
DROP COLUMN is_subscribed,
DROP COLUMN status;

20
db/query/comms/contact_phone.go
View file

@ -27,26 +27,6 @@ func ContactPhoneFromE164(ctx context.Context, txn db.Ex, e164 string) (model.Co
return db.ExecuteOneTx[model.ContactPhone](ctx, txn, statement)
}
func ContactPhoneUpdateConfirmedMessageID(ctx context.Context, txn db.Ex, e164 string, message_id *int32) error {
statement := table.ContactPhone.UPDATE().
SET(table.ContactPhone.ConfirmedMessageID.SET(postgres.IntExp(postgres.NULL))).
WHERE(table.ContactPhone.E164.EQ(postgres.String(e164)))
return db.ExecuteNoneTx(ctx, txn, statement)
}
func ContactPhoneUpdateStopMessageID(ctx context.Context, txn db.Ex, e164 string, message_id *int32) error {
/*
m := model.ContactPhone{}
m.StopMessageID = message_id
statement := table.ContactPhone.UPDATE(
table.ContactPhone.StopMessageID,
).MODEL(m).
WHERE(table.ContactPhone.E164.EQ(postgres.String(e164)))
*/
statement := table.ContactPhone.UPDATE().
SET(table.ContactPhone.StopMessageID.SET(postgres.IntExp(postgres.NULL))).
WHERE(table.ContactPhone.E164.EQ(postgres.String(e164)))
return db.ExecuteNoneTx(ctx, txn, statement)
}
func ContactPhoneByContactIDs(ctx context.Context, txn db.Ex, contact_ids []int64) (result map[int64][]model.ContactPhone, err error) {
sql_ids := make([]postgres.Expression, len(contact_ids))
for i, contact_id := range contact_ids {

31
db/query/comms/phone.go
View file

@ -40,3 +40,34 @@ func PhoneFromE164(ctx context.Context, txn db.Ex, e164 string) (model.Phone, er
WHERE(table.Phone.E164.EQ(postgres.String(e164)))
return db.ExecuteOneTx[model.Phone](ctx, txn, statement)
}
func PhonesFromE164s(ctx context.Context, txn db.Ex, e164s []string) ([]model.Phone, error) {
sql_ids := make([]postgres.Expression, len(e164s))
for i, e164 := range e164s {
sql_ids[i] = postgres.String(e164)
}
statement := table.Phone.SELECT(
table.Phone.AllColumns,
).FROM(table.Phone).
WHERE(table.Phone.E164.IN(sql_ids...))
return db.ExecuteManyTx[model.Phone](ctx, txn, statement)
}
func PhoneUpdateConfirmedMessageID(ctx context.Context, txn db.Ex, e164 string, message_id *int32) error {
statement := table.Phone.UPDATE().
SET(table.Phone.ConfirmedMessageID.SET(postgres.IntExp(postgres.NULL))).
WHERE(table.Phone.E164.EQ(postgres.String(e164)))
return db.ExecuteNoneTx(ctx, txn, statement)
}
func PhoneUpdateStopMessageID(ctx context.Context, txn db.Ex, e164 string, message_id *int32) error {
/*
m := model.Phone{}
m.StopMessageID = message_id
statement := table.Phone.UPDATE(
table.Phone.StopMessageID,
).MODEL(m).
WHERE(table.Phone.E164.EQ(postgres.String(e164)))
*/
statement := table.Phone.UPDATE().
SET(table.Phone.StopMessageID.SET(postgres.IntExp(postgres.NULL))).
WHERE(table.Phone.E164.EQ(postgres.String(e164)))
return db.ExecuteNoneTx(ctx, txn, statement)
}