Add apollo to project; optimize rated_artists aggregation

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 .env
-.DS_Store
+.DS_Store
+mongo-volume

docker/init-mongo.js

@@ -1,10 +1,14 @@
 db.createUser({
-  user: "rootuser",
-  pwd: "supersecurepassword",
+  user: 'rootuser',
+  pwd: 'supersecurepassword',
   roles: [
     {
-      role: "readWrite",
-      db: "usersdb"
-    }
-  ]
+      role: 'readWrite',
+      db: 'usersdb',
+    },
+    {
+      role: 'dbOwner',
+      db: 'usersdb',
+    },
+  ],
 });

docker/mongo-compose.yml

@@ -1,16 +1,17 @@
 # https://medium.com/faun/managing-mongodb-on-docker-with-docker-compose-26bf8a0bbae3
 
-version: "2.4"
+version: '2.4'
 
 services:
   mongo:
     image: mongo:4.2.2
-    container_name: "mongodb-gateway"
+    container_name: 'mongodb-gateway'
     environment:
       - MONGO_INITDB_DATABASE=usersdb
       - MONGO_INITDB_ROOT_USERNAME=rootuser
       - MONGO_INITDB_ROOT_PASSWORD=supersecurepassword
     volumes:
       - ./init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js:ro
+      - ../mongo-volume:/data/db
     ports:
       - 27018:27017

package.json

@@ -13,6 +13,7 @@
     "dotenv": "8.2.0",
     "fastify": "2.11.0",
     "fastify-compress": "2.0.0",
+    "fastify-cors": "3.0.1",
     "fastify-gql": "2.2.0",
     "graphql": "14.5.8",
     "js-base64": "2.5.1",
@@ -28,6 +29,7 @@
     "@types/mongoose": "5.5.35",
     "@types/ramda": "0.26.39",
     "@types/supertest": "2.0.8",
+    "apollo": "2.21.3",
     "jest": "24.9.0",
     "mongodb-memory-server": "6.2.1",
     "nodemon": "2.0.2",

src/controllers/ratedArtists.controller.ts

@@ -21,9 +21,11 @@ const getRatedArtists = async (input?: IGetRatedArtistsInput): Promise<IRatedArt
     ...defaultParams,
     ...input,
   };
-  return RatedArtistModel.find({})
+
+  const result = await RatedArtistModel.find({})
     .sort(buildSortingParams(params.sort))
     .limit(params.limit);
+  return result;
 };
 
 export default { getRatedArtists };

src/db/initRatedArtistsView.ts

@@ -1,18 +1,33 @@
 import { Connection, Aggregate } from 'mongoose';
 
