diff --git a/apps/metamigo-api/app/lib/whatsapp-key-store.ts b/apps/metamigo-api/app/lib/whatsapp-key-store.ts index bf38e71..5cb149e 100644 --- a/apps/metamigo-api/app/lib/whatsapp-key-store.ts +++ b/apps/metamigo-api/app/lib/whatsapp-key-store.ts @@ -16,7 +16,7 @@ import { SignalKeyStore, SignalKeyStoreWithTransaction, } from "@adiwajshing/baileys"; -import { SavedWhatsappBot as Bot } from "db"; +import { SavedWhatsappBot as Bot } from "@digiresilience/metamigo-db"; const KEY_MAP: { [T in keyof SignalDataTypeMap]: string } = { "pre-key": "preKeys", diff --git a/apps/metamigo-api/app/plugins/index.ts b/apps/metamigo-api/app/plugins/index.ts index 3a66547..8786838 100644 --- a/apps/metamigo-api/app/plugins/index.ts +++ b/apps/metamigo-api/app/plugins/index.ts @@ -3,7 +3,7 @@ import Schmervice from "@hapipal/schmervice"; import PgPromisePlugin from "@digiresilience/hapi-pg-promise"; import type { IAppConfig } from "../../config"; -import { dbInitOptions } from "db"; +import { dbInitOptions } from "@digiresilience/metamigo-db"; import { registerNextAuth } from "./hapi-nextauth"; import { registerSwagger } from "./swagger"; import { registerNextAuthJwt } from "./nextauth-jwt"; diff --git a/apps/metamigo-api/app/routes/voice/index.ts b/apps/metamigo-api/app/routes/voice/index.ts index 97c31bb..855bcff 100644 --- a/apps/metamigo-api/app/routes/voice/index.ts +++ b/apps/metamigo-api/app/routes/voice/index.ts @@ -5,7 +5,7 @@ import * as R from "remeda"; import * as Helpers from "../helpers"; import Twilio from "twilio"; import { crudRoutesFor, CrudControllerBase } from "@digiresilience/metamigo-common"; -import { VoiceLineRecord, SavedVoiceLine } from "db"; +import { VoiceLineRecord, SavedVoiceLine } from "@digiresilience/metamigo-db"; const TwilioHandlers = { freeNumbers: async (provider, request: Hapi.Request) => { diff --git a/apps/metamigo-api/app/routes/voice/twilio/index.ts b/apps/metamigo-api/app/routes/voice/twilio/index.ts index 4d4779e..4f87afb 100644 --- a/apps/metamigo-api/app/routes/voice/twilio/index.ts +++ b/apps/metamigo-api/app/routes/voice/twilio/index.ts @@ -2,7 +2,7 @@ import * as Hapi from "@hapi/hapi"; import * as Joi from "joi"; import * as Boom from "@hapi/boom"; import Twilio from "twilio"; -import { SavedVoiceProvider } from "db"; +import { SavedVoiceProvider } from "@digiresilience/metamigo-db"; import pMemoize from "p-memoize"; import ms from "ms"; import * as Helpers from "../../helpers"; diff --git a/apps/metamigo-api/app/services/settings.ts b/apps/metamigo-api/app/services/settings.ts index f052c07..151168b 100644 --- a/apps/metamigo-api/app/services/settings.ts +++ b/apps/metamigo-api/app/services/settings.ts @@ -1,6 +1,6 @@ import * as Hapi from "@hapi/hapi"; import * as Schmervice from "@hapipal/schmervice"; -import { settingInfo, SettingsService } from "db"; +import { settingInfo, SettingsService } from "@digiresilience/metamigo-db"; export const VoicemailPrompt = settingInfo("voicemail-prompt"); export const VoicemailMinLength = settingInfo("voicemail-min-length"); @@ -8,7 +8,7 @@ export const VoicemailUseTextPrompt = settingInfo( "voicemail-use-text-prompt" ); -export { ISettingsService } from "db"; +export { ISettingsService } from "@digiresilience/metamigo-db"; // @ts-expect-error const service = (server: Hapi.Server): Schmervice.ServiceFunctionalInterface => SettingsService(server.db().settings); diff --git a/apps/metamigo-api/app/services/signald.ts b/apps/metamigo-api/app/services/signald.ts index 620e74c..f6118d7 100644 --- a/apps/metamigo-api/app/services/signald.ts +++ b/apps/metamigo-api/app/services/signald.ts @@ -6,7 +6,7 @@ import { IncomingMessagev1, ClientMessageWrapperv1 } from "@digiresilience/node-signald"; -import { SavedSignalBot as Bot } from "db"; +import { SavedSignalBot as Bot } from "@digiresilience/metamigo-db"; import workerUtils from "../../worker-utils"; export default class SignaldService extends Service { diff --git a/apps/metamigo-api/app/services/whatsapp.ts b/apps/metamigo-api/app/services/whatsapp.ts index 306652a..a821aeb 100644 --- a/apps/metamigo-api/app/services/whatsapp.ts +++ b/apps/metamigo-api/app/services/whatsapp.ts @@ -1,6 +1,6 @@ import { Server } from "@hapi/hapi"; import { Service } from "@hapipal/schmervice"; -import { SavedWhatsappBot as Bot } from "db"; +import { SavedWhatsappBot as Bot } from "@digiresilience/metamigo-db"; import makeWASocket, { DisconnectReason, proto, downloadContentFromMessage, MediaType } from "@adiwajshing/baileys"; import workerUtils from "../../worker-utils"; import { useDatabaseAuthState } from "../lib/whatsapp-key-store"; diff --git a/apps/metamigo-api/app/types/index.ts b/apps/metamigo-api/app/types/index.ts index 9bc41f9..8595e00 100644 --- a/apps/metamigo-api/app/types/index.ts +++ b/apps/metamigo-api/app/types/index.ts @@ -3,7 +3,7 @@ import type { ISettingsService } from "../services/settings"; import type WhatsappService from "../services/whatsapp"; import type SignaldService from "../services/signald"; import type { IAppConfig } from "../../config"; -import type { AppDatabase } from "db"; +import type { AppDatabase } from "@digiresilience/metamigo-db"; // add your service interfaces here interface AppServices { diff --git a/apps/metamigo-api/server/manifest.ts b/apps/metamigo-api/server/manifest.ts index 580812d..df1f3f3 100644 --- a/apps/metamigo-api/server/manifest.ts +++ b/apps/metamigo-api/server/manifest.ts @@ -4,7 +4,7 @@ import * as Blipp from "blipp"; import HapiBasic from "@hapi/basic"; import HapiJwt from "hapi-auth-jwt2"; import HapiPostgraphile from "hapi-postgraphile"; -import { getPostGraphileOptions } from "db"; +import { getPostGraphileOptions } from "@digiresilience/metamigo-db"; import AppPlugin from "../app"; import type { IAppConfig } from "../config"; diff --git a/apps/metamigo-worker/common.ts b/apps/metamigo-worker/common.ts index 464ae57..3a9dd89 100644 --- a/apps/metamigo-worker/common.ts +++ b/apps/metamigo-worker/common.ts @@ -1,5 +1,5 @@ /* eslint-disable camelcase */ -import { SavedVoiceProvider } from "db"; +import { SavedVoiceProvider } from "@digiresilience/metamigo-db"; import Twilio from "twilio"; import { CallInstance } from "twilio/lib/rest/api/v2010/account/call"; import { Zammad, getOrCreateUser } from "./zammad"; diff --git a/apps/metamigo-worker/db.ts b/apps/metamigo-worker/db.ts index 4240a86..7bf58e4 100644 --- a/apps/metamigo-worker/db.ts +++ b/apps/metamigo-worker/db.ts @@ -1,6 +1,6 @@ import pgPromise from "pg-promise"; import * as pgMonitor from "pg-monitor"; -import { dbInitOptions, IRepositories, AppDatabase } from "db"; +import { dbInitOptions, IRepositories, AppDatabase } from "@digiresilience/metamigo-db"; import config from "config"; import type { IInitOptions } from "pg-promise"; @@ -44,4 +44,4 @@ export const withDb = (f: (db: AppDatabase) => Promise): Promise => { } }; -export type { AppDatabase } from "db"; +export type { AppDatabase } from "@digiresilience/metamigo-db"; diff --git a/packages/metamigo-cli/index.ts b/packages/metamigo-cli/index.ts index a369586..6f9b3fa 100644 --- a/packages/metamigo-cli/index.ts +++ b/packages/metamigo-cli/index.ts @@ -2,7 +2,7 @@ import { Command } from "commander"; import { startWithout } from "@digiresilience/montar"; -import { migrateWrapper } from "db"; +import { migrateWrapper } from "@digiresilience/metamigo-db"; import { loadConfig } from "config"; import { genConf, listConfig } from "./config"; import { createTokenForTesting, generateJwks } from "./jwks"; diff --git a/packages/metamigo-cli/postgraphile.ts b/packages/metamigo-cli/postgraphile.ts index 996314c..c0ee705 100644 --- a/packages/metamigo-cli/postgraphile.ts +++ b/packages/metamigo-cli/postgraphile.ts @@ -8,7 +8,7 @@ import { import { createPostGraphileSchema } from "postgraphile"; import { Pool } from "pg"; import { loadConfig } from "config"; -import { getPostGraphileOptions } from "db"; +import { getPostGraphileOptions } from "@digiresilience/metamigo-db"; export const exportGraphqlSchema = async (): Promise => { const config = await loadConfig();