updates

Author: Curiouspaul1

core/api/bookings/events/artisan.py

@@ -411,6 +411,18 @@ def cancel_offer_artisan(uid, data):
 def handle_location_arrival(uid, data):
     """ triggered when artisan arrives at location """
     room = data['booking_id']
+    bk = Booking.query.get(data['booking_id'])
+
+    if bk.status != BookingStatusEnum.PENDING:
+        emit(
+            'error',
+            error_response(
+                "Invalid action: Cannot carry out",
+                " action on booking at this stage",
+                uid
+            )
+        )
+        return
 
     matched_artisan = redis_4.hget('booking_id_to_artisan', room)
     current_artisan = Artisan.get_by_user_id(uid)
@@ -458,6 +470,16 @@ def handle_job_begin(uid, data):
     with db.session() as sess:
         artisan = Artisan.get_by_user_id(uid)
         bk = Booking.query.get(data['booking_id'])
+        if bk.status != BookingStatusEnum.ARTISAN_ARRIVED:
+            emit(
+                'error',
+                error_response(
+                    "Invalid action: Cannot carry out",
+                    " action on booking at this stage",
+                    uid
+                )
+            )
+            return
 
         room = data['booking_id']
 
@@ -585,6 +607,16 @@ def customer_approval(uid, data):
         )
         return
 
+    room = data['booking_id']
+    matched_artisan = redis_4.hget('booking_id_to_artisan', room)
+    current_artisan = Artisan.get_by_user_id(uid)
+    if matched_artisan != current_artisan.user_id:
+        emit(
+            'error',
+            error_response(messages.ARTISAN_NOT_MATCHED_TO_BOOKING, uid)
+        )
+        return
+
     # inform customer
     payload = {
         'payload': data,
@@ -618,7 +650,28 @@ def clock_in(uid, data):
                 error_response(messages.INVALID_CLOCK_IN_ATTEMPT, uid)
             )
             return
+        room = data['booking_id']
+        matched_artisan = redis_4.hget('booking_id_to_artisan', room)
+        current_artisan = Artisan.get_by_user_id(uid)
+        if matched_artisan != current_artisan.user_id:
+            emit(
+                'error',
+                error_response(messages.ARTISAN_NOT_MATCHED_TO_BOOKING, uid)
+            )
+            return
+        if bk.clock_in_flag:
+            emit(
+                'error',
+                error_response(
+                    "Invalid action: Already clocked! "
+                    "Clock-out first",
+                    uid
+                )
+            )
+            return
         bk.add_clock_event(sess)
+        bk.clock_in_flag = True
+        sess.commit()
 
         # signal customer
         payload = {
@@ -647,8 +700,28 @@ def clock_out(uid, data):
                 error_response(messages.INVALID_CLOCK_OUT_ATTEMPT, uid)
             )
             return
+        room = data['booking_id']
+        matched_artisan = redis_4.hget('booking_id_to_artisan', room)
+        current_artisan = Artisan.get_by_user_id(uid)
+        if matched_artisan != current_artisan.user_id:
+            emit(
+                'error',
+                error_response(messages.ARTISAN_NOT_MATCHED_TO_BOOKING, uid)
+            )
+            return
+        if not bk.clock_in_flag:
+            emit(
+                'error',
+                error_response(
+                    "Invalid action: Can't clock out without "
+                    "first clocking in",
+                    uid
+                )
+            )
+            return
         bk.add_clock_event(sess, clock_in=False)
