fix: remove all lesson file on delete course

.eslintrc.json

@@ -15,7 +15,7 @@
     "project": "./tsconfig.json",
     "include": ["src/**/*.ts", "src/**/*.js", "test/**/*.ts"]
   },
-  "plugins": ["@typescript-eslint"],
+  "plugins": ["@typescript-eslint", "import"],
   "rules": {
     "no-unused-vars": "off",
     "@typescript-eslint/no-unused-vars": ["error"]

CHANGELOG.md

@@ -4,10 +4,12 @@
 
 ## Added
 
+- Updated npm dependencies
 - [Added](https://github.com/sergeyyarkov/educt-server/commit/294a4f584dd39d295372802305004365fb01fdb2) `MAILER` env variable
 
 ## Fix
 
+- Fixed schema validator on saving lesson order
 - Fixed lesson [duration updating](https://github.com/sergeyyarkov/educt-server/commit/ffdebc4f927abe3b63c62c84268f40f9e6663895#diff-86d18314585862595621b4e90f675b79ac74e7a0a47b2797556902eeff75e14a)
 - Updated cors config
 - Deleted `api` from path url

ace-manifest.json

@@ -11,19 +11,66 @@
     },
     "list:routes": {
       "settings": {
-        "loadApp": true
+        "loadApp": true,
+        "stayAlive": true
       },
-      "commandPath": "@adonisjs/core/build/commands/ListRoutes",
+      "commandPath": "@adonisjs/core/build/commands/ListRoutes/index",
       "commandName": "list:routes",
       "description": "List application routes",
       "args": [],
       "aliases": [],
       "flags": [
+        {
+          "name": "verbose",
+          "propertyName": "verbose",
+          "type": "boolean",
+          "description": "Display more information"
+        },
+        {
+          "name": "reverse",
+          "propertyName": "reverse",
+          "type": "boolean",
+          "alias": "r",
+          "description": "Reverse routes display"
+        },
+        {
+          "name": "methods",
+          "propertyName": "methodsFilter",
+          "type": "array",
+          "alias": "m",
+          "description": "Filter routes by method"
+        },
+        {
+          "name": "patterns",
+          "propertyName": "patternsFilter",
+          "type": "array",
+          "alias": "p",
+          "description": "Filter routes by the route pattern"
+        },
+        {
+          "name": "names",
+          "propertyName": "namesFilter",
+          "type": "array",
+          "alias": "n",
+          "description": "Filter routes by route name"
+        },
         {
           "name": "json",
           "propertyName": "json",
           "type": "boolean",
           "description": "Output as JSON"
+        },
+        {
+          "name": "table",
+          "propertyName": "table",
+          "type": "boolean",
+          "description": "Output as Table"
+        },
+        {
+          "name": "max-width",
+          "propertyName": "maxWidth",
+          "type": "number",
+          "description": "Specify maximum rendering width. Ignored for JSON Output"
         }
       ]
     },
@@ -55,7 +102,7 @@
       },
       "commandPath": "@adonisjs/lucid/build/commands/DbSeed",
       "commandName": "db:seed",
-      "description": "Execute database seeder files",
+      "description": "Execute database seeders",
       "args": [],
       "aliases": [],
       "flags": [
@@ -79,6 +126,12 @@
           "type": "array",
           "description": "Define a custom set of seeders files names to run",
           "alias": "f"
+        },
+        {
+          "name": "compact-output",
+          "propertyName": "compactOutput",
+          "type": "boolean",
+          "description": "A compact single-line output"
         }
       ]
     },
@@ -113,6 +166,13 @@
           "type": "boolean",
           "alias": "c",
           "description": "Generate the controller for the model"
+        },
+        {
+          "name": "factory",
+          "propertyName": "factory",
+          "type": "boolean",
+          "alias": "f",
+          "description": "Generate a factory for the model"
         }
       ]
     },
@@ -177,13 +237,81 @@
       "aliases": [],
       "flags": []
     },
