feat(services): ability to search GET /guilds/public

package.json

@@ -31,33 +31,33 @@
     "postinstall": "husky install"
   },
   "dependencies": {
-    "@prisma/client": "3.2.1",
+    "@prisma/client": "3.4.2",
     "@sinclair/typebox": "0.20.5",
-    "axios": "0.22.0",
+    "axios": "0.24.0",
     "bcryptjs": "2.4.3",
     "dotenv": "10.0.0",
     "ejs": "3.1.6",
-    "fastify": "3.22.0",
+    "fastify": "3.23.1",
     "fastify-cors": "6.0.2",
     "fastify-helmet": "5.3.2",
-    "fastify-multipart": "5.0.2",
+    "fastify-multipart": "5.1.0",
     "fastify-plugin": "3.0.0",
     "fastify-rate-limit": "5.6.2",
-    "fastify-sensible": "3.1.1",
-    "fastify-static": "4.4.1",
-    "fastify-swagger": "4.12.4",
+    "fastify-sensible": "3.1.2",
+    "fastify-static": "4.5.0",
+    "fastify-swagger": "4.12.6",
     "fastify-url-data": "3.0.3",
     "http-errors": "1.8.0",
     "jsonwebtoken": "8.5.1",
     "ms": "2.1.3",
-    "nodemailer": "6.6.5",
+    "nodemailer": "6.7.0",
     "read-pkg": "5.2.0",
-    "socket.io": "4.2.0"
+    "socket.io": "4.3.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "13.2.1",
-    "@commitlint/config-conventional": "13.2.0",
-    "@saithodev/semantic-release-backmerge": "1.5.3",
+    "@commitlint/cli": "14.1.0",
+    "@commitlint/config-conventional": "14.1.0",
+    "@saithodev/semantic-release-backmerge": "2.1.0",
     "@types/bcryptjs": "2.4.2",
     "@types/busboy": "0.3.0",
     "@types/ejs": "3.1.0",
@@ -65,7 +65,7 @@
     "@types/jest": "27.0.2",
     "@types/jsonwebtoken": "8.5.5",
     "@types/ms": "0.7.31",
-    "@types/node": "16.10.3",
+    "@types/node": "16.11.7",
     "@types/nodemailer": "6.4.4",
     "@typescript-eslint/eslint-plugin": "4.33.0",
     "concurrently": "6.3.0",
@@ -75,24 +75,24 @@
     "eslint": "7.32.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-config-standard-with-typescript": "21.0.1",
-    "eslint-plugin-import": "2.24.2",
+    "eslint-plugin-import": "2.25.3",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-prettier": "4.0.0",
-    "eslint-plugin-promise": "5.1.0",
-    "eslint-plugin-unicorn": "36.0.0",
-    "husky": "7.0.2",
-    "jest": "27.2.5",
+    "eslint-plugin-promise": "5.1.1",
+    "eslint-plugin-unicorn": "38.0.1",
+    "husky": "7.0.4",
+    "jest": "27.3.1",
     "jest-mock-extended": "2.0.4",
     "jest-ts-webcompat-resolver": "1.0.0",
-    "lint-staged": "11.2.1",
+    "lint-staged": "11.2.6",
     "markdownlint-cli": "0.29.0",
-    "nodemon": "2.0.13",
-    "plop": "2.7.4",
+    "nodemon": "2.0.15",
+    "plop": "2.7.6",
     "prettier": "2.4.1",
-    "prisma": "3.2.1",
+    "prisma": "3.4.2",
     "rimraf": "3.0.2",
     "semantic-release": "18.0.0",
-    "ts-jest": "27.0.5",
-    "typescript": "4.4.3"
+    "ts-jest": "27.0.7",
+    "typescript": "4.4.4"
   }
 }

src/models/Guild.ts

@@ -6,8 +6,14 @@ import { date, id } from './utils.js'
 export const guildSchema = {
   id,
   name: Type.String({ minLength: 1, maxLength: 30 }),
-  icon: Type.Union([Type.String({ format: 'uri-reference' }), Type.Null()]),
-  description: Type.Union([Type.String({ maxLength: 160 }), Type.Null()]),
+  icon: Type.Union([
+    Type.String({ format: 'uri-reference', minLength: 1 }),
+    Type.Null()
+  ]),
+  description: Type.Union([
+    Type.String({ minLength: 1, maxLength: 160 }),
+    Type.Null()
+  ]),
   createdAt: date.createdAt,
   updatedAt: date.updatedAt
 }

