Initial Typescript models.

queries/admin/user/createUser.js

@@ -1,7 +0,0 @@
-import prisma from 'lib/prisma';
-
-export async function createUser(data) {
-  return prisma.client.user.create({
-    data,
-  });
-}

queries/admin/user/createUser.ts

@@ -0,0 +1,20 @@
+import prisma from 'lib/prisma';
+
+export async function createUser(data: {
+  id: string;
+  username: string;
+  password: string;
+}): Promise<{
+  id: string;
+  username: string;
+  isAdmin: boolean;
+}> {
+  return prisma.client.user.create({
+    data,
+    select: {
+      id: true,
+      username: true,
+      isAdmin: true,
+    },
+  });
+}

queries/admin/user/deleteUser.ts

@@ -1,7 +1,10 @@
 import prisma from 'lib/prisma';
 import cache from 'lib/cache';
+import { Prisma, User } from '@prisma/client';
 
-export async function deleteUser(userId) {
+export async function deleteUser(
+  userId: string,
+): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Prisma.BatchPayload, User]> {
   const { client } = prisma;
 
   const websites = await client.website.findMany({

queries/admin/user/getUser.js

@@ -1,7 +0,0 @@
-import prisma from 'lib/prisma';
-
-export async function getUser(where) {
-  return prisma.client.user.findUnique({
-    where,
-  });
-}

queries/admin/user/getUser.ts

@@ -0,0 +1,25 @@
+import prisma from 'lib/prisma';
+import { Prisma } from '@prisma/client';
+
+export interface User {
+  id: string;
+  username: string;
+  isAdmin: boolean;
+  password?: string;
+  createdAt?: Date;
+}
+
+export async function getUser(
+  where: Prisma.UserWhereUniqueInput,
+  includePassword = false,
+): Promise<User> {
+  return prisma.client.user.findUnique({
+    where,
+    select: {
+      id: true,
+      username: true,
+      isAdmin: true,
+      password: includePassword,
+    },
+  });
+}

queries/admin/user/getUsers.ts

@@ -1,6 +1,7 @@
 import prisma from 'lib/prisma';
+import { User } from './getUser';
 
-export async function getUsers() {
+export async function getUsers(): Promise<User[]> {
   return prisma.client.user.findMany({
     orderBy: [
       { isAdmin: 'desc' },

queries/admin/user/updateUser.js

@@ -1,8 +0,0 @@
-import prisma from 'lib/prisma';
-
-export async function updateUser(data, where) {
-  return prisma.client.user.update({
-    where,
-    data,
-  });
-}

queries/admin/user/updateUser.ts

@@ -0,0 +1,19 @@
+import { Prisma } from '@prisma/client';
+import prisma from 'lib/prisma';
+import { User } from './getUser';
+
+export async function updateUser(
+  data: Prisma.UserUpdateArgs,
+  where: Prisma.UserWhereUniqueInput,
+): Promise<User> {
+  return prisma.client.user.update({
+    where,
+    data,
+    select: {
+      id: true,
+      username: true,
+      isAdmin: true,
+      createdAt: true,
+    },
+  });
+}

queries/admin/website/createWebsite.ts

@@ -1,7 +1,16 @@
-import prisma from 'lib/prisma';
+import { Website } from '@prisma/client';
 import cache from 'lib/cache';
+import prisma from 'lib/prisma';
 
-export async function createWebsite(userId, data) {
+export async function createWebsite(
+  userId: string,
+  data: {
+    id: string;
+    name: string;
+    domain: string;
+    shareId?: string;
+  },
+): Promise<Website> {
   return prisma.client.website
     .create({
       data: {

queries/admin/website/deleteWebsite.ts

@@ -1,22 +1,25 @@
 import prisma from 'lib/prisma';
 import cache from 'lib/cache';
+import { Prisma, Website } from '@prisma/client';
 
-export async function deleteWebsite(id) {
+export async function deleteWebsite(
+  websiteId: string,
+): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
   const { client, transaction } = prisma;
 
   return transaction([
     client.websiteEvent.deleteMany({
-      where: { websiteId: id },
+      where: { websiteId },
     }),
     client.session.deleteMany({
-      where: { websiteId: id },
+      where: { websiteId },
     }),
     client.website.delete({
-      where: { id },
+      where: { id: websiteId },
     }),
   ]).then(async data => {
     if (cache.enabled) {
-      await cache.deleteWebsite(id);
+      await cache.deleteWebsite(websiteId);
     }
 
     return data;

queries/admin/website/getAllWebsites.js

@@ -1,23 +0,0 @@
-import prisma from 'lib/prisma';
-
-export async function getAllWebsites() {
-  let data = await prisma.client.website.findMany({
-    orderBy: [
-      {
-        userId: 'asc',
-      },
-      {
-        name: 'asc',
-      },
-    ],
-    include: {
-      user: {
-        select: {
-          username: true,
-        },
-      },
-    },
-  });
-
-  return data.map(i => ({ ...i, user: i.user.username }));
-}

queries/admin/website/getAllWebsites.ts

@@ -0,0 +1,24 @@
+import { Website } from '@prisma/client';
+import prisma from 'lib/prisma';
+
+export async function getAllWebsites(): Promise<(Website & { user: string })[]> {
+  return await prisma.client.website
+    .findMany({
+      orderBy: [
+        {
+          userId: 'asc',
+        },
+        {
+          name: 'asc',
+        },
+      ],
+      include: {
+        user: {
+          select: {
+            username: true,
+          },
+        },
+      },
+    })
+    .then(data => data.map(i => ({ ...i, user: i.user.username })));
+}

queries/admin/website/getUserWebsites.ts

@@ -1,6 +1,7 @@
 import prisma from 'lib/prisma';
+import { Website } from '@prisma/client';
 
-export async function getUserWebsites(userId) {
+export async function getUserWebsites(userId): Promise<Website[]> {
   return prisma.client.website.findMany({
     where: {
       userId,

queries/admin/website/getWebsite.js

@@ -1,7 +0,0 @@
-import prisma from 'lib/prisma';
-
-export async function getWebsite(where) {
-  return prisma.client.website.findUnique({
-    where,
-  });
-}

queries/admin/website/getWebsite.ts

@@ -0,0 +1,8 @@
+import prisma from 'lib/prisma';
+import { Prisma, Website } from '@prisma/client';
+
+export async function getWebsite(where: Prisma.WebsiteWhereUniqueInput): Promise<Website> {
+  return prisma.client.website.findUnique({
+    where,
+  });
+}

queries/admin/website/resetWebsite.ts

@@ -1,20 +1,23 @@
+import { Prisma, Website } from '@prisma/client';
+import cache from 'lib/cache';
 import prisma from 'lib/prisma';
 import { getWebsite } from 'queries';
-import cache from 'lib/cache';
 
-export async function resetWebsite(id) {
+export async function resetWebsite(
+  websiteId,
+): Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Website]> {
   const { client, transaction } = prisma;
 
-  const { revId } = await getWebsite({ id });
+  const { revId } = await getWebsite({ id: websiteId });
 
   return transaction([
     client.websiteEvent.deleteMany({
-      where: { websiteId: id },
+      where: { websiteId },
     }),
     client.session.deleteMany({
-      where: { websiteId: id },
+      where: { websiteId },
     }),
-    client.website.update({ where: { id }, data: { revId: revId + 1 } }),
+    client.website.update({ where: { id: websiteId }, data: { revId: revId + 1 } }),
   ]).then(async data => {
     if (cache.enabled) {
       await cache.storeWebsite(data[2]);

queries/admin/website/updateWebsite.js

@@ -1,10 +0,0 @@
-import prisma from 'lib/prisma';
-
-export async function updateWebsite(id, data) {
-  return prisma.client.website.update({
-    where: {
-      id,
-    },
-    data,
-  });
-}

queries/admin/website/updateWebsite.ts

@@ -0,0 +1,11 @@
+import { Prisma, Website } from '@prisma/client';
+import prisma from 'lib/prisma';
+
+export async function updateWebsite(websiteId, data: Prisma.WebsiteUpdateInput): Promise<Website> {
+  return prisma.client.website.update({
+    where: {
+      id: websiteId,
+    },
+    data,
+  });
+}