Changeset f6ed6e4

Timestamp:

08/22/26 19:00:38 (6 hours ago)

Author:

veronika-ils <ilioskaveronika@…>

Branches:

master

Parents:

ae83647

Message:

feat: The app is consistent with the changes made in phase 1 and phase 2

Files:

• petify-backend/sql/ddl.sql (modified) (3 diffs)
• petify-backend/sql/dml.sql (modified) (1 diff)
• petify-backend/src/main/java/com/petify/petify/api/VetClinicsController.java (modified) (4 diffs)
• petify-backend/src/main/java/com/petify/petify/config/SecurityConfig.java (modified) (1 diff)
• petify-backend/src/main/java/com/petify/petify/domain/UserReview.java (modified) (2 diffs)
• petify-backend/src/main/java/com/petify/petify/domain/VetClinic.java (modified) (2 diffs)
• petify-backend/src/main/java/com/petify/petify/dto/CreateReviewRequest.java (modified) (2 diffs)
• petify-backend/src/main/java/com/petify/petify/dto/UpdateClinicScheduleRequest.java (added)
• petify-backend/src/main/java/com/petify/petify/dto/VetClinicDTO.java (modified) (2 diffs)
• petify-backend/src/main/java/com/petify/petify/service/AppointmentService.java (modified) (7 diffs)
• petify-backend/src/main/java/com/petify/petify/service/ReviewService.java (modified) (5 diffs)
• petify-backend/src/main/resources/db/migration/V11__Add_user_review_interaction_type.sql (added)
• petify-backend/src/main/resources/db/migration/V12__Add_clinic_work_schedule.sql (added)
• petify-frontend/src/api/profile.ts (modified) (2 diffs)
• petify-frontend/src/api/reviews.ts (modified) (2 diffs)
• petify-frontend/src/views/ClinicDashboardView.vue (modified) (19 diffs)
• petify-frontend/src/views/OwnerProfileView.vue (modified) (7 diffs)

petify-backend/sql/ddl.sql

@@ -107 +107 @@
                              city      VARCHAR(80)  NOT NULL,
                              address   VARCHAR(200) NOT NULL,
+                             work_days VARCHAR(120),
+                             start_time TIME,
+                             end_time   TIME,
                              user_id   BIGINT       UNIQUE,
                              application_id BIGINT UNIQUE,
@@ -227 +230 @@
                               review_id      BIGINT,
                               target_user_id BIGINT NOT NULL,
+                              interaction_type VARCHAR(40) NOT NULL,
 
                               CONSTRAINT user_reviews_PK PRIMARY KEY (review_id),
@@ -234 +238 @@
                               CONSTRAINT user_reviews_target_FK FOREIGN KEY (target_user_id)
                                   REFERENCES users(user_id)
-                                  ON DELETE RESTRICT
+                                  ON DELETE RESTRICT,
+                              CONSTRAINT user_reviews_interaction_type_CHK CHECK (
+                                  interaction_type IN ('EVENT', 'PERSONAL_INTERACTION', 'ONLINE', 'PHONE_CALL', 'OTHER')
+                              )
 );
 

petify-backend/sql/dml.sql

@@ -116 +116 @@
 VALUES (1, (SELECT clinic_id FROM vet_clinics WHERE name='Happy Paws Clinic'));
 
-INSERT INTO user_reviews (review_id, target_user_id) VALUES
-                                                         (2, (SELECT user_id FROM users WHERE username='client.igor')),
-                                                         (3, (SELECT user_id FROM users WHERE username='client.mila'));
+INSERT INTO user_reviews (review_id, target_user_id, interaction_type) VALUES
+                                                         (2, (SELECT user_id FROM users WHERE username='client.igor'), 'PERSONAL_INTERACTION'),
+                                                         (3, (SELECT user_id FROM users WHERE username='client.mila'), 'ONLINE');
 
 INSERT INTO health_records (animal_id, appointment_id, type, description, date) VALUES

petify-backend/src/main/java/com/petify/petify/api/VetClinicsController.java

@@ -2 +2 @@
 
 import com.petify.petify.domain.VetClinic;
+import com.petify.petify.dto.UpdateClinicScheduleRequest;
 import com.petify.petify.dto.VetClinicDTO;
 import com.petify.petify.repo.VetClinicRepository;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalTime;
+import java.time.format.DateTimeParseException;
+import java.util.Arrays;
+import java.util.Set;
 import java.util.List;
 import java.util.Map;
