refactor: remove deprecated resolver code (#509)

Author: lihebi

apps/api/package.json

@@ -4,10 +4,8 @@
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "start": "node build/server.js",
-    "dev": "ts-node-dev src/server.ts",
-    "start:yjs": "node build/yjs-server.js",
-    "dev:yjs": "ts-node-dev src/yjs-server.ts",
+    "start": "node build/run.js",
+    "dev": "ts-node-dev src/run.ts",
     "test": "jest --config jest.config.js"
   },
   "dependencies": {

apps/api/src/resolver_repo.ts

@@ -123,78 +123,11 @@ async function repo(_, { id }, { userId }) {
     include: {
       owner: true,
       collaborators: true,
-      pods: {
-        include: {
-          children: true,
-          parent: true,
-        },
-        orderBy: {
-          index: "asc",
-        },
-      },
-      edges: true,
     },
   });
   if (!repo) throw Error("Repo not found");
   await updateUserRepoData({ userId, repoId: id });
-  return {
-    ...repo,
-    edges: repo.edges.map((edge) => ({
-      source: edge.sourceId,
-      target: edge.targetId,
-    })),
-  };
-}
-
-async function addEdge(_, { source, target }, { userId }) {
-  if (!userId) throw new Error("Not authenticated.");
-  const sourcePod = await prisma.pod.findFirst({ where: { id: source } });
-  const targetPod = await prisma.pod.findFirst({ where: { id: target } });
-  if (!sourcePod || !targetPod) throw new Error("Pods not found.");
-  if (sourcePod.repoId !== targetPod.repoId)
-    throw new Error("Pods are not in the same repo.");
-  await ensureRepoEditAccess({ repoId: sourcePod.repoId, userId });
-  await prisma.edge.create({
-    data: {
-      source: {
-        connect: {
-          id: source,
-        },
-      },
-      target: {
-        connect: {
-          id: target,
-        },
-      },
-      repo: {
-        connect: {
-          id: sourcePod.repoId,
-        },
-      },
-    },
-  });
-  return true;
-}
-
-async function deleteEdge(_, { source, target }, { userId }) {
-  if (!userId) throw new Error("Not authenticated.");
-  const sourcePod = await prisma.pod.findFirst({ where: { id: source } });
-  const targetPod = await prisma.pod.findFirst({ where: { id: target } });
-  if (!sourcePod || !targetPod) throw new Error("Pods not found.");
-  if (sourcePod.repoId !== targetPod.repoId)
-    throw new Error("Pods are not in the same repo.");
-  await ensureRepoEditAccess({ repoId: sourcePod.repoId, userId });
-  await prisma.edge.deleteMany({
-    where: {
-      source: {
-        id: source,
-      },
-      target: {
-        id: target,
-      },
-    },
-  });
-  return true;
+  return repo;
 }
 
 async function createRepo(_, {}, { userId }) {
@@ -215,21 +148,6 @@ async function createRepo(_, {}, { userId }) {
   return repo;
 }
 
-async function getVisibility(_, { repoId }, { userId }) {
-  if (!userId) throw Error("Unauthenticated");
-  const repo = await prisma.repo.findFirst({
-    where: {
-      id: repoId,
-      owner: { id: userId || "undefined" },
-    },
-    include: {
-      collaborators: true,
-    },
-  });
-  if (!repo) throw Error("Repo not found");
-  return { collaborators: repo.collaborators, isPublic: repo.public };
-}
-
 async function updateVisibility(_, { repoId, isPublic }, { userId }) {
   if (!userId) throw Error("Unauthenticated");
   const repo = await prisma.repo.findFirst({
@@ -414,43 +332,6 @@ async function unstar(_, { repoId }, { userId }) {
   return true;
 }
 
-async function updatePod(_, { id, repoId, input }, { userId }) {
-  if (!userId) throw new Error("Not authenticated.");
-  await ensureRepoEditAccess({ repoId, userId });
-  // if repoId has id, just update
-  let pod_found = await prisma.pod.findFirst({
-    where: {
-      id,
-      repo: {
-        id: repoId,
-      },
-    },
-  });
-  // or, return false and leave it dirty
-  if (!pod_found) return false;
-  const pod = await prisma.pod.update({
-    where: {
-      id,
-    },
-    data: {
-      ...input,
-      parent: input.parent
-        ? input.parent === "ROOT"
-          ? { disconnect: true }
-          : {
-              connect: {
-                id: input.parent,
-              },
-            }
-        : undefined,
-      children: {
-        connect: input.children?.map((id) => ({ id })),
-      },
-    },
-  });
-  return true;
-}
-
 async function copyRepo(_, { repoId }, { userId }) {
   // Find the repo
   const repo = await prisma.repo.findFirst({
@@ -525,9 +406,6 @@ export const RepoResolver = {
     updateRepo,
     deleteRepo,
     copyRepo,
-    updatePod,
-    addEdge,
-    deleteEdge,
     addCollaborator,
     updateVisibility,
     deleteCollaborator,

apps/api/src/run.ts

@@ -0,0 +1,3 @@
+import { startServer } from "./server";
+
+startServer({ port: 4000 });

apps/api/src/server.ts

@@ -50,7 +50,7 @@ interface TokenInterface {
   id: string;
 }
 
-async function startServer({ port }) {
+export async function startServer({ port }) {
   const apollo = new ApolloServer({
     typeDefs,
     resolvers,
@@ -86,5 +86,3 @@ async function startServer({ port }) {
     console.log(`🚀 Server ready at http://localhost:${port}`);
   });
 }
-
-startServer({ port: 4000 });

apps/api/src/typedefs.ts

@@ -12,14 +12,12 @@ export const typeDefs = gql`
     password: String!
     firstname: String!
     lastname: String!
-    codeiumAPIKey: String!
+    codeiumAPIKey: String
   }
 
   type Repo {
     id: ID!
     name: String
-    pods: [Pod]
-    edges: [Edge]
     userId: ID!
     stargazers: [User]
     collaborators: [User]
@@ -29,85 +27,13 @@ export const typeDefs = gql`
     accessedAt: String
   }
 
-  type Edge {
-    source: String!
-    target: String!
-  }
-
-  type Pod {
-    id: ID!
-    type: String
-    content: String
-    githead: String
-    staged: String
-    column: Int
-    lang: String
-    parent: Pod
-    index: Int
-    children: [Pod]
-    result: String
-    stdout: String
-    error: String
-    imports: String
-    exports: String
-    reexports: String
-    midports: String
-    fold: Boolean
-    thundar: Boolean
-    utility: Boolean
-    name: String
-    x: Float
-    y: Float
-    width: Float
-    height: Float
-  }
-
-  input PodInput {
-    id: ID!
-    type: String
-    content: String
-    column: Int
-    lang: String
-    result: String
-    stdout: String
-    error: String
-    imports: String
-    exports: String
-    reexports: String
-    midports: String
-    fold: Boolean
-    thundar: Boolean
-    utility: Boolean
-    name: String
-    x: Float
-    y: Float
-    width: Float
-    height: Float
-    parent: ID
-    children: [ID]
-  }
-
-  type RuntimeInfo {
-    startedAt: String
-    lastActive: String
-    sessionId: String
-    ttl: Int
-  }
-
-  input RunSpecInput {
-    code: String
-    podId: String
-  }
-
   type Query {
     hello: String
     users: [User]
     me: User
     repos: [Repo]
     repo(id: String!): Repo
-    pod(id: ID!): Pod
     getDashboardRepos: [Repo]
-    activeSessions: [String]
   }
 
   type Mutation {
@@ -124,12 +50,6 @@ export const typeDefs = gql`
     updateRepo(id: ID!, name: String!): Boolean
     deleteRepo(id: ID!): Boolean
     copyRepo(repoId: String!): ID!
-    updatePod(id: String!, repoId: String!, input: PodInput): Boolean
-    addEdge(source: ID!, target: ID!): Boolean
-    deleteEdge(source: ID!, target: ID!): Boolean
-    clearUser: Boolean
-    clearRepo: Boolean
-    clearPod: Boolean
     updateVisibility(repoId: String!, isPublic: Boolean!): Boolean
     addCollaborator(repoId: String!, email: String!): Boolean
     deleteCollaborator(repoId: String!, collaboratorId: String!): Boolean