Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions app/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
from .comment_attachment import CommentAttachment
from .contact import Contact
from .contact_communication import ContactCommunication
from .crm_communication_template import CrmCommunicationTemplate
from .currency import Currency, ExchangeRate
from .custom_field_definition import CustomFieldDefinition
from .custom_report import CustomReportConfig
Expand Down Expand Up @@ -234,6 +235,7 @@
"PurchaseOrderItem",
"Contact",
"ContactCommunication",
"CrmCommunicationTemplate",
"Deal",
"DealActivity",
"DeletedUsername",
Expand Down
50 changes: 50 additions & 0 deletions app/models/crm_communication_template.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
"""Reusable templates for CRM contact communications."""

from app import db
from app.utils.timezone import now_in_app_timezone


def local_now():
return now_in_app_timezone().replace(tzinfo=None)


class CrmCommunicationTemplate(db.Model):
"""Saved subject/body templates for logging contact communications."""

__tablename__ = "crm_communication_templates"

id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(120), nullable=False)
type = db.Column(db.String(50), nullable=False, default="email") # email, call, meeting, note, message
subject = db.Column(db.String(500), nullable=True)
content = db.Column(db.Text, nullable=True)
direction = db.Column(db.String(20), nullable=False, default="outbound")
is_active = db.Column(db.Boolean, nullable=False, default=True)
created_by = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
created_at = db.Column(db.DateTime, default=local_now, nullable=False)
updated_at = db.Column(db.DateTime, default=local_now, onupdate=local_now, nullable=False)

creator = db.relationship("User", foreign_keys=[created_by], backref="crm_communication_templates")

def __init__(self, name, created_by, **kwargs):
self.name = name.strip()
self.created_by = created_by
self.type = (kwargs.get("type") or "email").strip()
self.subject = (kwargs.get("subject") or "").strip() or None
self.content = (kwargs.get("content") or "").strip() or None
self.direction = (kwargs.get("direction") or "outbound").strip()
self.is_active = kwargs.get("is_active", True)

def to_dict(self):
return {
"id": self.id,
"name": self.name,
"type": self.type,
"subject": self.subject,
"content": self.content,
"direction": self.direction,
"is_active": self.is_active,
"created_by": self.created_by,
"created_at": self.created_at.isoformat() if self.created_at else None,
"updated_at": self.updated_at.isoformat() if self.updated_at else None,
}
16 changes: 14 additions & 2 deletions app/models/deal.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,24 @@ class Deal(db.Model):
# Relationships
client = db.relationship("Client", backref="deals")
contact = db.relationship("Contact", backref="deals")
lead = db.relationship("Lead", foreign_keys=[lead_id], backref="deals")
lead = db.relationship(
"Lead",
foreign_keys=[lead_id],
primaryjoin="Deal.lead_id==Lead.id",
backref=db.backref("originated_deals", lazy="dynamic"),
)
creator = db.relationship("User", foreign_keys=[created_by], backref="created_deals")
owner = db.relationship("User", foreign_keys=[owner_id], backref="owned_deals")
related_quote = db.relationship("Quote", foreign_keys=[related_quote_id])
related_project = db.relationship("Project", foreign_keys=[related_project_id])
activities = db.relationship("DealActivity", backref="deal", lazy="dynamic", cascade="all, delete-orphan")
activities = db.relationship(
"DealActivity",
backref=db.backref("deal", foreign_keys="DealActivity.deal_id"),
lazy="dynamic",
cascade="all, delete-orphan",
foreign_keys="DealActivity.deal_id",
primaryjoin="Deal.id==DealActivity.deal_id",
)

def __init__(self, name, created_by, **kwargs):
self.name = name.strip()
Expand Down
17 changes: 15 additions & 2 deletions app/models/lead.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,24 @@ class Lead(db.Model):
converted_to_client = db.relationship(
"Client", foreign_keys=[converted_to_client_id], backref="converted_from_leads"
)
converted_to_deal = db.relationship("Deal", foreign_keys=[converted_to_deal_id])
creator = db.relationship("User", foreign_keys=[created_by], backref="created_leads")
owner = db.relationship("User", foreign_keys=[owner_id], backref="owned_leads")
converter = db.relationship("User", foreign_keys=[converted_by], backref="converted_leads")
activities = db.relationship("LeadActivity", backref="lead", lazy="dynamic", cascade="all, delete-orphan")
# viewonly read of converted deal (Lead↔Deal also linked via deals.lead_id)
converted_to_deal = db.relationship(
"Deal",
foreign_keys=[converted_to_deal_id],
primaryjoin="Lead.converted_to_deal_id==Deal.id",
viewonly=True,
)
activities = db.relationship(
"LeadActivity",
backref=db.backref("lead", foreign_keys="LeadActivity.lead_id"),
lazy="dynamic",
cascade="all, delete-orphan",
foreign_keys="LeadActivity.lead_id",
primaryjoin="Lead.id==LeadActivity.lead_id",
)