@@ -17 +24 @@
 @RequestMapping("/api/clinics")
 public class VetClinicsController {
+
+    private static final Set<String> ALLOWED_WORK_DAYS = Set.of(
+        "MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY"
+    );
 
     private final VetClinicRepository vetClinicRepository;
@@ -40 +51 @@
     }
 
+    @PutMapping("/my/schedule")
+    public ResponseEntity<?> updateMyClinicSchedule(
+        @RequestHeader("X-User-Id") Long userId,
+        @RequestBody UpdateClinicScheduleRequest request) {
+        try {
+            VetClinic clinic = vetClinicRepository.findByUserId(userId)
+                .orElseThrow(() -> new RuntimeException("User is not linked to a clinic"));
+
+            String workDays = normalizeWorkDays(request.getWorkDays());
+            LocalTime startTime = parseTime(request.getStartTime(), "Start time");
+            LocalTime endTime = parseTime(request.getEndTime(), "End time");
+
+            if (!startTime.isBefore(endTime)) {
+                throw new RuntimeException("Start time must be before end time");
+            }
+
+            if (java.time.Duration.between(startTime, endTime).toMinutes() < 30) {
+                throw new RuntimeException("Clinic schedule must contain at least one 30-minute slot");
+            }
+
+            clinic.setWorkDays(workDays);
+            clinic.setStartTime(startTime);
+            clinic.setEndTime(endTime);
+
+            return ResponseEntity.ok(mapToDTO(vetClinicRepository.save(clinic)));
+        } catch (RuntimeException e) {
+            return ResponseEntity.badRequest().body(Map.of("error", e.getMessage()));
+        }
+    }
+
     private VetClinicDTO mapToDTO(VetClinic clinic) {
         return new VetClinicDTO(
@@ -45 +86 @@
             clinic.getName(),
             clinic.getCity(),
-            clinic.getAddress()
+            clinic.getAddress(),
+            clinic.getWorkDays(),
+            clinic.getStartTime() != null ? clinic.getStartTime().toString() : null,
+            clinic.getEndTime() != null ? clinic.getEndTime().toString() : null
         );
+    }
+
+    private String normalizeWorkDays(String workDays) {
+        if (workDays == null || workDays.isBlank()) {
+            throw new RuntimeException("Choose at least one working day");
+        }
+
+        List<String> normalized = Arrays.stream(workDays.split(","))
+            .map(String::trim)
+            .filter(day -> !day.isBlank())
+            .map(String::toUpperCase)
+            .distinct()
+            .toList();
+
+        if (normalized.isEmpty()) {
+            throw new RuntimeException("Choose at least one working day");
+        }
+
+        for (String day : normalized) {
+            if (!ALLOWED_WORK_DAYS.contains(day)) {
+                throw new RuntimeException("Invalid working day: " + day);
+            }
+        }
+
+        return String.join(",", normalized);
+    }
+
+    private LocalTime parseTime(String value, String label) {
+        if (value == null || value.isBlank()) {
+            throw new RuntimeException(label + " is required");
+        }
+
+        try {
+            return LocalTime.parse(value);
+        } catch (DateTimeParseException e) {
+            throw new RuntimeException(label + " must be in HH:mm format");
+        }
     }
 }

petify-backend/src/main/java/com/petify/petify/config/SecurityConfig.java

@@ -96 +96 @@
                         .requestMatchers(HttpMethod.GET, "/api/clinics").permitAll()
                         .requestMatchers(HttpMethod.GET, "/api/clinics/my").permitAll()
+                        .requestMatchers(HttpMethod.PUT, "/api/clinics/my/schedule").permitAll()
                         .requestMatchers(HttpMethod.GET, "/api/notifications/my").permitAll()
 

petify-backend/src/main/java/com/petify/petify/domain/UserReview.java

@@ -19 +19 @@
     private Long targetUserId;
 
+    @Column(name = "interaction_type", nullable = false, length = 40)
+    private String interactionType;
+
     public UserReview() {}
 
-    public UserReview(Review review, Long targetUserId) {
+    public UserReview(Review review, Long targetUserId, String interactionType) {
         this.review = review;        // DO NOT set reviewId
         this.targetUserId = targetUserId;
+        this.interactionType = interactionType;
     }
 
@@ -51 +55 @@
         this.targetUserId = targetUserId;
     }