src/models/User.ts

@@ -21,10 +21,14 @@ export const userSchema = {
   name: Type.String({ minLength: 1, maxLength: 30 }),
   email: Type.String({ minLength: 1, maxLength: 254, format: 'email' }),
   password: Type.String(),
-  logo: Type.String({ format: 'uri-reference' }),
-  status: Type.String({ maxLength: 50 }),
-  biography: Type.String({ maxLength: 160 }),
-  website: Type.String({ maxLength: 255, format: 'uri-reference' }),
+  logo: Type.String({ minLength: 1, format: 'uri-reference' }),
+  status: Type.String({ minLength: 1, maxLength: 50 }),
+  biography: Type.String({ minLength: 1, maxLength: 160 }),
+  website: Type.String({
+    minLength: 1,
+    maxLength: 255,
+    format: 'uri-reference'
+  }),
   isConfirmed: Type.Boolean({ default: false }),
   temporaryToken: Type.String(),
   temporaryExpirationToken: Type.String({ format: 'date-time' }),

src/services/guilds/public/get.ts

@@ -1,4 +1,4 @@
-import { Type } from '@sinclair/typebox'
+import { Static, Type } from '@sinclair/typebox'
 
 import { FastifyPluginAsync, FastifySchema } from 'fastify'
 
@@ -8,10 +8,16 @@ import authenticateUser from '../../../tools/plugins/authenticateUser.js'
 import { guildSchema } from '../../../models/Guild'
 import {
   getPaginationOptions,
-  queryPaginationSchema,
-  QueryPaginationSchemaType
+  queryPaginationSchema
 } from '../../../tools/database/pagination'
 
+const querySchema = Type.Object({
+  search: Type.Optional(Type.String()),
+  ...queryPaginationSchema
+})
+
+export type QuerySchemaType = Static<typeof querySchema>
+
 const getServiceSchema: FastifySchema = {
   description: 'GET all the public guilds.',
   tags: ['guilds'] as string[],
@@ -20,7 +26,7 @@ const getServiceSchema: FastifySchema = {
       bearerAuth: []
     }
   ] as Array<{ [key: string]: [] }>,
-  querystring: queryPaginationSchema,
+  querystring: querySchema,
   response: {
     200: Type.Array(
       Type.Object({
@@ -39,7 +45,7 @@ export const getGuildsPublic: FastifyPluginAsync = async (fastify) => {
   await fastify.register(authenticateUser)
 
   fastify.route<{
-    Querystring: QueryPaginationSchemaType
+    Querystring: QuerySchemaType
   }>({
     method: 'GET',
     url: '/guilds/public',
@@ -49,7 +55,13 @@ export const getGuildsPublic: FastifyPluginAsync = async (fastify) => {
         throw fastify.httpErrors.forbidden()
       }
       const guildsRequest = await prisma.guild.findMany({
-        ...getPaginationOptions(request.query)
+        ...getPaginationOptions(request.query),
+        orderBy: { createdAt: 'desc' },
+        ...(request.query.search != null && {
+          where: {
+            name: { contains: request.query.search }
+          }
+        })
       })
       const guilds = await Promise.all(
         guildsRequest.map(async (guild) => {

src/tools/database/pagination.ts

@@ -1,7 +1,7 @@
 import { Prisma } from '@prisma/client'
 import { Static, Type } from '@sinclair/typebox'
 
-export const queryPaginationSchema = Type.Object({
+export const queryPaginationSchema = {
   /** Maximum number of items to return */
   limit: Type.Integer({ default: 20, minimum: 1, maximum: 100 }),
 
@@ -12,9 +12,13 @@ export const queryPaginationSchema = Type.Object({
   after: Type.Optional(
     Type.Integer({ minimum: 1, description: 'Get items after this id' })
   )
-})
+}
 
-export type QueryPaginationSchemaType = Static<typeof queryPaginationSchema>
+export const queryPaginationObjectSchema = Type.Object(queryPaginationSchema)
+
+export type QueryPaginationSchemaType = Static<
+  typeof queryPaginationObjectSchema
+>
 
 export const getPaginationOptions = (
   query: QueryPaginationSchemaType