diff --git a/.env.example b/.env.example index db301a90a..ccf399ed5 100644 --- a/.env.example +++ b/.env.example @@ -8,6 +8,5 @@ PUBLIC_APPWRITE_PROJECT_INIT_ID= PUBLIC_GROWTH_ENDPOINT= APPWRITE_DB_INIT_ID= APPWRITE_COL_INIT_ID= -APPWRITE_COL_INIT_TWO_ID= APPWRITE_API_KEY_INIT= SENTRY_AUTH_TOKEN= \ No newline at end of file diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index da15abade..7f09ed2ba 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -40,7 +40,6 @@ jobs: "PUBLIC_GROWTH_ENDPOINT=${{ vars.PUBLIC_GROWTH_ENDPOINT }}" "APPWRITE_DB_INIT_ID=${{ secrets.APPWRITE_DB_INIT_ID }}" "APPWRITE_COL_INIT_ID=${{ secrets.APPWRITE_COL_INIT_ID }}" - "APPWRITE_COL_INIT_TWO_ID=${{ secrets.APPWRITE_COL_INIT_TWO_ID }}" "APPWRITE_API_KEY_INIT=${{ secrets.APPWRITE_API_KEY_INIT }}" "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 0030742e9..e75a7a5c0 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -42,7 +42,6 @@ jobs: "PUBLIC_GROWTH_ENDPOINT=${{ vars.PUBLIC_GROWTH_ENDPOINT }}" "APPWRITE_DB_INIT_ID=${{ secrets.APPWRITE_DB_INIT_ID }}" "APPWRITE_COL_INIT_ID=${{ secrets.APPWRITE_COL_INIT_ID }}" - "APPWRITE_COL_INIT_TWO_ID=${{ secrets.APPWRITE_COL_INIT_TWO_ID }}" "APPWRITE_API_KEY_INIT=${{ secrets.APPWRITE_API_KEY_INIT }}" "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 922aa7635..ebb867e71 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -43,7 +43,6 @@ jobs: PUBLIC_GROWTH_ENDPOINT: ${{ secrets.PUBLIC_GROWTH_ENDPOINT }} APPWRITE_DB_INIT_ID: ${{ secrets.APPWRITE_DB_INIT_ID }} APPWRITE_COL_INIT_ID: ${{ secrets.APPWRITE_COL_INIT_ID }} - APPWRITE_COL_INIT_TWO_ID: ${{ secrets.APPWRITE_COL_INIT_TWO_ID }} APPWRITE_API_KEY_INIT: ${{ secrets.APPWRITE_API_KEY_INIT }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: pnpm run build diff --git a/Dockerfile b/Dockerfile index cfe400a68..a7db2d22c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,9 +27,6 @@ ENV APPWRITE_DB_INIT_ID ${APPWRITE_DB_INIT_ID} ARG APPWRITE_COL_INIT_ID ENV APPWRITE_COL_INIT_ID ${APPWRITE_COL_INIT_ID} -ARG APPWRITE_COL_INIT_TWO_ID -ENV APPWRITE_COL_INIT_TWO_ID ${APPWRITE_COL_INIT_TWO_ID} - ARG APPWRITE_API_KEY_INIT ENV APPWRITE_API_KEY_INIT ${APPWRITE_API_KEY_INIT} diff --git a/src/routes/init/tickets/[id]/get-contributions/helpers.server.ts b/src/routes/init/tickets/[id]/get-contributions/helpers.server.ts index 57a8c11e8..1bfed8919 100644 --- a/src/routes/init/tickets/[id]/get-contributions/helpers.server.ts +++ b/src/routes/init/tickets/[id]/get-contributions/helpers.server.ts @@ -1,4 +1,4 @@ -import { APPWRITE_DB_INIT_ID, APPWRITE_COL_INIT_TWO_ID } from '$env/static/private'; +import { APPWRITE_DB_INIT_ID, APPWRITE_COL_INIT_ID } from '$env/static/private'; import { appwriteInitServer } from '$lib/appwrite/init.server'; import { parse } from 'node-html-parser'; import type { TicketData, ContributionsMatrix } from '../../constants'; @@ -6,7 +6,7 @@ import type { TicketData, ContributionsMatrix } from '../../constants'; export async function getContributions(id: string): Promise { const { gh_user, contributions } = (await appwriteInitServer.databases.getDocument( APPWRITE_DB_INIT_ID, - APPWRITE_COL_INIT_TWO_ID, + APPWRITE_COL_INIT_ID, id )) as unknown as TicketData; @@ -50,7 +50,7 @@ export async function getContributions(id: string): Promise aw_doc.id ? gh_doc.$id : aw_doc.$id; await appwriteInitServer.databases.updateDocument( APPWRITE_DB_INIT_ID, - env.APPWRITE_COL_INIT_TWO_ID, + APPWRITE_COL_INIT_ID, oldest, { gh_user: null, @@ -69,7 +68,7 @@ async function getTicketDocByUser(user: User) { ); return (await appwriteInitServer.databases.updateDocument( APPWRITE_DB_INIT_ID, - env.APPWRITE_COL_INIT_TWO_ID, + APPWRITE_COL_INIT_ID, newest, { gh_user: user.github?.login, @@ -84,7 +83,7 @@ async function getTicketDocByUser(user: User) { if (!doc.gh_user || !doc.aw_email) { return (await appwriteInitServer.databases.updateDocument( APPWRITE_DB_INIT_ID, - env.APPWRITE_COL_INIT_TWO_ID, + APPWRITE_COL_INIT_ID, doc.$id, { gh_user: user.github?.login, @@ -97,7 +96,7 @@ async function getTicketDocByUser(user: User) { if (!!user.appwrite && doc.is_pro !== isPro) { return (await appwriteInitServer.databases.updateDocument( APPWRITE_DB_INIT_ID, - env.APPWRITE_COL_INIT_TWO_ID, + APPWRITE_COL_INIT_ID, doc.$id, { is_pro: isPro @@ -111,11 +110,11 @@ async function getTicketDocByUser(user: User) { // If no document exists, create one const allDocs = await appwriteInitServer.databases.listDocuments( APPWRITE_DB_INIT_ID, - env.APPWRITE_COL_INIT_TWO_ID + APPWRITE_COL_INIT_ID ); return (await appwriteInitServer.databases.createDocument( APPWRITE_DB_INIT_ID, - env.APPWRITE_COL_INIT_TWO_ID, + APPWRITE_COL_INIT_ID, ID.unique(), { aw_email: user.appwrite?.email ?? undefined, @@ -130,7 +129,7 @@ async function getTicketDocByUser(user: User) { async function getTicketDocById(id: string) { return (await appwriteInitServer.databases.getDocument( APPWRITE_DB_INIT_ID, - env.APPWRITE_COL_INIT_TWO_ID, + APPWRITE_COL_INIT_ID, id )) as unknown as Omit; } diff --git a/src/routes/init/tickets/update/+server.ts b/src/routes/init/tickets/update/+server.ts index 66cdc4dec..a4b68fce4 100644 --- a/src/routes/init/tickets/update/+server.ts +++ b/src/routes/init/tickets/update/+server.ts @@ -1,4 +1,4 @@ -import { APPWRITE_COL_INIT_TWO_ID, APPWRITE_DB_INIT_ID } from '$env/static/private'; +import { APPWRITE_COL_INIT_ID, APPWRITE_DB_INIT_ID } from '$env/static/private'; import { appwriteInitServer } from '$lib/appwrite/init.server'; export async function POST({ request }) { @@ -6,7 +6,7 @@ export async function POST({ request }) { await appwriteInitServer.databases.updateDocument( APPWRITE_DB_INIT_ID, - APPWRITE_COL_INIT_TWO_ID, + APPWRITE_COL_INIT_ID, data.ticketId, { name: data.name,