+
+    public String getInteractionType() {
+        return interactionType;
+    }
+
+    public void setInteractionType(String interactionType) {
+        this.interactionType = interactionType;
+    }
 }
 

petify-backend/src/main/java/com/petify/petify/domain/VetClinic.java

@@ -4 +4 @@
 import lombok.Getter;
 import lombok.Setter;
+
+import java.time.LocalTime;
 
 @Setter
@@ -37 +39 @@
     private String address;
 
+    @Column(name = "work_days")
+    private String workDays;
+
+    @Column(name = "start_time")
+    private LocalTime startTime;
+
+    @Column(name = "end_time")
+    private LocalTime endTime;
+
     public VetClinic() {}
 

petify-backend/src/main/java/com/petify/petify/dto/CreateReviewRequest.java

@@ -9 +9 @@
     private Integer rating;
     private String comment;
+    private String interactionType;
 
     public CreateReviewRequest() {
@@ -18 +19 @@
     }
 
+    public CreateReviewRequest(Integer rating, String comment, String interactionType) {
+        this.rating = rating;
+        this.comment = comment;
+        this.interactionType = interactionType;
+    }
+
 }

petify-backend/src/main/java/com/petify/petify/dto/VetClinicDTO.java

@@ -11 +11 @@
     private String city;
     private String address;
+    private String workDays;
+    private String startTime;
+    private String endTime;
+    private Boolean scheduleComplete;
 
     public VetClinicDTO() {
@@ -22 +26 @@
     }
 
+    public VetClinicDTO(
+        Long clinicId,
+        String name,
+        String city,
+        String address,
+        String workDays,
+        String startTime,
+        String endTime
+    ) {
+        this.clinicId = clinicId;
+        this.name = name;
+        this.city = city;
+        this.address = address;
+        this.workDays = workDays;
+        this.startTime = startTime;
+        this.endTime = endTime;
+        this.scheduleComplete = workDays != null && !workDays.isBlank() && startTime != null && endTime != null;
+    }
+
 }
 

petify-backend/src/main/java/com/petify/petify/service/AppointmentService.java

@@ -31 +31 @@
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
@@ -38 +39 @@
 
     private static final Logger logger = LoggerFactory.getLogger(AppointmentService.class);
-    private static final LocalTime CLINIC_DAY_START = LocalTime.of(9, 0);
-    private static final LocalTime CLINIC_DAY_END = LocalTime.of(17, 0);
     private static final int SLOT_MINUTES = 30;
     private static final List<String> NON_BLOCKING_STATUSES = List.of("CANCELLED", "CANCELED", "NO_SHOW");
@@ -84 +83 @@
         }
 
-        if (!vetClinicRepository.existsById(request.getClinicId())) {
-            throw new RuntimeException("Vet clinic not found");
-        }
+        VetClinic clinic = vetClinicRepository.findById(request.getClinicId())
+            .orElseThrow(() -> new RuntimeException("Vet clinic not found"));
 
         LocalDateTime appointmentTime = LocalDateTime.parse(request.getDateTime());
-        if (!isClinicSlotAvailable(request.getClinicId(), appointmentTime)) {
+        if (!isClinicSlotAvailable(clinic, appointmentTime)) {
             throw new RuntimeException("Selected appointment slot is no longer available");
         }
@@ -210 +208 @@
         }
 
-        if (!vetClinicRepository.existsById(clinicId)) {
-            throw new RuntimeException("Vet clinic not found");
-        }
-
-        LocalDateTime dayStart = date.atTime(CLINIC_DAY_START);
-        LocalDateTime dayEnd = date.atTime(CLINIC_DAY_END);
+        VetClinic clinic = vetClinicRepository.findById(clinicId)
+            .orElseThrow(() -> new RuntimeException("Vet clinic not found"));
+        requireCompleteSchedule(clinic);
+
+        if (!isWorkingDay(clinic, date)) {
+            return List.of();
+        }
+
+        LocalDateTime dayStart = date.atTime(clinic.getStartTime());
+        LocalDateTime dayEnd = date.atTime(clinic.getEndTime());
         Set<LocalDateTime> bookedSlots = appointmentRepository
             .findByClinicIdAndDateTimeBetweenAndStatusNotInOrderByDateTimeAsc(
@@ -257 +259 @@
         }
 
