installing mongoose + continuing to rest api

.gitignore

@@ -4,7 +4,7 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 #poppeteer's output
-crawler_assets/**/*
+sites_assets/**/*
 
 
 # User-specific stuff:

package.json

@@ -26,7 +26,6 @@
     "axios": "^1.3.5",
     "dotenv": "^16.0.3",
     "mongoose": "^7.0.4",
-    "nest-mongodb": "^6.4.0",
     "puppeteer": "^19.9.1",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.5.5"

src/api/api.controller.ts

@@ -1,21 +1,68 @@
-import { Body, Controller, Post } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Post } from '@nestjs/common';
 import { CrawlerService } from '../crawler/crawler.service';
-import { DbService } from '../db/db.service';
+import { InjectModel } from '@nestjs/mongoose';
+import { Model } from 'mongoose';
+import { Site } from 'src/interfaces/site.interface';
 
 @Controller('/')
 export class ApiController {
-  constructor(private crawlerService: CrawlerService, private DbService: DbService) {}
+  constructor(private crawlerService: CrawlerService, @InjectModel('Site') private readonly siteModel: Model<Site> ) {}
   @Post('crawl')
   async crawl(@Body() body: { url: string }) {
+
     const results = this.crawlerService.crawl(body.url);
     results.then((data) => {
-      console.log(data)
+      console.log("Done crawling !", data);
-      this.DbService.insert(data, 'crawler');
+      const newSite = new this.siteModel(data);
+      newSite.save().then((result) => {
+        console.log("Site saved !", result);
+      }).catch((err) => {
+        console.log("Error saving site !", err);
+      });
     }).catch((err) => {
+      console.log("** Error crawling ! **", err);
       console.log(err);
     });
     return {
-      message: 'Crawling in progress'
+      message: 'Got your request for ' + body.url
     }
   }
+
+  // Get all
+  @Get('sites')
+  async getSites() {
+    const sites = await this.siteModel.find().exec();
+    return sites || {};
+  }
+
+  // Get by id
+  @Get('sites/:id')
+  async getSite(@Param('id') id: string) {
+    const site = await this.siteModel.findById(id).exec();
+    return site || {};
+  }
+
+  // Get by domain
+  @Get('sites/domain/:domain')
+  async getSiteByDomain(@Param('domain') domain: string) {
+    const site = await this.siteModel.findOne({ domain }).exec();
+    return site || {};
+  }
+
+  // Delete by domain
+  @Delete('sites/domain/:domain')
+  async deleteSiteByDomain(@Param('domain') domain: string) {
+    const site = await this.siteModel.findOneAndDelete({ domain }).exec();
+    return site || {};
+  }
+
+  // Delete by id
+  @Delete('sites/:id')
+  async deleteSite(@Param('id') id: string) {
+    const site = await this.siteModel.findByIdAndDelete(id).exec();
+    return site || {};
+  }
+
+
+  
 }

src/api/api.module.ts

@@ -1,11 +1,13 @@
 import { Module } from '@nestjs/common';
 import { ApiController } from './api.controller';
 import { CrawlerService } from '../crawler/crawler.service';
-import { DbService } from '../db/db.service';
+import { SitesSchema } from '../schema/sites.schema';
+import { MongooseModule } from '@nestjs/mongoose';
 
 @Module({
+  imports: [MongooseModule.forFeature([{ name: 'Site', schema: SitesSchema }])],
   controllers: [ApiController],
-  providers: [CrawlerService, DbService]
+  providers: [CrawlerService]
 
 })
 export class ApiModule {}

src/app.module.ts

@@ -1,18 +1,20 @@
 import { Module } from '@nestjs/common';
-import { MongoModule } from 'nest-mongodb'
+import { MongooseModule } from '@nestjs/mongoose';
 import { ApiModule } from './api/api.module';
 import { CrawlerModule } from './crawler/crawler.module';
 const dotenv = require('dotenv');
-// import { DbModule } from './db/db.module';
 
 dotenv.config();
 
-console.log(process)
 @Module({
   imports: [
-    MongoModule.forRoot(process.env.DB_URI, process.env.DB_NAME),
+    MongooseModule.forRoot(process.env.DB_URI, {
+      useNewUrlParser: true,
+      useUnifiedTopology: true,
+    }),
     ApiModule,
     CrawlerModule
   ]
+
 })
 export class AppModule { }

src/crawler/crawler.module.ts

@@ -1,9 +1,7 @@
 import { Module } from '@nestjs/common';
 import { CrawlerService } from './crawler.service';
-import { DbModule } from '../db/db.module';
 
 @Module({
-  imports: [DbModule],
   providers: [CrawlerService]
 })
 export class CrawlerModule {}

src/crawler/crawler.service.ts

@@ -4,18 +4,18 @@ import * as fs from 'fs';
 import puppeteer from 'puppeteer';
 import { URL } from 'url';
 import axios from 'axios';
-
+import { Site } from '../interfaces/site.interface';
-const environment = process.env.NODE_ENV || 'development';
 
 @Injectable()
 export class CrawlerService {
-  async crawl(url: string): Promise<any> {
+
-    console.log("start crawl", url);
+  async crawl(url: string): Promise<Site> {
+    console.log("start crawl website", url);
     const browser = await puppeteer.launch({ headless: true, args: ['--no-sandbox'] });
     const page = await browser.newPage();
     const domain = this.extractDomain(url);
     await page.goto(url);
-    const directory = `crawler_assets/${domain}/`;
+    const directory = `sites_assets/${domain}/`;
     if (!fs.existsSync(directory)) {
       mkdirSync(directory);
     }
@@ -49,6 +49,7 @@ export class CrawlerService {
 
     await browser.close();
     return {
+      domain,
       cssSheetsLocation,
       scriptsSheetsLocation,
       urlsList

src/db/db.module.ts

@@ -1,7 +0,0 @@
-import { Module } from '@nestjs/common';
-import { DbService } from './db.service';
-
-@Module({
-  providers: [DbService]
-})
-export class DbModule {}

src/db/db.service.ts

@@ -1,17 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-@Injectable()
-export class DbService {
-  constructor() {
-    console.log(`DbService constructor`);
-  }
-
-  insert(data: {
-    cssSheetsLocation: string[];
-    scriptsSheetsLocation: string[];
-  }, collection: string)  {
-
-    console.log({data, collection});
-  
-  }
-}

src/interfaces/site.interface.ts

@@ -1,8 +1,6 @@
-import { ObjectId } from 'mongodb';
+export interface Site {
-
-export interface Cat {
-  _id: ObjectId;
   domain: string;
   cssSheetsLocation: string[];
   scriptsSheetsLocation: string[];
+  urlsList: string[];
 }

src/schema/sites.schema.ts

@@ -0,0 +1,21 @@
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
+import { Document } from 'mongoose';
+
+export type SitesDocument = Sites & Document;
+
+@Schema()
+export class Sites {
+  @Prop({ required: true, unique: true})
+  domain: string;
+  
+  @Prop()
+  cssSheetsLocation: string[];
+
+  @Prop()
+  scriptsSheetsLocation: string[];
+
+  @Prop({ required: true})
+  urlsList: string[];
+}
+
+export const SitesSchema = SchemaFactory.createForClass(Sites);