refactor: move fcm to gcloud folder

This commit is contained in:
2024-10-05 10:57:18 -04:00
parent e4ca45dbdc
commit 15c75eea5b
10 changed files with 12 additions and 12 deletions

View File

@@ -6,8 +6,8 @@ import { z } from "zod";
import { fetchEpisodeUrlFromAllProviders } from "~/controllers/episodes/getEpisodeUrl"; import { fetchEpisodeUrlFromAllProviders } from "~/controllers/episodes/getEpisodeUrl";
import { Case, changeStringCase } from "~/libs/changeStringCase"; import { Case, changeStringCase } from "~/libs/changeStringCase";
import type { AdminSdkCredentials } from "~/libs/fcm/getGoogleAuthToken"; import type { AdminSdkCredentials } from "~/libs/gcloud/getGoogleAuthToken";
import { sendFcmMessage } from "~/libs/fcm/sendFcmMessage"; import { sendFcmMessage } from "~/libs/gcloud/sendFcmMessage";
import { maybeScheduleNextAiringEpisode } from "~/libs/maybeScheduleNextAiringEpisode"; import { maybeScheduleNextAiringEpisode } from "~/libs/maybeScheduleNextAiringEpisode";
import { verifyQstashHeader } from "~/libs/qstash/verifyQstashHeader"; import { verifyQstashHeader } from "~/libs/qstash/verifyQstashHeader";
import { readEnvVariable } from "~/libs/readEnvVariable"; import { readEnvVariable } from "~/libs/readEnvVariable";

View File

@@ -4,8 +4,8 @@ import mapKeys from "lodash.mapkeys";
import { DateTime } from "luxon"; import { DateTime } from "luxon";
import { Case, changeStringCase } from "~/libs/changeStringCase"; import { Case, changeStringCase } from "~/libs/changeStringCase";
import type { AdminSdkCredentials } from "~/libs/fcm/getGoogleAuthToken"; import type { AdminSdkCredentials } from "~/libs/gcloud/getGoogleAuthToken";
import { sendFcmMessage } from "~/libs/fcm/sendFcmMessage"; import { sendFcmMessage } from "~/libs/gcloud/sendFcmMessage";
import { verifyQstashHeader } from "~/libs/qstash/verifyQstashHeader"; import { verifyQstashHeader } from "~/libs/qstash/verifyQstashHeader";
import { readEnvVariable } from "~/libs/readEnvVariable"; import { readEnvVariable } from "~/libs/readEnvVariable";
import type { Env } from "~/types/env"; import type { Env } from "~/types/env";

View File

@@ -16,7 +16,7 @@ describe("requests the /token route", () => {
beforeEach(async () => { beforeEach(async () => {
await resetTestDb(); await resetTestDb();
mock.module("src/libs/fcm/verifyFcmToken", () => ({ mock.module("src/libs/gcloud/verifyFcmToken", () => ({
verifyFcmToken: () => true, verifyFcmToken: () => true,
})); }));
}); });
@@ -136,7 +136,7 @@ describe("requests the /token route", () => {
}); });
it("token is invalid, should fail", async () => { it("token is invalid, should fail", async () => {
mock.module("src/libs/fcm/verifyFcmToken", () => ({ mock.module("src/libs/gcloud/verifyFcmToken", () => ({
verifyFcmToken: () => false, verifyFcmToken: () => false,
})); }));
@@ -153,7 +153,7 @@ describe("requests the /token route", () => {
}); });
it("token is invalid, should not insert new entry", async () => { it("token is invalid, should not insert new entry", async () => {
mock.module("src/libs/fcm/verifyFcmToken", () => ({ mock.module("src/libs/gcloud/verifyFcmToken", () => ({
verifyFcmToken: () => false, verifyFcmToken: () => false,
})); }));
await app.request("/token", { await app.request("/token", {

View File

@@ -3,8 +3,8 @@ import { env } from "hono/adapter";
import mapKeys from "lodash.mapkeys"; import mapKeys from "lodash.mapkeys";
import { Case, changeStringCase } from "~/libs/changeStringCase"; import { Case, changeStringCase } from "~/libs/changeStringCase";
import type { AdminSdkCredentials } from "~/libs/fcm/getGoogleAuthToken"; import type { AdminSdkCredentials } from "~/libs/gcloud/getGoogleAuthToken";
import { verifyFcmToken } from "~/libs/fcm/verifyFcmToken"; import { verifyFcmToken } from "~/libs/gcloud/verifyFcmToken";
import { readEnvVariable } from "~/libs/readEnvVariable"; import { readEnvVariable } from "~/libs/readEnvVariable";
import { saveToken } from "~/models/token"; import { saveToken } from "~/models/token";
import type { Env } from "~/types/env"; import type { Env } from "~/types/env";

View File

@@ -1,6 +1,6 @@
import { HttpResponse, http } from "msw"; import { HttpResponse, http } from "msw";
import type { FcmMessagePayload } from "~/libs/fcm/sendFcmMessage"; import type { FcmMessagePayload } from "~/libs/gcloud/sendFcmMessage";
export function mockFcmMessageResponse() { export function mockFcmMessageResponse() {
return http.post<{}, { message: FcmMessagePayload; validate_only: boolean }>( return http.post<{}, { message: FcmMessagePayload; validate_only: boolean }>(

View File

@@ -2,7 +2,7 @@ import type { TokenOptions } from "gtoken";
import { mock } from "bun:test"; import { mock } from "bun:test";
import type { AdminSdkCredentials } from "~/libs/fcm/getGoogleAuthToken"; import type { AdminSdkCredentials } from "~/libs/gcloud/getGoogleAuthToken";
const emailRegex = const emailRegex =
/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|.(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|.(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
@@ -29,7 +29,7 @@ class MockGoogleToken {
} }
} }
mock.module("src/libs/fcm/getGoogleAuthToken", () => { mock.module("src/libs/gcloud/getGoogleAuthToken", () => {
return { return {
getGoogleAuthToken: (adminSdkJson: AdminSdkCredentials) => { getGoogleAuthToken: (adminSdkJson: AdminSdkCredentials) => {
return new MockGoogleToken({ return new MockGoogleToken({