-        if (!vetClinicRepository.existsById(clinicId)) {
-            throw new RuntimeException("Vet clinic not found");
-        }
-
-        LocalDateTime dayStart = date.atTime(CLINIC_DAY_START);
-        LocalDateTime dayEnd = date.atTime(CLINIC_DAY_END);
+        VetClinic clinic = vetClinicRepository.findById(clinicId)
+            .orElseThrow(() -> new RuntimeException("Vet clinic not found"));
+        requireCompleteSchedule(clinic);
+
+        if (!isWorkingDay(clinic, date)) {
+            return List.of();
+        }
+
+        LocalDateTime dayStart = date.atTime(clinic.getStartTime());
+        LocalDateTime dayEnd = date.atTime(clinic.getEndTime());
 
         return unavailableSlotRepository
@@ -282 +288 @@
         }
 
-        if (!vetClinicRepository.existsById(clinicId)) {
-            throw new RuntimeException("Vet clinic not found");
-        }
+        VetClinic clinic = vetClinicRepository.findById(clinicId)
+            .orElseThrow(() -> new RuntimeException("Vet clinic not found"));
 
         LocalDateTime slotTime = LocalDateTime.parse(request.getDateTime());
-        if (!isValidWorkingSlot(slotTime)) {
-            throw new RuntimeException("Unavailable slot must be a future 30-minute slot between 09:00 and 17:00");
+        if (!isValidWorkingSlot(clinic, slotTime)) {
+            throw new RuntimeException("Unavailable slot must be a future 30-minute slot inside your clinic working schedule");
         }
 
@@ -332 +337 @@
     }
 
-    private boolean isClinicSlotAvailable(Long clinicId, LocalDateTime appointmentTime) {
-        if (!isValidWorkingSlot(appointmentTime)) {
+    private boolean isClinicSlotAvailable(VetClinic clinic, LocalDateTime appointmentTime) {
+        if (!isValidWorkingSlot(clinic, appointmentTime)) {
             return false;
         }
 
         return !appointmentRepository.existsByClinicIdAndDateTimeAndStatusNotIn(
-            clinicId,
+            clinic.getClinicId(),
             appointmentTime,
             NON_BLOCKING_STATUSES
-        ) && !unavailableSlotRepository.existsByClinicIdAndDateTime(clinicId, appointmentTime);
-    }
-
-    private boolean isValidWorkingSlot(LocalDateTime appointmentTime) {
+        ) && !unavailableSlotRepository.existsByClinicIdAndDateTime(clinic.getClinicId(), appointmentTime);
+    }
+
+    private boolean isValidWorkingSlot(VetClinic clinic, LocalDateTime appointmentTime) {
+        requireCompleteSchedule(clinic);
         LocalTime time = appointmentTime.toLocalTime();
-        return !appointmentTime.isBefore(LocalDateTime.now())
-            && !time.isBefore(CLINIC_DAY_START)
-            && time.isBefore(CLINIC_DAY_END)
-            && appointmentTime.getMinute() % SLOT_MINUTES == 0
+        long minutesFromStart = java.time.Duration.between(clinic.getStartTime(), time).toMinutes();
+
+        return isWorkingDay(clinic, appointmentTime.toLocalDate())
+            && !appointmentTime.isBefore(LocalDateTime.now())
+            && !time.isBefore(clinic.getStartTime())
+            && time.isBefore(clinic.getEndTime())
+            && minutesFromStart >= 0
+            && minutesFromStart % SLOT_MINUTES == 0
             && appointmentTime.getSecond() == 0
             && appointmentTime.getNano() == 0;
+    }
+
+    private void requireCompleteSchedule(VetClinic clinic) {
+        if (clinic.getWorkDays() == null || clinic.getWorkDays().isBlank()
+            || clinic.getStartTime() == null
+            || clinic.getEndTime() == null) {
+            throw new RuntimeException("This clinic has not added working days and hours yet");
+        }
+
+        if (!clinic.getStartTime().isBefore(clinic.getEndTime())) {
+            throw new RuntimeException("Clinic working hours are invalid");
+        }
+    }
+
+    private boolean isWorkingDay(VetClinic clinic, LocalDate date) {
+        String day = date.getDayOfWeek().name();
+        return Arrays.stream(clinic.getWorkDays().split(","))
+            .map(String::trim)
+            .map(String::toUpperCase)
+            .anyMatch(day::equals);
     }
 

petify-backend/src/main/java/com/petify/petify/service/ReviewService.java

@@ -19 +19 @@
 
 import java.time.LocalDateTime;
+import java.util.Set;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -26 +27 @@
 
     private static final Logger logger = LoggerFactory.getLogger(ReviewService.class);
+    private static final Set<String> USER_REVIEW_INTERACTION_TYPES = Set.of(
+            "EVENT",
+            "PERSONAL_INTERACTION",
+            "ONLINE",
+            "PHONE_CALL",
+            "OTHER"
+    );
 
     private final ReviewRepository reviewRepository;
@@ -58 +66 @@
     public ReviewDTO createReview(Long reviewerId, Long targetUserId, CreateReviewRequest request) {
         logger.info("==== START createReview ====");
-        // Validate rating
-        if (request.getRating() == null || request.getRating() < 1 || request.getRating() > 5) {
-            logger.error(" VALIDATION FAILED: Invalid rating: {}", request.getRating());
-            throw new RuntimeException("Rating must be between 1 and 5");
-        }
+        validateReviewRequest(request);
+        String interactionType = normalizeUserReviewInteractionType(request.getInteractionType());
 
 
@@ -118 +123 @@
 
         userReview.setTargetUserId(targetUserId);
+        userReview.setInteractionType(interactionType);
 
         // Save UserReview to database with flush
@@ -285 +291 @@
     }
 
+    private String normalizeUserReviewInteractionType(String interactionType) {
+        if (interactionType == null || interactionType.isBlank()) {
+            throw new RuntimeException("Please choose how you interacted with this user");
+        }
+
+        String normalized = interactionType.trim().toUpperCase();
+        if (!USER_REVIEW_INTERACTION_TYPES.contains(normalized)) {
+            throw new RuntimeException("Interaction type must be one of: EVENT, PERSONAL_INTERACTION, ONLINE, PHONE_CALL, OTHER");
+        }
+
+        return normalized;
+    }
+
     private User getReviewer(Long reviewerId) {
         return userRepository.findById(reviewerId)

petify-frontend/src/api/profile.ts

@@ -35 +35 @@
   city: string
   address: string
+  workDays?: string
+  startTime?: string
+  endTime?: string
+  scheduleComplete?: boolean
 }
 
@@ -464 +468 @@
 }
 