-
+        bk.clock_in_flag = False
+        sess.commit()
         # signal customer
         payload = {
             'payload': messages.ARTISAN_CLOCKED_OUT,

core/api/bookings/views.py

@@ -1,5 +1,6 @@
 import uuid
 
+from sqlalchemy import select, and_
 from flask import request, render_template
 from loguru import logger
 
@@ -9,7 +10,8 @@
 from schemas import (
     BookingSchema,
     UserSchema,
-    BlobSchema
+    BlobSchema,
+    BookingWorkDaySchema
 )
 from models.user_models import Permission
 from uuid import uuid4
@@ -156,6 +158,38 @@ def delete_booking(current_user, booking_id):
     return gen_response(200, message=msg)
 
 
+@bookings.get('/<booking_id>/workingdays')
+@login_required
+@permission_required(Permission.service_request)
+def list_clocks(current_user, booking_id):
+    with db.session() as sess:
+        stmt = select(Booking).where(
+            and_(
+                Booking.customer_id == current_user.user_id,
+                Booking.booking_id == booking_id
+            )
+        )
+        bk = sess.scalar(stmt)
+        if not bk:
+            return error_response(
+                404,
+                "Booking not found, or you didn't request this originally"
+            )
+
+        schema = BookingWorkDaySchema(
+            many=True,
+            only=(
+                'booking_id', 'work_sessions', 'id',
+                'name', 'date',
+            )
+        )
+        working_days = bk.working_days
+        return gen_response(
+            200,
+            data=schema.dump(working_days)
+        )
+
+
 @bookings.route('/see')
 def see():
     return render_template('bookings/index.html')

migrations/versions/2025-10-13__b8ec34f70d9c.py

@@ -51,25 +51,29 @@ def upgrade():
     """))
 
     op.create_table('booking_workday',
-    sa.Column('contract_id', sa.Integer(), nullable=True),
-    sa.Column('booking_id', sa.String(), nullable=True),
-    sa.Column('name', sa.Enum('MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY', 'SUNDAY', name='bookingworkdayenum'), nullable=False),
-    sa.Column('date', sa.Date(), 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(['booking_id'], ['booking.booking_id'], ),
-    sa.ForeignKeyConstraint(['contract_id'], ['booking_contract.id'], ),
-    sa.PrimaryKeyConstraint('id')
+        sa.Column('contract_id', sa.Integer(), nullable=True),
+        sa.Column('booking_id', sa.String(), nullable=True),
+        sa.Column('name', sa.Enum('MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY', 'SUNDAY', name='bookingworkdayenum'), nullable=False),
+        sa.Column('date', sa.Date(), 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(['booking_id'], ['booking.booking_id'], ),
+        sa.ForeignKeyConstraint(['contract_id'], ['booking_contract.id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
-    op.create_table('booking_clock_event',
-    sa.Column('working_day_id', sa.Integer(), nullable=False),
-    sa.Column('event_type', sa.Enum('CLOCK_IN', 'CLOCK_OUT', name='bookingclockeventtypeenum'), nullable=False),
-    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(['working_day_id'], ['booking_workday.id'], ),
-    sa.PrimaryKeyConstraint('id')
+    op.create_table('booking_work_session',
+        sa.Column('working_day_id', sa.Integer(), nullable=False),
+        sa.Column('clock_in', sa.DateTime(), nullable=True),
+        sa.Column('clock_out', sa.DateTime(), nullable=True),
+        sa.Column('booking_id', sa.String(), nullable=False),
+        # sa.Column('event_type', sa.Enum('CLOCK_IN', 'CLOCK_OUT', name='bookingclockeventtypeenum'), nullable=False),
+        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(['working_day_id'], ['booking_workday.id'], ),
+        sa.ForeignKeyConstraint(['booking_id'], ['booking.booking_id'], ),
+        sa.PrimaryKeyConstraint('id')
     )
 
     with op.batch_alter_table('wallet', schema=None) as batch_op:
@@ -80,6 +84,28 @@ def upgrade():
             )
         )
 
+    with op.batch_alter_table('booking', schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                'clock_in_flag', sa.Boolean(),
+                nullable=True, server_default='false'
+            )
+        )
+        batch_op.add_column(
+            sa.Column(
+                'current_work_session_id',
+                sa.Integer(),
+                nullable=True
+            )
+        )
+    op.execute(
+        """
+        ALTER TABLE booking
+        ADD CONSTRAINT fk_current_work_session_id
+        FOREIGN KEY (current_work_session_id)
+        REFERENCES booking_work_session (id);
+        """
+    )
     # ### end Alembic commands ###
 
 
@@ -99,14 +125,20 @@ def downgrade():
         SET status = CASE
             WHEN status::text = 'IN_PROGRESS' THEN '{old_enum_values[0]}'::{old_enum_name}
             WHEN status::text = 'COMPLETED' THEN '{old_enum_values[1]}'::{old_enum_name}
+            WHEN status::text = 'PENDING' THEN NULL
             ELSE status
         END
     """))
 
     with op.batch_alter_table('wallet', schema=None) as batch_op:
         batch_op.drop_column('is_activated')
-    op.drop_table('booking_clock_event')
+
+    with op.batch_alter_table('booking', schema=None) as batch_op:
+        batch_op.drop_column('clock_in_flag')
+        batch_op.drop_constraint('fk_current_work_session_id')
+        batch_op.drop_column('current_work_session_id')
+
+    op.drop_table('booking_work_session')
     op.drop_table('booking_workday')
     op.execute("DROP TYPE bookingworkdayenum")
