updates

Author: Curiouspaul1

core/api/bookings/events/artisan.py

@@ -1,6 +1,7 @@
 import os
 import sys
 import json
+import uuid
 
 from flask import (
     request,
@@ -19,9 +20,8 @@
     LOG_FORMAT, _level, send_notification
 )
 from models import (
-    Artisan,
-    Booking,
-    User
+    Artisan, Booking, User,
+    ChatMessage, Chat
 )
 from .utils import (
     error_response,
@@ -80,9 +80,12 @@
 
 
 @socketio.on('connect', namespace='/chat')
-@auth_param_required
-def enter_chat_namespace(data):
-    emit('message', 'welcome to chat')
+@valid_auth_required
+def enter_chat_namespace(uid):
+    redis_4.hset(
+        "user_to_chat_sid",
+        mapping={uid: request.sid}
+    )
 
 
 @socketio.on('join_chat', namespace='/chat')
@@ -252,7 +255,11 @@ def handle_updates(msg):
         fcm_token = redis_4.hget("user_to_fcm_token", uid)
         send_notification(
             notification_payload,
-            fcm_token
+            fcm_token,
+            notification_object={
+                'body': 'A client near you needs your service',
+                'title': 'New Service Request Alert! 🚨'
+            }
         )
 
     psub.subscribe(**{geo_fence_key: handle_updates})
@@ -656,13 +663,28 @@ def customer_approval(uid, data):
 
 
 @socketio.on('message', namespace='/chat')
-@parse_event_data
 @valid_auth_required
+@parse_event_data
 def send_chat_msg(uid, data):
     """sends message to chat room"""
-    msg = data['msg']
-    room = data['booking_id']
-    socketio.send(msg, to=room, namespace='/chat')
+    # check if chat exists in db if not create one
+    with db.session() as sess:
+        bk_id = data['booking_id']
+        new_msg = ChatMessage(**data['chat_object'])
+        sid = redis_4.hget('user_to_chat_sid', uid)
+        chat_id = redis_4.hget('booking_id_to_chat_id', bk_id)
+        if not chat_id:
+            new_chat = Chat(booking_id=bk_id)
+            sess.add(new_chat)
+            chat_id = uuid.uuid4().hex
+            new_chat.id = chat_id
+            # set in cache
+            redis_4.hset('booking_id_to_chat_id', bk_id, chat_id)
+        sess.add(new_msg)
+        sess.commit()
+        room = data['booking_id']
+        msg = json.dumps(data['chat_object'])
+        socketio.send(msg, to=room, skip_sid=sid, namespace='/chat')
 
 
 @socketio.on('clock_in', namespace='/artisan')

core/api/bookings/events/customer.py

@@ -1,11 +1,14 @@
-from core import socketio
+import json
+import uuid
+
+from core import socketio, db
 from add_extensions import (
     redis_,
     redis_2,
     redis_4,
     redis_7
 )
-from models import User
+from models import User, Chat, ChatMessage
 from models.bookings import BookingStatusEnum
 from core.api.auth.auth_helper import (
     auth_param_required,
@@ -73,9 +76,12 @@ def connect(auth):
 
 
 @socketio.on('connect', namespace='/chat')
-@auth_param_required
-def enter_chat_namespace(data):
-    emit('message', 'welcome to chat')
+@valid_auth_required
+def enter_chat_namespace(uid):
+    redis_4.hset(
+        "user_to_chat_sid",
+        mapping={uid: request.sid}
+    )
 
 
 @socketio.on('disconnect', namespace='/customer')
@@ -164,12 +170,28 @@ def cancel_offer(uid, data):
 
 
 @socketio.on('message', namespace='/chat')
+@valid_auth_required
 @parse_event_data
-def send_chat_msg(data):
+def send_chat_msg(uid, data):
     """sends message to chat room"""
-    msg = data['msg']
-    room = data['booking_id']
-    socketio.send(msg, to=room, namespace='/chat')
+    # check if chat exists in db if not create one
+    with db.session() as sess:
+        bk_id = data['booking_id']
+        new_msg = ChatMessage(**data['chat_object'])
+        sid = redis_4.hget('user_to_chat_sid', uid)
+        chat_id = redis_4.hget('booking_id_to_chat_id', bk_id)
+        if not chat_id:
+            new_chat = Chat(booking_id=bk_id)
+            sess.add(new_chat)
+            chat_id = uuid.uuid4().hex
+            new_chat.id = chat_id
+            # set in cache
+            redis_4.hset('booking_id_to_chat_id', bk_id, chat_id)
+        sess.add(new_msg)
+        sess.commit()
+        room = data['booking_id']
+        msg = json.dumps(data['chat_object'])
+        socketio.send(msg, to=room, skip_sid=sid, namespace='/chat')
 
 
 @socketio.on('test', namespace='/customer')

migrations/versions/2026-01-13__94f1cc79bb84.py

@@ -0,0 +1,58 @@
+"""empty message
+
+Revision ID: 94f1cc79bb84
+Revises: 42f4aaaab1a1
+Create Date: 2026-01-13 01:33:39.975178
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '94f1cc79bb84'
+down_revision = '42f4aaaab1a1'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('chat',
+        sa.Column('id', sa.String(), nullable=False),
+        sa.Column('booking_id', sa.String(), nullable=True),
+        sa.Column('closed_at', sa.DateTime(), nullable=True),
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(['booking_id'], ['booking.booking_id'], ),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('id')
+    )
+    op.create_table('chat_message',
+        sa.Column('message_id', sa.String(), nullable=True),
+        sa.Column('content', sa.Text(), nullable=False),
+        sa.Column('chat_id', sa.String(), nullable=True),
+        sa.Column('sent_by', sa.String(), nullable=True),
+        sa.Column('is_flagged', sa.Boolean(), nullable=True),
+        sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(['chat_id'], ['chat.id'], ),
+        sa.ForeignKeyConstraint(['sent_by'], ['user.user_id'], ),
+        sa.PrimaryKeyConstraint('id')
+    )
+    with op.batch_alter_table('chat_message', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_chat_message_chat_id'), ['chat_id'], unique=False)
+        batch_op.create_index(batch_op.f('ix_chat_message_sent_by'), ['sent_by'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('chat_message', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_chat_message_sent_by'))
+        batch_op.drop_index(batch_op.f('ix_chat_message_chat_id'))
+
+    op.drop_table('chat_message')
+    op.drop_table('chat')
+    # ### end Alembic commands ###

models/__init__.py

@@ -9,3 +9,4 @@
 from .location import Landmark, City
 from .payments import Payment, CardAuth
 from .ratings import Rating
+from .chat import Chat, ChatMessage

models/bookings.py

@@ -211,6 +211,7 @@ class Booking(TimestampMixin, db.Model):
     )
     images = db.relationship('Blob', backref='booking')
     working_days = db.relationship('BookingWorkDay', backref='booking')
+    chat = db.relationship('Chat', uselist=False, backref='booking')
 
     def update_start_time(self):
         self.start_time = dt.utcnow()

models/chat.py

@@ -0,0 +1,18 @@
+from core import db
+
+from .base import TimestampMixin, BaseModelPR
+
+
+class Chat(TimestampMixin, db.Model):
+    id = db.Column(db.String, primary_key=True, unique=True)
+    booking_id = db.Column(db.String, db.ForeignKey('booking.booking_id'))
+    closed_at = db.Column(db.DateTime)
+    chats = db.relationship('ChatMessage', backref='chat')
+
+
+class ChatMessage(BaseModelPR, TimestampMixin, db.Model):
+    message_id = db.Column(db.String)
+    content = db.Column(db.Text, nullable=False)
+    chat_id = db.Column(db.String, db.ForeignKey('chat.id'), index=True)
+    sent_by = db.Column(db.String, db.ForeignKey('user.user_id'), index=True)
+    is_flagged = db.Column(db.Boolean)

supervisord-dev.conf

@@ -78,7 +78,7 @@ environment=HOME="/home/handeesofficial"
 # stderr_logfile_backups=0
 
 [program:huey]
-command=/home/handeesofficial/backend/env/bin/huey_consumer.py huey_worker.huey -w 2 -n
+command=/home/handeesofficial/backend/env/bin/python3 huey_worker.py
 directory=/home/handeesofficial/backend
 user=handeesofficial
 autostart=true

tasks/events.py

@@ -19,15 +19,44 @@
 redis_pass = os.getenv('REDIS_PASS')
 redis_port = os.getenv('REDIS_PORT', 6378)
 
-IMPORTANT_NOTIFICATIONS = [
-    'approve_booking_details', 'new_offer',
-    'job_completed',
-    'booking_offer_accepted',
-    'offer_cancelled',
-    'artisan_arrived', 'job_details_rejected',
-    'artisan_clocked_in', 'artisan_clock_out',
-    'job_started', 'approve_booking_details'
-]
+NOTIFICATONS_MAP = {
+    'approve_booking_details': {
+        'body': 'Kindly review service request details',
+        'title': 'Approve Service Request Details'
+    },
+    'job_completed': {
+        'body': "Artisan says their done with the work 😊",
+        'title': 'Job Completed'
+    },
+    'booking_offer_accepted': {
+        'body': "Hey you've been matched with an artisan near you!",
+        'title': 'Booking Request Accepted'
+    },
+    'offer_cancelled': {
+        'body': "Service request canceled💀",
+        'title': 'Offer Has Been Canceled'
+    },
+    'artisan_arrived': {
+        'body': "Good news! You have a visitor!🔥 Your artisan has arrived",
+        'title': 'Artisan Has Arrived'
+    },
+    'job_details_rejected': {
+        'body': "Customer rejected booking details💀 - contact them!",
+        'title': 'Service Request Detail Rejected'
+    },
+    'artisan_clocked_in': {
+        'body': 'Artisan clocked in for a work session',
+        'title': 'Artisan Clocked In'
+    },
+    'artisan_clocked_out': {
+        'body': 'Artisan clocked out from a work session',
+        'title': 'Artisan Clocked Out'
+    },
+    'job_started': {
+        'body': 'Service rendering has officialy begun✅',
+        'title': 'Artisan Started Working'
+    }
+}
 
 
 def exp_backoff_task(retries, retry_backoff):
@@ -96,10 +125,15 @@ def send_event(event, data, namespace):
         namespace=namespace
     )
     print(f"SOCKET EMIT RESPONSE {resp}")
-    if event in IMPORTANT_NOTIFICATIONS:
+    if event in NOTIFICATONS_MAP:
         notification_payload = {
             k: json.dumps(v) for k, v in data['payload'].items()
         }
         fcm_token = redis_4.hget("user_to_fcm_token", data['recipient'])
-        res = send_notification(notification_payload, fcm_token, app_instance)
+        res = send_notification(
+            notification_payload,
+            fcm_token,
+            app_instance,
+            NOTIFICATONS_MAP[event]
+        )
         logger.error(f"Sent push notification request, with resp: {res}")

utils.py

@@ -322,12 +322,13 @@ def decode_file_id(encoded_id: str):
     return user_id_int, decoded_blob_type, decoded_hash_hex
 
 
-def send_notification(data, token, app=None):
+def send_notification(data, token, app=None, notification_object=None):
     print("FCM TOKEN IS::", token)
     print("Input data", data)
     push_notification = messaging.Message(
         data=data,
-        token=token
+        token=token,
+        notification=messaging.Notification(**notification_object)
     )
     response = messaging.send(
         push_notification,