+export async function updateMyClinicSchedule(
+  userId: number,
+  data: {
+    workDays: string
+    startTime: string
+    endTime: string
+  }
+): Promise<VetClinic> {
+  const url = joinUrl(getBaseUrl(), `/api/clinics/my/schedule`)
+  const response = await fetch(url, {
+    method: 'PUT',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-User-Id': String(userId),
+    },
+    body: JSON.stringify(data),
+  })
+
+  if (!response.ok) {
+    const error = await response.json()
+    throw new Error(error.error || `Failed to update clinic schedule: ${response.statusText}`)
+  }
+
+  return await response.json()
+}
+
 export async function getClinicAvailableSlots(clinicId: number, date: string): Promise<AppointmentSlot[]> {
   const url = joinUrl(getBaseUrl(), `/api/appointments/clinics/${clinicId}/available-slots?date=${encodeURIComponent(date)}`)

petify-frontend/src/api/reviews.ts

@@ -20 +20 @@
 }
 
+export type UserReviewInteractionType =
+  | 'EVENT'
+  | 'PERSONAL_INTERACTION'
+  | 'ONLINE'
+  | 'PHONE_CALL'
+  | 'OTHER'
+
 export async function createReview(
   targetUserId: number,
   userId: number,
   rating: number,
-  comment: string
+  comment: string,
+  interactionType: UserReviewInteractionType
 ): Promise<Review> {
   const url = joinUrl(getBaseUrl(), `/api/reviews/${targetUserId}`)
@@ -36 +44 @@
       rating,
       comment,
+      interactionType,
     }),
   })

petify-frontend/src/views/ClinicDashboardView.vue

@@ -8 +8 @@
           <p v-if="clinic" class="clinic-subtitle">{{ clinic.name }} - {{ clinic.city }}, {{ clinic.address }}</p>
         </div>
-        <div class="toolbar">
+        <div v-if="canUseSchedule" class="toolbar">
           <button class="btn btn-outline-secondary btn-sm" type="button" @click="goToPreviousDay">
             Previous day
@@ -34 +34 @@
 
       <template v-else>