+    "make:factory": {
+      "settings": {},
+      "commandPath": "@adonisjs/lucid/build/commands/MakeFactory",
+      "commandName": "make:factory",
+      "description": "Make a new factory",
+      "args": [
+        {
+          "type": "string",
+          "propertyName": "model",
+          "name": "model",
+          "required": true,
+          "description": "The name of the model"
+        }
+      ],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "model-path",
+          "propertyName": "modelPath",
+          "type": "string",
+          "description": "The path to the model"
+        },
+        {
+          "name": "exact",
+          "propertyName": "exact",
+          "type": "boolean",
+          "description": "Create the factory with the exact name as provided",
+          "alias": "e"
+        }
+      ]
+    },
+    "db:wipe": {
+      "settings": {
+        "loadApp": true
+      },
+      "commandPath": "@adonisjs/lucid/build/commands/DbWipe",
+      "commandName": "db:wipe",
+      "description": "Drop all tables, views and types in database",
+      "args": [],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "connection",
+          "propertyName": "connection",
+          "type": "string",
+          "description": "Define a custom database connection",
+          "alias": "c"
+        },
+        {
+          "name": "drop-views",
+          "propertyName": "dropViews",
+          "type": "boolean",
+          "description": "Drop all views"
+        },
+        {
+          "name": "drop-types",
+          "propertyName": "dropTypes",
+          "type": "boolean",
+          "description": "Drop all custom types (Postgres only)"
+        },
+        {
+          "name": "force",
+          "propertyName": "force",
+          "type": "boolean",
+          "description": "Explicitly force command to run in production"
+        }
+      ]
+    },
     "migration:run": {
       "settings": {
         "loadApp": true
       },
       "commandPath": "@adonisjs/lucid/build/commands/Migration/Run",
       "commandName": "migration:run",
-      "description": "Run pending migrations",
+      "description": "Migrate database by running pending migrations",
       "args": [],
       "aliases": [],
       "flags": [
@@ -204,7 +332,13 @@
           "name": "dry-run",
           "propertyName": "dryRun",
           "type": "boolean",
-          "description": "Print SQL queries, instead of running the migrations"
+          "description": "Do not run actual queries. Instead view the SQL output"
+        },
+        {
+          "name": "compact-output",
+          "propertyName": "compactOutput",
+          "type": "boolean",
+          "description": "A compact single-line output"
         }
       ]
     },
@@ -214,7 +348,7 @@
       },
       "commandPath": "@adonisjs/lucid/build/commands/Migration/Rollback",
       "commandName": "migration:rollback",
-      "description": "Rollback migrations to a given batch number",
+      "description": "Rollback migrations to a specific batch number",
       "args": [],
       "aliases": [],
       "flags": [
@@ -235,13 +369,19 @@
           "name": "dry-run",
           "propertyName": "dryRun",
           "type": "boolean",
-          "description": "Print SQL queries, instead of running the migrations"
+          "description": "Do not run actual queries. Instead view the SQL output"
         },
         {
           "name": "batch",
           "propertyName": "batch",
           "type": "number",
           "description": "Define custom batch number for rollback. Use 0 to rollback to initial state"
+        },
+        {
+          "name": "compact-output",
+          "propertyName": "compactOutput",
+          "type": "boolean",
+          "description": "A compact single-line output"
         }
       ]
     },
@@ -251,7 +391,7 @@
       },
       "commandPath": "@adonisjs/lucid/build/commands/Migration/Status",
       "commandName": "migration:status",
-      "description": "Check migrations current status.",
+      "description": "View migrations status",
       "args": [],
       "aliases": [],
       "flags": [
@@ -264,6 +404,117 @@
         }
       ]
     },
