resolve conflict

packages/payment-providers/src/providers/telebirr/telebirr.provider.ts

@@ -352,7 +352,7 @@ export class TelebirrProvider implements PaymentProvider {
     return this.config.get<string>("telebirr.timeoutExpress") ?? "15m";
   }
   private get privateKey(): string {
-    return `-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC/ZcoOng1sJZ4CegopQVCw3HYqqVRLEudgT+dDpS8fRVy7zBgqZunju2VRCQuHeWs7yWgc9QGd4/8kRSLY+jlvKNeZ60yWcqEY+eKyQMmcjOz2Sn41fcVNgF+HV3DGiV4b23B6BCMjnpEFIb9d99/TsjsFSc7gCPgfl2yWDxE/Y1B2tVE6op2qd63YsMVFQGdre/CQYvFJENpQaBLMq4hHyBDgluUXlF0uA1X7UM0ZjbFC6ZIB/Hn1+pl5Ua8dKYrkVaecolmJT/s7c/+/1JeN+ja8luBoONsoODt2mTeVJHLF9Y3oh5rI+IY8HukIZJ1U6O7/JcjH3aRJTZagXUS9AgMBAAECggEBALBIBx8JcWFfEDZFwuAWeUQ7+VX3mVx/770kOuNx24HYt718D/HV0avfKETHqOfA7AQnz42EF1Yd7Rux1ZO0e3unSVRJhMO4linT1XjJ9ScMISAColWQHk3wY4va/FLPqG7N4L1w3BBtdjIc0A2zRGLNcFDBlxl/CVDHfcqD3CXdLukm/friX6TvnrbTyfAFicYgu0+UtDvfxTL3pRL3u3WTkDvnFK5YXhoazLctNOFrNiiIpCW6dJ7WRYRXuXhz7C0rENHyBtJ0zura1WD5oDbRZ8ON4v1KV4QofWiTFXJpbDgZdEeJJmFmt5HIi+Ny3P5n31WwZpRMHGeHrV23//0CgYEA+2/gYjYWOW3JgMDLX7r8fGPTo1ljkOUHuH98H/a/lE3wnnKKx+2ngRNZX4RfvNG4LLeWTz9plxR2RAqqOTbX8fj/NA/sS4mru9zvzMY1925FcX3WsWKBgKlLryl0vPScq4ejMLSCmypGz4VgLMYZqT4NYIkU2Lo1G1MiDoLy0CcCgYEAwt77exynUhM7AlyjhAA2wSINXLKsdFFF1u976x9kVhOfmbAutfMJPEQWb2WXaOJQMvMpgg2rU5aVsyEcuHsRH/2zatrxrGqLqgxaiqPz4ELINIh1iYK/hdRpr1vATHoebOv1wt8/9qxITNKtQTgQbqYci3KV1lPsOrBAB5S57nsCgYAvw+cagS/jpQmcngOEoh8I+mXgKEET64517DIGWHe4kr3dO+FFbc5eZPCbhqgxVJ3qUM4LK/7BJq/46RXBXLvVSfohR80Z5INtYuFjQ1xJLveeQcuhUxdK+95W3kdBBi8lHtVPkVsmYvekwK+ukcuaLSGZbzE4otcn47kajKHYDQKBgDbQyIbJ+ZsRw8CXVHu2H7DWJlIUBIS3s+CQ/xeVfgDkhjmSIKGX2to0AOeW+S9MseiTE/L8a1wY+MUppE2UeK26DLUbH24zjlPoI7PqCJjl0DFOzVlACSXZKV1lfsNEeriC61/EstZtgezyOkAlSCIH4fGr6tAeTU349Bnt0RtvAoGBAObgxjeH6JGpdLz1BbMj8xUHuYQkbxNeIPhH29CySn0vfhwg9VxAtIoOhvZeCfnsCRTj9OZjepCeUqDiDSoFznglrKhfeKUndHjvg+9kiae92iI6qJudPCHMNwP8wMSphkxUqnXFR3lr9A765GA980818UWZdrhrjLKtIIZdh+X1\n-----END PRIVATE KEY-----`
+    return this.config.get<string>("telebirr.privateKey") ?? "";
   }
   private get publicKey(): string {
     return this.config.get<string>("telebirr.publicKey") ?? "";

packages/types/src/passenger/index.ts

@@ -1,5 +1,7 @@
 import type { BaseEntity } from "../common";
 
+export * from "./support-chat";
+
 export enum TicketStatus {
   Reserved = "RESERVED",
   Confirmed = "CONFIRMED",

packages/types/src/passenger/support-chat.ts

@@ -0,0 +1,103 @@
+/**
+ * Shared contracts for the passenger in-app customer-support chat.
+ *
+ * Unlike freight (company-scoped), a passenger conversation ("ticket") belongs to a
+ * single **individual passenger** (keyed by their IAM user id). Backoffice agents
+ * work a shared inbox (no assignment). Messages are text-only for the MVP.
+ *
+ * These are the wire (JSON) shapes — dates are ISO strings — plus the frozen
+ * Socket.IO event/namespace constants shared by the gateway (emitter) and both
+ * passenger web apps (subscribers).
+ */
+
+/** Lifecycle of a support conversation. Mirrors the Prisma `SupportConversationStatus`. */
+export enum PassengerSupportStatus {
+  OPEN = "OPEN",
+  RESOLVED = "RESOLVED",
+  CLOSED = "CLOSED",
+}
+
+/** Author of a message. The Prisma `SupportSender` also has `BOT` (legacy, unused here). */
+export enum PassengerSupportSender {
+  USER = "USER",
+  AGENT = "AGENT",
+}
+
+/** A single chat message on the wire. */
+export interface PassengerSupportMessageDto {
+  id: string;
+  conversationId: string;
+  sender: PassengerSupportSender;
+  /** Display name of the author, best-effort. */
+  authorName?: string | null;
+  text: string;
+  createdAt: string;
+}
+
+/** A conversation ("ticket") on the wire, with denormalized last-message fields. */
+export interface PassengerSupportConversationDto {
+  id: string;
+  /** Set for authenticated passengers; null for guest conversations. */
+  userId?: string | null;
+  /** Set for guest (unauthenticated) conversations. */
+  guestId?: string | null;
+  guestEmail?: string | null;
+  guestPhone?: string | null;
+  passengerId?: string | null;
+  /** Display name — passenger's name for authed, guest's name for guests. */
+  passengerName?: string | null;
+  subject?: string | null;
+  status: PassengerSupportStatus;
+  assignedAgentId?: string | null;
+  lastMessageAt?: string | null;
+  lastMessagePreview?: string | null;
+  lastMessageSender?: PassengerSupportSender | null;
+  /** Unread count for the caller's side (messages from the other sender after their cursor). */
+  unreadCount: number;
+  createdAt: string;
+  updatedAt: string;
+}
+
+/** Customer opens a new ticket: subject + first message. */
+export interface CreatePassengerSupportConversationDto {
+  subject: string;
+  initialMessage: string;
+}
+
+/** Guest (unauthenticated) opens a ticket: identity + contact captured up front. */
+export interface CreateGuestSupportConversationDto {
+  guestId: string;
+  name: string;
+  email: string;
+  phone?: string;
+  subject: string;
+  initialMessage: string;
+}
+
+/** Post a message into an existing conversation. */
+export interface SendPassengerSupportMessageDto {
+  text: string;
+}
+
+/** Paginated list envelope for the conversations list endpoints. */
+export interface PassengerSupportConversationListResult {
+  items: PassengerSupportConversationDto[];
+  count: number;
+  /** Total unread conversations for the caller's side (badge source). */
+  unreadCount: number;
+}
+
+/** Socket.io event names pushed server → client on the passenger support namespace. */
+export const PASSENGER_SUPPORT_WS_EVENTS = {
+  MESSAGE_NEW: "passenger-support:message-new",
+  CONVERSATION_UPDATED: "passenger-support:conversation-updated",
+} as const;
+
+/** Socket.io namespace the passenger support gateway listens on. */
+export const PASSENGER_SUPPORT_WS_NAMESPACE = "passenger-support-chat";
+
+/** Payload for {@link PASSENGER_SUPPORT_WS_EVENTS.MESSAGE_NEW}. */
+export interface PassengerSupportMessageEvent {
+  conversation: PassengerSupportConversationDto;
+  message: PassengerSupportMessageDto;
+}