+        <section v-if="clinic && !canUseSchedule" class="setup-panel">
+          <div>
+            <p class="eyebrow">Required setup</p>
+            <h2>Add your working schedule</h2>
+            <p class="setup-copy">
+              Users can book appointment slots only after your clinic adds working days and opening hours.
+            </p>
+          </div>
+
+          <form class="schedule-form" @submit.prevent="saveSchedule">
+            <fieldset class="days-fieldset">
+              <legend>Working days</legend>
+              <label v-for="day in workDayOptions" :key="day.value" class="day-check">
+                <input
+                  v-model="scheduleForm.workDays"
+                  type="checkbox"
+                  :value="day.value"
+                />
+                <span>{{ day.label }}</span>
+              </label>
+            </fieldset>
+
+            <div class="time-grid">
+              <div class="form-group">
+                <label class="form-label" for="startTime">Start time</label>
+                <input id="startTime" v-model="scheduleForm.startTime" class="form-control" type="time" required />
+              </div>
+              <div class="form-group">
+                <label class="form-label" for="endTime">End time</label>
+                <input id="endTime" v-model="scheduleForm.endTime" class="form-control" type="time" required />
+              </div>
+            </div>
+
+            <div v-if="scheduleSetupError" class="alert alert-danger">{{ scheduleSetupError }}</div>
+            <button class="btn btn-primary" type="submit" :disabled="isSavingSchedule">
+              {{ isSavingSchedule ? 'Saving...' : 'Save schedule' }}
+            </button>
+          </form>
+        </section>
+
+        <template v-else>
         <div class="summary-strip">
           <div class="summary-item">
@@ -59 +100 @@
 
             <div class="slot-grid">
+              <div v-if="daySlots.length === 0" class="panel-empty full-width">
+                This is not a working day for your clinic.
+              </div>
               <div
                 v-for="slot in daySlots"
@@ -131 +175 @@
           </aside>
         </div>
+        </template>
       </template>
     </section>
@@ -147 +192 @@
   getMyNotifications,
   markMyClinicAppointmentNoShow,
+  updateMyClinicSchedule,
   type AppNotification,
   type AppointmentSlot,
@@ -174 +220 @@
 const notifications = ref<AppNotification[]>([])
 const isLoading = ref(false)
+const isSavingSchedule = ref(false)
 const updatingAppointmentId = ref<number | null>(null)
 const accessError = ref('')
 const scheduleError = ref('')
+const scheduleSetupError = ref('')
 const notificationsError = ref('')
 const NON_BLOCKING_STATUSES = new Set(['CANCELLED', 'CANCELED', 'NO_SHOW'])
@@ -182 +230 @@
 
 const canUseDashboard = computed(() => auth.isAuthenticated && auth.user?.userType === 'CLINIC')
+const canUseSchedule = computed(() => Boolean(clinic.value?.scheduleComplete))
+const scheduleForm = ref({
+  workDays: [] as string[],
+  startTime: '09:00',
+  endTime: '17:00',
+})
+const workDayOptions = [
+  { value: 'MONDAY', label: 'Mon' },
+  { value: 'TUESDAY', label: 'Tue' },
+  { value: 'WEDNESDAY', label: 'Wed' },
+  { value: 'THURSDAY', label: 'Thu' },
+  { value: 'FRIDAY', label: 'Fri' },
+  { value: 'SATURDAY', label: 'Sat' },
+  { value: 'SUNDAY', label: 'Sun' },
+]
 
 const appointmentsByDateTime = computed(() => {
@@ -205 +268 @@
   const now = new Date()
 
-  for (let hour = 9; hour < 17; hour += 1) {
-    for (const minute of [0, 30]) {
-      const dateTime = `${selectedDate.value}T${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}`
-      const label = `${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}`
+  for (const time of getClinicTimesForDate(selectedDate.value)) {
+      const dateTime = `${selectedDate.value}T${time}`
+      const label = time
       const key = normalizeDateTime(dateTime)
       const appointment = appointmentsByDateTime.value.get(key)
@@ -252 +314 @@
         })
       }
-    }
   }
 
@@ -274 +335 @@
   const slots: AppointmentSlot[] = []
 
