feat: swap out drizzle for supabase on the import router
This commit is contained in:
@@ -1,12 +1,10 @@
|
|||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
import { eq } from "drizzle-orm";
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
createTRPCRouter,
|
createTRPCRouter,
|
||||||
publicProcedure,
|
publicProcedure,
|
||||||
} from "~/server/api/trpc";
|
} from "~/server/api/trpc";
|
||||||
|
|
||||||
import { boards, cards, imports, lists, workspaces } from "~/server/db/schema";
|
|
||||||
import { generateUID } from "~/utils/generateUID";
|
import { generateUID } from "~/utils/generateUID";
|
||||||
|
|
||||||
const TRELLO_API_URL = 'https://api.trello.com/1';
|
const TRELLO_API_URL = 'https://api.trello.com/1';
|
||||||
@@ -44,7 +42,7 @@ export const importRouter = createTRPCRouter({
|
|||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.query(async ({ ctx, input }) => {
|
.query(async ({ ctx, input }) => {
|
||||||
const userId = ctx.session?.user.id;
|
const userId = ctx.user?.id;
|
||||||
|
|
||||||
if (!userId) return;
|
if (!userId) return;
|
||||||
|
|
||||||
@@ -85,21 +83,36 @@ export const importRouter = createTRPCRouter({
|
|||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.mutation(async ({ ctx, input }) => {
|
.mutation(async ({ ctx, input }) => {
|
||||||
const userId = ctx.session?.user.id;
|
const userId = ctx.user?.id;
|
||||||
|
|
||||||
if (!userId) return;
|
if (!userId) return;
|
||||||
|
|
||||||
const newImport = await ctx.db.insert(imports).values({
|
const newImport = await ctx.supabase
|
||||||
publicId: generateUID(),
|
.from('import')
|
||||||
source: 'trello',
|
.insert({
|
||||||
createdBy: userId,
|
publicId: generateUID(),
|
||||||
status: 'started'
|
source: 'trello',
|
||||||
}).returning({ id: imports.id });
|
createdBy: userId,
|
||||||
|
status: 'started'
|
||||||
|
})
|
||||||
|
.select(`id`)
|
||||||
|
.limit(1)
|
||||||
|
.single();
|
||||||
|
|
||||||
const newImportId = newImport[0]?.id;
|
const newImportId = newImport.data?.id;
|
||||||
|
|
||||||
let boardsCreated = 0;
|
let boardsCreated = 0;
|
||||||
|
|
||||||
|
const workspace = await ctx.supabase
|
||||||
|
.from('workspace')
|
||||||
|
.select(`id`)
|
||||||
|
.eq('publicId', input.workspacePublicId)
|
||||||
|
.is('deletedAt', null)
|
||||||
|
.limit(1)
|
||||||
|
.single();
|
||||||
|
|
||||||
|
if (!workspace.data) return;
|
||||||
|
|
||||||
for (const boardId of input.boardIds) {
|
for (const boardId of input.boardIds) {
|
||||||
const response = await fetch(`${TRELLO_API_URL}/boards/${boardId}?key=${input.apiKey}&token=${input.token}&lists=open&cards=open`);
|
const response = await fetch(`${TRELLO_API_URL}/boards/${boardId}?key=${input.apiKey}&token=${input.token}&lists=open&cards=open`);
|
||||||
const data = await response.json() as TrelloBoard;
|
const data = await response.json() as TrelloBoard;
|
||||||
@@ -117,64 +130,68 @@ export const importRouter = createTRPCRouter({
|
|||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
const workspace = await ctx.db.query.workspaces.findFirst({
|
const newBoard = await ctx.supabase
|
||||||
where: eq(workspaces.publicId, input.workspacePublicId),
|
.from('board')
|
||||||
})
|
.insert({
|
||||||
|
|
||||||
if (!workspace) return;
|
|
||||||
|
|
||||||
await ctx.db.transaction(async (tx) => {
|
|
||||||
const newBoard = await tx.insert(boards).values({
|
|
||||||
publicId: generateUID(),
|
publicId: generateUID(),
|
||||||
name: data.name,
|
name: data.name,
|
||||||
createdBy: userId,
|
createdBy: userId,
|
||||||
importId: newImportId,
|
importId: newImportId,
|
||||||
workspaceId: workspace.id
|
workspaceId: workspace.data.id
|
||||||
}).returning({ id: boards.id });
|
})
|
||||||
|
.select(`id`)
|
||||||
|
.limit(1)
|
||||||
|
.single();
|
||||||
|
|
||||||
const newBoardId = newBoard[0]?.id
|
const newBoardId = newBoard.data?.id
|
||||||
|
|
||||||
if (!newBoardId) return;
|
if (!newBoardId) return;
|
||||||
|
|
||||||
let listIndex = 0;
|
let listIndex = 0;
|
||||||
|
|
||||||
for (const list of formattedData.lists) {
|
for (const list of formattedData.lists) {
|
||||||
const newList = await tx.insert(lists).values({
|
const newList = await ctx.supabase
|
||||||
|
.from('list')
|
||||||
|
.insert({
|
||||||
publicId: generateUID(),
|
publicId: generateUID(),
|
||||||
name: list.name,
|
name: list.name,
|
||||||
createdBy: userId,
|
createdBy: userId,
|
||||||
boardId: newBoardId,
|
boardId: newBoardId,
|
||||||
index: listIndex,
|
index: listIndex,
|
||||||
importId: newImportId
|
importId: newImportId
|
||||||
}).returning({ id: lists.id });
|
})
|
||||||
|
.select(`id`)
|
||||||
|
.limit(1)
|
||||||
|
.single();
|
||||||
|
|
||||||
const newListId = newList[0]?.id
|
const newListId = newList.data?.id
|
||||||
|
|
||||||
if (list.cards.length && newListId) {
|
if (list.cards.length && newListId) {
|
||||||
const cardsInsert = list.cards.map((card, index) => ({
|
const cardsInsert = list.cards.map((card, index) => ({
|
||||||
publicId: generateUID(),
|
publicId: generateUID(),
|
||||||
title: card.name,
|
title: card.name,
|
||||||
description: card.description,
|
description: card.description,
|
||||||
createdBy: userId,
|
createdBy: userId,
|
||||||
listId: newListId,
|
listId: newListId,
|
||||||
index,
|
index,
|
||||||
importId: newImportId
|
importId: newImportId
|
||||||
}))
|
}))
|
||||||
|
|
||||||
await tx.insert(cards).values(cardsInsert);
|
await ctx.supabase
|
||||||
}
|
.from('card')
|
||||||
|
.insert(cardsInsert);
|
||||||
listIndex ++
|
|
||||||
}
|
}
|
||||||
})
|
|
||||||
|
|
||||||
|
listIndex ++
|
||||||
|
}
|
||||||
boardsCreated ++
|
boardsCreated ++
|
||||||
}
|
}
|
||||||
|
|
||||||
if (boardsCreated > 0 && newImportId) {
|
if (boardsCreated > 0 && newImportId) {
|
||||||
await ctx.db.update(imports)
|
await ctx.supabase
|
||||||
.set({ status: 'success' })
|
.from('import')
|
||||||
.where(eq(imports.id, newImportId))
|
.update({ status: 'success' })
|
||||||
|
.eq('importId', newImportId);
|
||||||
}
|
}
|
||||||
|
|
||||||
return { boardsCreated }
|
return { boardsCreated }
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
import { and, eq, isNull } from "drizzle-orm";
|
|
||||||
|
|
||||||
import { workspaces, workspaceMembers } from "~/server/db/schema";
|
|
||||||
|
|
||||||
import { generateUID } from "~/utils/generateUID";
|
import { generateUID } from "~/utils/generateUID";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -38,7 +34,7 @@ export const workspaceRouter = createTRPCRouter({
|
|||||||
|
|
||||||
if (!userId) return;
|
if (!userId) return;
|
||||||
|
|
||||||
const { data, error } = await ctx.supabase
|
const { data } = await ctx.supabase
|
||||||
.from('workspace')
|
.from('workspace')
|
||||||
.select(`
|
.select(`
|
||||||
publicId,
|
publicId,
|
||||||
@@ -68,9 +64,6 @@ export const workspaceRouter = createTRPCRouter({
|
|||||||
.mutation(async ({ ctx, input }) => {
|
.mutation(async ({ ctx, input }) => {
|
||||||
const userId = ctx.user?.id;
|
const userId = ctx.user?.id;
|
||||||
|
|
||||||
|
|
||||||
console.log('>>> here <<<')
|
|
||||||
|
|
||||||
if (!userId) return;
|
if (!userId) return;
|
||||||
|
|
||||||
const workspace = await ctx.supabase
|
const workspace = await ctx.supabase
|
||||||
|
|||||||
Reference in New Issue
Block a user