+import { IRatedArtistModel } from '@app/models/ratedArtist.model';
+
 const initRatedArtistsView = async (connection: Connection): Promise<void> => {
-  if (connection.collections['rated_artists']) {
-    try {
-      await connection.dropCollection('rated_artists');
-    } catch (error) {
-      if (error.codeName !== 'NamespaceNotFound') {
-        throw error;
-      }
+  try {
+    const dropResult = await connection.db.dropCollection('rated_artists');
+    console.log('rated_artists dropped: ', dropResult);
+  } catch (error) {
+    console.error(error);
+    if (error.codeName !== 'NamespaceNotFound') {
+      throw error;
     }
   }
-  await connection.createCollection('rated_artists', {
+
+  await connection.db.createCollection<IRatedArtistModel>('rated_artists', {
     viewOn: 'artists',
     pipeline: new Aggregate([
+      {
+        $addFields: {
+          rounds: {
+            $size: '$tracks',
+          },
+        },
+      },
+      {
+        $match: {
+          rounds: { $gt: 2 },
+        },
+      },
       {
         $lookup: {
           from: 'tracks',
@@ -23,9 +38,6 @@ const initRatedArtistsView = async (connection: Connection): Promise<void> => {
       },
       {
         $addFields: {
-          rounds: {
-            $size: '$tracks',
-          },
           wins: {
             $size: {
               $filter: {

src/graphql/types/track.type.ts

@@ -1,6 +1,6 @@
-import { ObjectType, Field, ID } from "type-graphql";
+import { ObjectType, Field, ID } from 'type-graphql';
 
-@ObjectType()
+@ObjectType('Track')
 class TrackGQLType {
   @Field(type => ID)
   id: string;
@@ -11,7 +11,6 @@ class TrackGQLType {
   @Field()
   round: number;
 
-  @Field(type => ID)
   artistID: string;
 }
 

src/index.ts

@@ -2,6 +2,7 @@ import 'reflect-metadata';
 import dotenv from 'dotenv';
 import fastify from 'fastify';
 import fastifyGQL from 'fastify-gql';
+import fastifyCORS from 'fastify-cors';
 import mongoose from 'mongoose';
 import { buildSchema } from 'type-graphql';
 import fastifyCompress from 'fastify-compress';
@@ -28,6 +29,10 @@ const buildServer = async (): Promise<FastifyInstanceType> => {
     graphiql: !process.env.PRODUCTION,
   });
 
+  app.register(fastifyCORS, {
+    origin: true,
+  });
+
   return app;
 };
 
@@ -39,9 +44,11 @@ const start = async () => {
       useNewUrlParser: true,
       useUnifiedTopology: true,
     });
+
     mongoose.set('debug', !process.env.PRODUCTION);
+    await mongoose.connection.db.setProfilingLevel('all');
 
-    await initRatedArtistsView(mongoose.connection);
+    // await initRatedArtistsView(mongoose.connection);
 
     const server = await buildServer();
     await server.listen(port, '0.0.0.0');

src/models/artist.model.ts

@@ -3,7 +3,6 @@ import { Document, model, Model, Schema, Types } from 'mongoose';
 import { ITrackModel } from '@app/models/track.model';
 
 interface IArtistModel extends Document {
-  _id: Types.ObjectId;
   artistId: number;
   username: string;
   name: string | null;
@@ -16,9 +15,10 @@ const ArtistSchema: Schema = new Schema({
     required: true,
     type: Number,
     unique: true,
+    index: true,
   },
   username: { type: String, index: true, required: true },
-  name: { type: String, index: true },
+  name: { type: String, index: 'text' },
   location: String,
   tracks: [{ type: Schema.Types.ObjectId, ref: 'Track' }],
 });

src/models/ratedArtist.model.ts

@@ -1,6 +1,6 @@
-import { Document, model, Model, Schema, Types } from "mongoose";
+import { Document, model, Model, Schema, Types } from 'mongoose';
 
-import { ITrackModel, TrackSchema } from "@app/models/track.model";
+import { ITrackModel, TrackSchema } from '@app/models/track.model';
 
 interface IRatedArtistModel extends Document {
   _id: Types.ObjectId;
@@ -20,15 +20,15 @@ const RatedArtistSchema: Schema = new Schema(
     name: String,
     location: String,
     tracks: [TrackSchema],
-    overallJudgesRating: Number,
-    overallPopularRating: Number
+    overallJudgesRating: { type: Number, index: true },
+    overallPopularRating: { type: Number, index: true },
   },
-  { collection: "rated_artists" }
+  { collection: 'rated_artists' },
 );
 
 const RatedArtistModel: Model<IRatedArtistModel> = model<IRatedArtistModel>(
-  "RatedArtist",
-  RatedArtistSchema
+  'RatedArtist',
+  RatedArtistSchema,
 );
 
 export { RatedArtistModel, IRatedArtistModel };

src/models/track.model.ts

@@ -18,21 +18,21 @@ interface ITrackModel extends Document {
 }
 
 const TrackSchema = new Schema({
-  trackId: { type: Number, unique: true, required: true },
+  trackId: { type: Number, unique: true, required: true, index: true },
   artist: {
     ref: 'Artist',
     required: true,
     type: Schema.Types.ObjectId,
   },
   pair: { type: Schema.Types.ObjectId, ref: 'Artist' },
   path: String,
-  popular_rating: Number,
-  judges_rating: Number,
+  popular_rating: { type: Number, index: true },
+  judges_rating: { type: Number, index: true },
   judges_ratings: [],
   round: { type: Number, required: true },
   table: { type: String, enum: ['qualifying', 'yin', 'yang'], required: true },
   lifebuoy: Boolean,
-  status: Number,
+  status: { type: Number, index: true },
 });
 
 const TrackModel: Model<ITrackModel> = model<ITrackModel>('Track', TrackSchema);