From 67b43ffbb11ea19d43f3d0e5a07c59f8d1082946 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Mon, 22 Jul 2024 16:27:02 -0400 Subject: [PATCH 1/3] Getting the logging where I think it will be most useful. Signed-off-by: Cliff Hill --- app/models.py | 12 ++++-------- app/service/rest.py | 2 ++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/models.py b/app/models.py index 0d58a6611..12c4b5f28 100644 --- a/app/models.py +++ b/app/models.py @@ -543,6 +543,8 @@ class Service(db.Model, Versioned): nullable=True, ) organization = db.relationship("Organization", backref="services") + service_sms_senders = db.relationship("ServiceSmsSender", back_populates="service") + inbound_number = db.relationship("InboundNumber", back_populates="service") notes = db.Column(db.Text, nullable=True) purchase_order_number = db.Column(db.String(255), nullable=True) @@ -685,10 +687,7 @@ class InboundNumber(db.Model): index=True, nullable=True, ) - service = db.relationship( - Service, - backref=db.backref("inbound_number", uselist=False), - ) + service = db.relationship(Service, back_populates="inbound_number") active = db.Column( db.Boolean, index=False, @@ -734,10 +733,7 @@ class ServiceSmsSender(db.Model): nullable=False, unique=False, ) - service = db.relationship( - Service, - backref=db.backref("service_sms_senders", uselist=True), - ) + service = db.relationship(Service, back_populates="service_sms_senders") is_default = db.Column(db.Boolean, nullable=False, default=True) archived = db.Column(db.Boolean, nullable=False, default=False) inbound_number_id = db.Column( diff --git a/app/service/rest.py b/app/service/rest.py index 7d98cd91c..112fe15e0 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -201,6 +201,8 @@ def get_service_by_id(service_id): fetched = dao_fetch_service_by_id(service_id) data = service_schema.dump(fetched) + + current_app.logger.info(f'>> SERVICE: {data["id"]}; sms_senders: {data["sms_senders_with_hints"]}') return jsonify(data=data) From 32500a13c16762fa70adcfefdf8851fecc5c5aa2 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Mon, 22 Jul 2024 17:04:13 -0400 Subject: [PATCH 2/3] Fixing some things. Signed-off-by: Cliff Hill --- app/models.py | 12 ++++++++---- app/service/rest.py | 4 +++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/models.py b/app/models.py index 12c4b5f28..0d58a6611 100644 --- a/app/models.py +++ b/app/models.py @@ -543,8 +543,6 @@ class Service(db.Model, Versioned): nullable=True, ) organization = db.relationship("Organization", backref="services") - service_sms_senders = db.relationship("ServiceSmsSender", back_populates="service") - inbound_number = db.relationship("InboundNumber", back_populates="service") notes = db.Column(db.Text, nullable=True) purchase_order_number = db.Column(db.String(255), nullable=True) @@ -687,7 +685,10 @@ class InboundNumber(db.Model): index=True, nullable=True, ) - service = db.relationship(Service, back_populates="inbound_number") + service = db.relationship( + Service, + backref=db.backref("inbound_number", uselist=False), + ) active = db.Column( db.Boolean, index=False, @@ -733,7 +734,10 @@ class ServiceSmsSender(db.Model): nullable=False, unique=False, ) - service = db.relationship(Service, back_populates="service_sms_senders") + service = db.relationship( + Service, + backref=db.backref("service_sms_senders", uselist=True), + ) is_default = db.Column(db.Boolean, nullable=False, default=True) archived = db.Column(db.Boolean, nullable=False, default=False) inbound_number_id = db.Column( diff --git a/app/service/rest.py b/app/service/rest.py index 112fe15e0..d30f79c5e 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -202,7 +202,9 @@ def get_service_by_id(service_id): data = service_schema.dump(fetched) - current_app.logger.info(f'>> SERVICE: {data["id"]}; sms_senders: {data["sms_senders_with_hints"]}') + current_app.logger.info( + f'>> SERVICE: {data["id"]}; sms_senders: {data["sms_senders_with_hints"]}' + ) return jsonify(data=data) From d6b59611cbf47d5269a5ea977cdb65dc35e679fd Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Wed, 24 Jul 2024 10:24:47 -0400 Subject: [PATCH 3/3] Fixing hopefully Signed-off-by: Cliff Hill --- app/service/rest.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/service/rest.py b/app/service/rest.py index d30f79c5e..687cf5a23 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -202,9 +202,7 @@ def get_service_by_id(service_id): data = service_schema.dump(fetched) - current_app.logger.info( - f'>> SERVICE: {data["id"]}; sms_senders: {data["sms_senders_with_hints"]}' - ) + current_app.logger.info(f'>> SERVICE: {data["id"]}; {data}') return jsonify(data=data)