-    op.execute("DROP TYPE bookingclockeventtypeenum")
     # ### end Alembic commands ###

models/bookings.py

@@ -78,18 +78,32 @@ class BookingWorkDay(BaseModelPR, TimestampMixin, db.Model):
         db.ForeignKey('booking_contract.id'),
         nullable=True
     )
-    booking_id = db.Column(db.String, db.ForeignKey('booking.booking_id'))
+    booking_id = db.Column(
+        db.String,
+        db.ForeignKey('booking.booking_id'),
+        nullable=False
+    )
     name = db.Column(db.Enum(BookingWorkDayEnum), nullable=False)
     date = db.Column(db.Date)
+    work_sessions = db.relationship(
+        'BookingWorkSession',
+        backref='booking_work_day'
+    )
 
 
-class BookingClockEvent(BaseModelPR, TimestampMixin, db.Model):
+class BookingWorkSession(BaseModelPR, TimestampMixin, db.Model):
     working_day_id = db.Column(
         db.Integer,
         db.ForeignKey('booking_workday.id'),
         nullable=False
     )
-    event_type = db.Column(db.Enum(BookingClockEventTypeEnum), nullable=False)
+    booking_id = db.Column(
+        db.String,
+        db.ForeignKey('booking.booking_id'),
+        nullable=False
+    )
+    clock_in = db.Column(db.DateTime)
+    clock_out = db.Column(db.DateTime)
 
 
 class BookingContract(TimestampMixin, BaseModelPR, db.Model):
@@ -143,7 +157,6 @@ def get_by_name(cls, val):
 
 class Booking(TimestampMixin, db.Model):
     # TODO: Implement activity track/logs
-
     # Table Columns
     booking_id = db.Column(db.String, primary_key=True, unique=True)
     customer_id = db.Column(
@@ -183,12 +196,21 @@ class Booking(TimestampMixin, db.Model):
         db.Enum(BookingPaymentMethod),
         index=True
     )
+    clock_in_flag = db.Column(
+        db.Boolean, server_default='false',
+        default=False
+    )
     booking_contract = db.relationship(
         'BookingContract',
         backref='booking',
         uselist=False
     )
+    current_work_session_id = db.Column(
+        db.Integer,
+        db.ForeignKey('booking_work_session.id')
+    )
     images = db.relationship('Blob', backref='booking')
+    working_days = db.relationship('BookingWorkDay', backref='booking')
 
     def update_start_time(self):
         self.start_time = dt.utcnow()
@@ -228,12 +250,14 @@ def start_booking(self, sess):
 
         sess.add(new_work_day)
         sess.flush()
-        clock_in = BookingClockEvent(
+        clock = BookingWorkSession(
             working_day_id=new_work_day.id,
-            event_type=BookingClockEventTypeEnum.CLOCK_IN
+            clock_in=current_day,
+            booking_id=self.booking_id
         )
-        sess.add(clock_in)
+        sess.add(clock)
         sess.flush()
+        self.current_work_session_id = clock.id
 
     def add_clock_event(self, sess, clock_in=True):
         current_day = dt.now(datetime.timezone.utc)
@@ -249,19 +273,32 @@ def add_clock_event(self, sess, clock_in=True):
         if not working_day:
             working_day = BookingWorkDay(
                 name=BookingWorkDayEnum[dow.upper()],
-                date=current_day.date()
+                date=current_day.date(),
+                booking_id=self.booking_id
             )
             if self.contract_type:
                 working_day.contract_id = self.booking_contract.id
+            sess.add(working_day)
             sess.flush()
+
         # add clock-in
-        clock_in = BookingClockEvent(
-            working_day_id=working_day.id
-        )
         if clock_in:
-            clock_in.event_type = BookingClockEventTypeEnum.CLOCK_IN
+            clock = BookingWorkSession(
+                working_day_id=working_day.id,
+                booking_id=self.booking_id,
+                clock_in=current_day
+            )
+            sess.add(clock)
+            sess.flush()
+            self.current_work_session_id = clock.id
         else:
-            clock_in.event_type = BookingClockEventTypeEnum.CLOCK_OUT
+            self.current_work_session(sess).clock_out = current_day
 
-        sess.add(clock_in)
         sess.flush()
+
+    def current_work_session(self, sess):
+        return sess.scalar(
+            select(BookingWorkSession).where(
+                BookingWorkSession.id == self.current_work_session_id
+            )
+        )