+    "migration:reset": {
+      "settings": {
+        "loadApp": true
+      },
+      "commandPath": "@adonisjs/lucid/build/commands/Migration/Reset",
+      "commandName": "migration:reset",
+      "description": "Rollback all migrations",
+      "args": [],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "connection",
+          "propertyName": "connection",
+          "type": "string",
+          "description": "Define a custom database connection",
+          "alias": "c"
+        },
+        {
+          "name": "force",
+          "propertyName": "force",
+          "type": "boolean",
+          "description": "Explicitly force command to run in production"
+        },
+        {
+          "name": "dry-run",
+          "propertyName": "dryRun",
+          "type": "boolean",
+          "description": "Do not run actual queries. Instead view the SQL output"
+        }
+      ]
+    },
+    "migration:refresh": {
+      "settings": {
+        "loadApp": true
+      },
+      "commandPath": "@adonisjs/lucid/build/commands/Migration/Refresh",
+      "commandName": "migration:refresh",
+      "description": "Rollback and migrate database",
+      "args": [],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "connection",
+          "propertyName": "connection",
+          "type": "string",
+          "description": "Define a custom database connection",
+          "alias": "c"
+        },
+        {
+          "name": "force",
+          "propertyName": "force",
+          "type": "boolean",
+          "description": "Explicitly force command to run in production"
+        },
+        {
+          "name": "dry-run",
+          "propertyName": "dryRun",
+          "type": "boolean",
+          "description": "Do not run actual queries. Instead view the SQL output"
+        },
+        {
+          "name": "seed",
+          "propertyName": "seed",
+          "type": "boolean",
+          "description": "Run seeders"
+        }
+      ]
+    },
+    "migration:fresh": {
+      "settings": {
+        "loadApp": true
+      },
+      "commandPath": "@adonisjs/lucid/build/commands/Migration/Fresh",
+      "commandName": "migration:fresh",
+      "description": "Drop all tables and re-migrate the database",
+      "args": [],
+      "aliases": [],
+      "flags": [
+        {
+          "name": "connection",
+          "propertyName": "connection",
+          "type": "string",
+          "description": "Define a custom database connection",
+          "alias": "c"
+        },
+        {
+          "name": "force",
+          "propertyName": "force",
+          "type": "boolean",
+          "description": "Explicitly force command to run in production"
+        },
+        {
+          "name": "seed",
+          "propertyName": "seed",
+          "type": "boolean",
+          "description": "Run seeders"
+        },
+        {
+          "name": "drop-views",
+          "propertyName": "dropViews",
+          "type": "boolean",
+          "description": "Drop all views"
+        },
+        {
+          "name": "drop-types",
+          "propertyName": "dropTypes",
+          "type": "boolean",
+          "description": "Drop all custom types (Postgres only)"
+        }
+      ]
+    },
     "make:mailer": {
       "settings": {},
       "commandPath": "@adonisjs/mail/build/commands/MakeMailer",

app/Controllers/Http/Api/v1/LessonsController.ts

@@ -1,6 +1,6 @@
 import { Exception, inject, Ioc } from '@adonisjs/core/build/standalone';
 import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
-import { schema } from '@ioc:Adonis/Core/Validator';
+import { schema, rules } from '@ioc:Adonis/Core/Validator';
 
 /**
  * Services
@@ -141,7 +141,7 @@ export default class LessonsController extends BaseController {
   // eslint-disable-next-line class-methods-use-this
   public async saveOrder(ctx: HttpContextContract) {
     const saveOrderSchema = schema.create({
-      ids: schema.array().members(schema.string()),
+      ids: schema.array([rules.minLength(1)]).members(schema.string()),
     });
     const payload = await ctx.request.validate({ schema: saveOrderSchema });
     const { data, message, status, success, error } = await this.lessonService.updateOrder(payload.ids);

app/Repositories/CourseRepository.ts

@@ -237,6 +237,7 @@ export default class CourseRepository {
   public async delete(id: string | number): Promise<Course | null> {
     const course = await this.Course.query()
       .preload('category')
+      .preload('lessons', q => q.preload('video').preload('materials'))
       .withCount('students')
       .withCount('likes')
       .withCount('lessons')

app/Services/CourseService.ts

@@ -25,6 +25,7 @@ import CreateCourseValidator from 'App/Validators/Course/CreateCourseValidator';
 import UpdateCourseValidator from 'App/Validators/Course/UpdateCourseValidator';
 import FetchCoursesValidator from 'App/Validators/Course/FetchCoursesValidator';
 import Course from 'App/Models/Course';
+import Drive from '@ioc:Adonis/Core/Drive';
 
 @inject()
 export default class CourseService {
@@ -310,6 +311,24 @@ export default class CourseService {
       };
     }
 
+    /**
+     * Collect all file names from lessons in course and delete files
+     */
+    const videos: string[] = course.lessons.map(lesson => lesson.video.name);
+    const materials: string[] = course.lessons.map(lesson => lesson.materials.map(m => m.name)).flat();
+
+    await Promise.all(
+      videos.map(async name => {
+        await Drive.delete(`videos/${name}`);
+      })
+    );
+
+    await Promise.all(
+      materials.map(async name => {
+        await Drive.delete(`materials/${name}`);
+      })
+    );
+
     return {
       success: true,
       status: HttpStatusEnum.OK,

app/Validators/Contacts/CreateContactsValidator.ts

@@ -7,7 +7,7 @@ export default class CreateContactsValidator {
   public schema = schema.create({
     phone_number: schema.string.nullableAndOptional({}, [
       rules.mobile({
-        locales: ['ru-RU', 'en-US'],
+        locale: ['ru-RU', 'en-US'],
         strict: true,
       }),
     ]),

app/Validators/Contacts/UpdateContactsValidator.ts

@@ -7,7 +7,7 @@ export default class UpdateContactsValidator {
   public schema = schema.create({
     phone_number: schema.string.nullableAndOptional({}, [
       rules.mobile({
-        locales: ['ru-RU', 'en-US'],
+        locale: ['ru-RU', 'en-US'],
         strict: true,
       }),
       rules.unique({ table: 'contacts', column: 'phone_number' }),

config/drive.ts

@@ -6,7 +6,7 @@
  */
 
 import Env from '@ioc:Adonis/Core/Env';
-import { DriveConfig } from '@ioc:Adonis/Core/Drive';
+import { driveConfig } from '@adonisjs/core/build/config';
 import Application from '@ioc:Adonis/Core/Application';
 
 /*
@@ -18,7 +18,7 @@ import Application from '@ioc:Adonis/Core/Application';
  | defined inside the `contracts` directory.
  |
  */
-const driveConfig: DriveConfig = {
+export default driveConfig({
   /*
    |--------------------------------------------------------------------------
    | Default disk
@@ -143,6 +143,4 @@ const driveConfig: DriveConfig = {
     //   usingUniformAcl: false
     // },
   },
-};
+});
-
-export default driveConfig;

config/hash.ts

@@ -6,7 +6,7 @@
  */
 
 import Env from '@ioc:Adonis/Core/Env';
-import { HashConfig } from '@ioc:Adonis/Core/Hash';
+import { hashConfig } from '@adonisjs/core/build/config';
 
 /*
 |--------------------------------------------------------------------------
@@ -17,7 +17,7 @@ import { HashConfig } from '@ioc:Adonis/Core/Hash';
 | defined inside `contracts` directory.
 |
 */
-const hashConfig: HashConfig = {
+export default hashConfig({
   /*
   |--------------------------------------------------------------------------
   | Default hasher
@@ -70,6 +70,4 @@ const hashConfig: HashConfig = {
       rounds: 10,
     },
   },
-};
+});
-
-export default hashConfig;

config/mail.ts

@@ -6,9 +6,9 @@
  */
 
 import Env from '@ioc:Adonis/Core/Env';
-import { MailConfig } from '@ioc:Adonis/Addons/Mail';
+import { mailConfig } from '@adonisjs/mail/build/config';
 
-const mailConfig: MailConfig = {
+export default mailConfig({
   /*
   |--------------------------------------------------------------------------
   | Default mailer
@@ -71,6 +71,4 @@ const mailConfig: MailConfig = {
       domain: Env.get('MAILGUN_DOMAIN'),
     },
   },
-};
+});
-
-export default mailConfig;

contracts/drive.ts

@@ -1,16 +1,6 @@
+import { InferDisksFromConfig } from '@adonisjs/core/build/config';
+import driveConfig from '../config/drive';
+
 declare module '@ioc:Adonis/Core/Drive' {
-  interface DisksList {
+  interface DisksList extends InferDisksFromConfig<typeof driveConfig> {}
-    local: {
-      config: LocalDriverConfig;
-      implementation: LocalDriverContract;
-    };
-    s3: {
-      config: S3DriverConfig;
-      implementation: S3DriverContract;
-    };
-    // gcs: {
-    //   config: GcsDriverConfig
-    //   implementation: GcsDriverContract
-    // }
-  }
 }

contracts/hash.ts

@@ -1,19 +1,6 @@
-/**
+import { InferListFromConfig } from '@adonisjs/core/build/config';
- * Contract source: https://git.io/Jfefs
+import hashConfig from '../config/hash';
- *
- * Feel free to let us know via PR, if you find something broken in this contract
- * file.
- */
 
 declare module '@ioc:Adonis/Core/Hash' {
-  interface HashersList {
+  interface HashersList extends InferListFromConfig<typeof hashConfig> {}
-    bcrypt: {
-      config: BcryptConfig;
-      implementation: BcryptContract;
-    };
-    argon: {
-      config: ArgonConfig;
-      implementation: ArgonContract;
-    };
-  }
 }

contracts/mail.ts

@@ -1,15 +1,6 @@
-/**
+import { InferMailersFromConfig } from '@adonisjs/mail/build/config';
- * Contract source: https://git.io/JvgAT
+import mailConfig from '../config/mail';
- *
- * Feel free to let us know via PR, if you find something broken in this contract
- * file.
- */
 
 declare module '@ioc:Adonis/Addons/Mail' {
-  import { MailDrivers } from '@ioc:Adonis/Addons/Mail';
+  interface MailersList extends InferMailersFromConfig<typeof mailConfig> {}
-
-  interface MailersList {
-    smtp: MailDrivers['smtp'];
-    mailgun: MailDrivers['mailgun'];
-  }
 }

env.ts

@@ -19,7 +19,7 @@ export default Env.rules({
   PORT: Env.schema.number(),
   APP_KEY: Env.schema.string(),
   APP_NAME: Env.schema.string(),
-  NODE_ENV: Env.schema.enum(['development', 'production', 'testing'] as const),
+  NODE_ENV: Env.schema.enum(['development', 'production', 'test'] as const),
   DRIVE_DISK: Env.schema.enum(['local', 's3'] as const),
   PG_HOST: Env.schema.string({ format: 'host' }),
   PG_PORT: Env.schema.number(),

package.json

@@ -15,44 +15,44 @@
     "db:seed:force": "node ace seed --force"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^5.3.7",
+    "@adonisjs/assembler": "^5.7.0",
-    "@typescript-eslint/eslint-plugin": "^4.30.0",
+    "@typescript-eslint/eslint-plugin": "^5.27.0",
-    "@typescript-eslint/parser": "^4.30.0",
+    "@typescript-eslint/parser": "^5.27.0",
     "adonis-preset-ts": "^2.1.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.17.0",
-    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-airbnb-typescript": "^12.3.1",
+    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-prettier": "^4.0.0",
-    "pino-pretty": "^5.1.3",
+    "pino-pretty": "^8.0.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.6.2",
-    "typescript": "^4.4.2",
+    "typescript": "^4.7.3",
-    "youch": "^2.2.2",
+    "youch": "^3.2.0",
-    "youch-terminal": "^1.1.1"
+    "youch-terminal": "^2.1.4"
   },
   "dependencies": {
-    "@adonisjs/application": "^5.2.0",
+    "@adonisjs/application": "^5.2.5",
-    "@adonisjs/attachment-lite": "^1.0.1",
+    "@adonisjs/attachment-lite": "^1.0.7",
-    "@adonisjs/auth": "^8.0.10",
+    "@adonisjs/auth": "^8.2.1",
-    "@adonisjs/bouncer": "^2.2.5",
+    "@adonisjs/bouncer": "^2.3.0",
-    "@adonisjs/core": "^5.4.2",
+    "@adonisjs/core": "^5.8.3",
-    "@adonisjs/drive": "^2.0.7",
+    "@adonisjs/drive": "^2.2.0",
-    "@adonisjs/drive-s3": "^1.0.5",
+    "@adonisjs/drive-s3": "^1.3.1",
-    "@adonisjs/lucid": "^16.3.2",
+    "@adonisjs/lucid": "^18.0.1",
-    "@adonisjs/mail": "^7.2.4",
+    "@adonisjs/mail": "^8.1.2",
-    "@adonisjs/redis": "^7.1.0",
+    "@adonisjs/redis": "^7.3.0",
-    "@adonisjs/repl": "^3.1.7",
+    "@adonisjs/repl": "^3.1.11",
-    "@adonisjs/view": "^6.1.1",
+    "@adonisjs/view": "^6.1.5",
     "@types/socket.io": "^3.0.2",
     "cloudinary": "^1.26.3",
-    "luxon": "^1.28.0",
+    "luxon": "^2.4.0",
-    "nanoid": "^3.1.25",
+    "nanoid": "^3.3.4",
-    "pg": "^8.7.1",
+    "pg": "^8.7.3",
     "phc-bcrypt": "^1.0.7",
     "proxy-addr": "^2.0.7",
     "reflect-metadata": "^0.1.13",
-    "socket.io": "^4.4.1",
+    "socket.io": "^4.5.1",
-    "source-map-support": "^0.5.19"
+    "source-map-support": "^0.5.21"
   }
 }