-  for (let hour = 9; hour < 17; hour += 1) {
-    for (const minute of [0, 30]) {
-      const dateTime = `${date}T${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}`
+  for (const time of getClinicTimesForDate(date)) {
+      const dateTime = `${date}T${time}`
       const key = normalizeDateTime(dateTime)
       if (new Date(dateTime).getTime() < now.getTime()) continue
@@ -282 +342 @@
       slots.push({
         dateTime,
-        label: `${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}`,
+        label: time,
       })
-    }
   }
 
@@ -291 +350 @@
 
 async function loadSchedule() {
-  if (!auth.user?.userId || !canUseDashboard.value || !selectedDate.value) return
+  if (!auth.user?.userId || !canUseDashboard.value || !canUseSchedule.value || !selectedDate.value) return
 
   const requestId = ++latestScheduleRequest
@@ -319 +378 @@
 }
 
+async function saveSchedule() {
+  if (!auth.user?.userId) return
+  if (scheduleForm.value.workDays.length === 0) {
+    scheduleSetupError.value = 'Choose at least one working day'
+    return
+  }
+
+  if (!scheduleForm.value.startTime || !scheduleForm.value.endTime) {
+    scheduleSetupError.value = 'Start and end time are required'
+    return
+  }
+
+  if (scheduleForm.value.startTime >= scheduleForm.value.endTime) {
+    scheduleSetupError.value = 'Start time must be before end time'
+    return
+  }
+
+  try {
+    isSavingSchedule.value = true
+    scheduleSetupError.value = ''
+    clinic.value = await updateMyClinicSchedule(auth.user.userId, {
+      workDays: scheduleForm.value.workDays.join(','),
+      startTime: scheduleForm.value.startTime,
+      endTime: scheduleForm.value.endTime,
+    })
+    hydrateScheduleForm()
+    await loadSchedule()
+  } catch (error) {
+    scheduleSetupError.value = error instanceof Error ? error.message : 'Failed to save clinic schedule'
+  } finally {
+    isSavingSchedule.value = false
+  }
+}
+
 async function loadNotifications() {
   if (!auth.user?.userId || !canUseDashboard.value) return
@@ -417 +510 @@
 }
 
+function hydrateScheduleForm() {
+  scheduleForm.value = {
+    workDays: clinic.value?.workDays ? clinic.value.workDays.split(',').map((day) => day.trim()).filter(Boolean) : [],
+    startTime: clinic.value?.startTime?.slice(0, 5) || '09:00',
+    endTime: clinic.value?.endTime?.slice(0, 5) || '17:00',
+  }
+}
+
+function getClinicTimesForDate(date: string): string[] {
+  if (!clinic.value?.workDays || !clinic.value.startTime || !clinic.value.endTime) return []
+  if (!isClinicWorkingDay(date)) return []
+
+  const times: string[] = []
+  const start = timeToMinutes(clinic.value.startTime)
+  const end = timeToMinutes(clinic.value.endTime)
+
+  for (let minutes = start; minutes < end; minutes += 30) {
+    times.push(minutesToTime(minutes))
+  }
+
+  return times
+}
+
+function isClinicWorkingDay(date: string): boolean {
+  const day = new Date(`${date}T00:00:00`).toLocaleDateString('en-US', { weekday: 'long' }).toUpperCase()
+  return clinic.value?.workDays?.split(',').map((item) => item.trim().toUpperCase()).includes(day) ?? false
+}
+
+function timeToMinutes(time: string): number {
+  const parts = time.slice(0, 5).split(':').map(Number)
+  const hours = parts[0] ?? 0
+  const minutes = parts[1] ?? 0
+  return hours * 60 + minutes
+}
+
+function minutesToTime(total: number): string {
+  const hours = Math.floor(total / 60)
+  const minutes = total % 60
+  return `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}`
+}
+
 function formatDateTime(value: string): string {
   return new Date(value).toLocaleString('en-US', {
@@ -439 +573 @@
   try {
     clinic.value = await getMyClinic(auth.user.userId)
+    hydrateScheduleForm()
     accessError.value = ''
   } catch (error) {
@@ -445 +580 @@
   }
 
-  await Promise.all([loadSchedule(), loadNotifications()])
+  if (canUseSchedule.value) {
+    await Promise.all([loadSchedule(), loadNotifications()])
+  } else {
+    await loadNotifications()
+  }
 })
 
@@ -510 +649 @@
 .summary-strip,
 .schedule-section,
-.appointments-panel {
+.appointments-panel,
+.setup-panel {
   background: white;
   border: 1px solid #e2e8f0;
@@ -529 +669 @@
   color: #718096;
   margin: 0;
+}
+
+.setup-panel {
+  display: grid;
+  gap: 24px;
+  padding: 28px;
+}
+
+.setup-panel h2 {
+  color: #1a202c;
+  font-size: 1.45rem;
+  margin: 0 0 8px;
+}
+
+.setup-copy {
+  color: #718096;
+  margin: 0;
+}
+
+.schedule-form {
+  display: grid;
+  gap: 20px;
+  max-width: 720px;
+}
+
+.days-fieldset {
+  border: 0;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  margin: 0;
+  padding: 0;
+}
+
+.days-fieldset legend {
+  color: #2d3748;
+  font-weight: 700;
+  margin-bottom: 8px;
+  width: 100%;
+}
+
+.day-check {
+  align-items: center;
+  border: 1px solid #cbd5e0;
+  border-radius: 8px;
+  cursor: pointer;
+  display: inline-flex;
+  gap: 8px;
+  padding: 9px 12px;
+}
+
+.day-check:has(input:checked) {
+  background: #fff7ed;
+  border-color: #f97316;
+  color: #9a3412;
+}
+
+.time-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 180px));
+  gap: 16px;
+}
+
+.form-group {
+  display: grid;
+  gap: 8px;
+}
+
+.form-label {
+  color: #2d3748;
+  font-weight: 700;
 }
 
