dia 2 - olhando as oportunidades

Author: tgmarinho

server/.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

server/knexfile.ts

@@ -0,0 +1,15 @@
+const path = require('path');
+
+module.exports = {
+  client: 'sqlite3',
+  connection: {
+    filename: path.resolve(__dirname, 'src', 'database', 'database.sqlite')
+  },
+  migrations: {
+    directory: path.resolve(__dirname, 'src', 'database', 'migrations')
+  },
+  seeds: {
+    directory: path.resolve(__dirname, 'src', 'database', 'seeds')
+  },
+  useNullAsDefault: true,
+};

server/package.json

@@ -4,15 +4,21 @@
   "description": "Next Level Week - Ecoleta - Thiago Marinho at @Rocketseat",
   "main": "index.js",
   "scripts": {
-    "dev": "ts-node-dev src/server.ts"
+    "dev": "ts-node-dev --transpileOnly --ignore-watch node_modules src/server.ts",
+    "knex:migrate": "knex --knexfile knexfile.ts migrate:latest",
+    "knex:seed": "knex --knexfile knexfile.ts seed:run"
   },
   "keywords": [],
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "express": "^4.17.1"
+    "cors": "^2.8.5",
+    "express": "^4.17.1",
+    "knex": "^0.21.1",
+    "sqlite3": "^4.2.0"
   },
   "devDependencies": {
+    "@types/cors": "^2.8.6",
     "@types/express": "^4.17.6",
     "ts-node": "^8.10.2",
     "ts-node-dev": "^1.0.0-pre.44",

server/src/controllers/ItemsController.ts

@@ -0,0 +1,22 @@
+import { Request, Response } from 'express';
+import knex from '../database/connection';
+
+class ItemsController {
+
+  async index(request:Request, response: Response){
+    const items = await knex('items').select('*')
+
+    const serializedItems = items.map(item => {
+      return {
+        id: item.id,
+        title: item.title,
+        image_url: `http://localhost:3333/uploads/${item.image}`,
+      }
+    })
+
+    return response.json(serializedItems)
+}
+
+}
+
+export default ItemsController;

server/src/controllers/PointsController.ts

@@ -0,0 +1,88 @@
+import { Request, Response } from 'express';
+import knex from '../database/connection';
+
+class PointsController {
+  async index(request: Request, response: Response) {
+    const { city, uf, items } = request.query;
+
+    const parsedItems = String(items)
+      .split(',')
+      .map((item) => Number(item.trim()));
+
+    const points = await knex('points')
+      .join('point_items', 'points.id', '=', 'point_items.point_id')
+      .whereIn('point_items.item_id', parsedItems)
+      .where('city', String(city))
+      .where('uf', String(uf))
+      .distinct()
+      .select('points.*');
+
+    return response.json(points);
+  }
+
+  async show(request: Request, response: Response) {
+    const { id } = request.params;
+
+    const point = await knex('points').where('id', id).first();
+
+    if (!point) {
+      return response.status(400).json({ message: 'Point not found.' });
+    }
+
+    const items = await knex('items')
+      .join('point_items', 'items.id', '=', 'point_items.item_id')
+      .where('point_items.point_id', id)
+      .select('items.title');
+
+    return response.json({ point, items });
+  }
+
+  async create(request: Request, response: Response) {
+    const {
+      name,
+      email,
+      whatsapp,
+      latitude,
+      longitude,
+      city,
+      uf,
+      items,
+    } = request.body;
+
+    const trx = await knex.transaction();
+
+    const point = {
+      image:
+        'https://images.unsplash.com/photo-1542838132-92c53300491e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=400&q=60',
+      name,
+      email,
+      whatsapp,
+      latitude,
+      longitude,
+      city,
+      uf,
+    };
+
+    const insertedIds = await trx('points').insert(point);
+
+    const point_id = insertedIds[0];
+
+    const pointItems = items.map((item_id: number) => {
+      return {
+        item_id,
+        point_id,
+      };
+    });
+
+    await trx('point_items').insert(pointItems);
+
+    await trx.commit();
+
+    return response.json({
+      id: point_id,
+      ...point,
+    });
+  }
+}
+
+export default PointsController;

server/src/database/connection.ts

@@ -0,0 +1,12 @@
+import knex from 'knex';
+import path from 'path';
+
+const connection = knex({
+  client: 'sqlite3',
+  connection: {
+    filename: path.resolve(__dirname, 'database.sqlite')
+  },
+  useNullAsDefault: true
+});
+
+export default connection

server/src/database/database.sqlite

@@ -0,0 +1,19 @@
+import Knex from 'knex';
+
+export async function up(knex: Knex) {
+ return knex.schema.createTable('points', table => {
+    table.increments('id').primary();
+    table.string('image').notNullable();
+    table.string('email').notNullable();
+    table.string('name').notNullable();
+    table.string('whatsapp').notNullable();
+    table.decimal('latitude').notNullable();
+    table.decimal('longitude ').notNullable();
+    table.string('city').notNullable();
+    table.string('uf', 2).notNullable();
+  })
+}
+
+export async function down(knex: Knex) {
+  return knex.schema.dropTable('points')
+}

server/src/database/migrations/00_create_points.ts

@@ -0,0 +1,13 @@
+import Knex from 'knex';
+
+export async function up(knex: Knex) {
+ return knex.schema.createTable('items', table => {
+    table.increments('id').primary();
+    table.string('image').notNullable();
+    table.string('title').notNullable();
+  })
+}
+
+export async function down(knex: Knex) {
+  return knex.schema.dropTable('items')
+}

server/src/database/migrations/01_create_items.ts

@@ -0,0 +1,13 @@
+import Knex from 'knex';
+
+export async function up(knex: Knex) {
+ return knex.schema.createTable('point_items', table => {
+    table.increments('id').primary();
+    table.integer('point_id').notNullable().references('id').inTable('points')
+    table.integer('item_id').notNullable().references('id').inTable('items')
+  })
+}
+
+export async function down(knex: Knex) {
+  return knex.schema.dropTable('point_items')
+}

server/src/database/migrations/02_create_point_items.ts

@@ -0,0 +1,14 @@
+import Knex from 'knex'
+
+export async function seed(knex:Knex) {
+
+  await knex('items').insert([
+    { title: 'Lâmpadas', image: 'lampadas.svg'},
+    { title: 'Pilhas e baterias', image: 'baterias.svg'},
+    { title: 'Papéis e Papelão', image: 'papeis-papelao.svg'},
+    { title: 'Resíduos Eletrônicos', image: 'eletronicos.svg'},
+    { title: 'Resíduos Orgânicos', image: 'organicos.svg'},
+    { title: 'Óleo de Cozinha', image: 'oleo.svg'},
+  ]);
+
+}

server/src/database/seeds/00_create_items.ts

@@ -0,0 +1,18 @@
+import express from 'express'
+
+import PointsController from './controllers/PointsController';
+import ItemsController from './controllers/ItemsController';
+
+const routes = express();
+
+const pointsController = new PointsController();
+const itemsController = new ItemsController()
+
+routes.get('/items', itemsController.index)
+
+
+routes.post('/points', pointsController.create);
+routes.get('/points', pointsController.index)
+routes.get('/points/:id', pointsController.show);
+
+export default routes;

server/src/routes.ts

@@ -1,12 +1,14 @@
 import express from 'express';
+import routes from './routes';
+import path from 'path'
+import cors from 'cors';
 
 const app = express()
 
-app.get('/users', (request, response) => {
-  
-  console.log('Listagem de usuários')
-  response.json(['Diego', 'Robson', 'Cleiton', 'Thiago'])
-})
+app.use(cors());
+app.use(express.json())
+app.use(routes);
 
+app.use('/uploads', express.static(path.resolve(__dirname, '..', 'uploads')))
 
-app.listen(3333)
+app.listen(3333)