def __init__(self, first_name, last_name, created_by, **kwargs):
self.first_name = first_name.strip()
Expand Down
2 changes: 1 addition & 1 deletion app/models/webhook.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ def mark_retrying(self, next_retry_at):
"""Mark delivery as retrying and schedule next attempt"""
self.status = "retrying"
self.next_retry_at = next_retry_at
self.retry_count += 1
self.retry_count = (self.retry_count or 0) + 1

def to_dict(self):
"""Convert to dictionary for API responses"""
Expand Down
8 changes: 8 additions & 0 deletions app/routes/api_v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,16 @@ def api_info():
"payments": "/api/v1/payments",
"mileage": "/api/v1/mileage",
"deals": "/api/v1/deals",
"deal_activities": "/api/v1/deals/<deal_id>/activities",
"deal_stage": "/api/v1/deals/<deal_id>/stage",
"deals_forecast": "/api/v1/deals/forecast",
"leads": "/api/v1/leads",
"lead_activities": "/api/v1/leads/<lead_id>/activities",
"lead_convert_client": "/api/v1/leads/<lead_id>/convert-to-client",
"lead_convert_deal": "/api/v1/leads/<lead_id>/convert-to-deal",
"lead_source_analytics": "/api/v1/leads/analytics/sources",
"contacts": "/api/v1/clients/<client_id>/contacts",
"contact_communications": "/api/v1/contacts/<contact_id>/communications",
"issues": "/api/v1/issues",
"time_entry_approvals": "/api/v1/time-entry-approvals",
"per_diems": "/api/v1/per-diems",
Expand Down
46 changes: 46 additions & 0 deletions app/routes/api_v1_contacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,49 @@ def delete_contact(contact_id):
contact.is_active = False
db.session.commit()
return jsonify({"message": "Contact deleted successfully"})


@api_v1_contacts_bp.route("/contacts/<int:contact_id>/communications", methods=["GET"])
@require_api_token("read:contacts")
def list_contact_communications(contact_id):
"""List communications for a contact."""
blocked = _require_module_enabled_for_api("contacts")
if blocked:
return blocked
from app.models import ContactCommunication

contact = Contact.query.filter_by(id=contact_id).first_or_404()
communications = ContactCommunication.get_recent_communications(contact_id=contact.id, limit=100)
return jsonify({"communications": [c.to_dict() for c in communications]})


@api_v1_contacts_bp.route("/contacts/<int:contact_id>/communications", methods=["POST"])
@require_api_token("write:contacts")
def create_contact_communication(contact_id):
"""Create a communication log entry for a contact."""
blocked = _require_module_enabled_for_api("contacts")
if blocked:
return blocked
from app.models import ContactCommunication
from app.routes.api_v1_common import parse_datetime

contact = Contact.query.filter_by(id=contact_id).first_or_404()
data = request.get_json() or {}
comm_type = (data.get("type") or "note").strip()
communication = ContactCommunication(
contact_id=contact.id,
type=comm_type,
created_by=g.api_user.id,
subject=(data.get("subject") or "").strip() or None,
content=(data.get("content") or "").strip() or None,
direction=(data.get("direction") or "outbound").strip(),
status=(data.get("status") or "completed").strip() or "completed",
communication_date=parse_datetime(data.get("communication_date")) or None,
follow_up_date=parse_datetime(data.get("follow_up_date")),
related_project_id=data.get("related_project_id"),
related_quote_id=data.get("related_quote_id"),
related_deal_id=data.get("related_deal_id"),
)
db.session.add(communication)
db.session.commit()
return jsonify({"message": "Communication created", "communication": communication.to_dict()}), 201
Loading
Loading