@@ -625 +836 @@
 }
 
+.full-width {
+  grid-column: 1 / -1;
+}
+
 .slot-card {
   border: 1px solid #e2e8f0;

petify-frontend/src/views/OwnerProfileView.vue

@@ -208 +208 @@
 
                   <div class="form-group">
+                    <label class="form-label" for="interactionType">How did you interact?</label>
+                    <select
+                      id="interactionType"
+                      v-model="newReview.interactionType"
+                      class="form-control"
+                      required
+                    >
+                      <option value="" disabled>Select an option</option>
+                      <option
+                        v-for="option in interactionTypeOptions"
+                        :key="option.value"
+                        :value="option.value"
+                      >
+                        {{ option.label }}
+                      </option>
+                    </select>
+                  </div>
+
+                  <div class="form-group">
                     <label class="form-label" for="comment">Comment</label>
                     <textarea
@@ -226 +245 @@
                       type="submit"
                       class="btn btn-primary"
-                      :disabled="isSubmittingReview || newReview.rating === 0"
+                      :disabled="isSubmittingReview || newReview.rating === 0 || !newReview.interactionType"
                     >
                       <span v-if="isSubmittingReview">Submitting...</span>
@@ -287 +306 @@
 import { useRoute, RouterLink } from 'vue-router'
 import { getUserProfile, getUserListings, getUserPets, loadUserVerificationStatus } from '../api/profile'
-import { createReview, getReviewsByOwner, deleteReview as deleteReviewAPI } from '../api/reviews'
+import {
+  createReview,
+  getReviewsByOwner,
+  deleteReview as deleteReviewAPI,
+  type UserReviewInteractionType,
+} from '../api/reviews'
 import { useAuthStore } from '../stores/auth'
 
@@ -305 +329 @@
 const isSubmittingReview = ref(false)
 const reviewError = ref<string | null>(null)
-const newReview = ref({
+const interactionTypeOptions: Array<{ value: UserReviewInteractionType; label: string }> = [
+  { value: 'EVENT', label: 'Met at an event' },
+  { value: 'PERSONAL_INTERACTION', label: 'Personal interaction' },
+  { value: 'ONLINE', label: 'Online interaction' },
+  { value: 'PHONE_CALL', label: 'Phone call' },
+  { value: 'OTHER', label: 'Other' },
+]
+
+const newReview = ref<{
+  rating: number
+  comment: string
+  interactionType: UserReviewInteractionType | ''
+}>({
   rating: 0,
   comment: '',
+  interactionType: '',
 })
 
@@ -445 +482 @@
   }
 
+  if (!newReview.value.interactionType) {
+    reviewError.value = 'Please choose how you interacted with this user'
+    return
+  }
+
   isSubmittingReview.value = true
   reviewError.value = null
@@ -453 +495 @@
       auth.user.userId,
       newReview.value.rating,
-      newReview.value.comment
+      newReview.value.comment,
+      newReview.value.interactionType
     )
 
@@ -459 +502 @@
     newReview.value.rating = 0
     newReview.value.comment = ''
+    newReview.value.interactionType = ''
     await loadReviews()
   } catch (err) {