Conflict fixer new

.gitignore

@@ -22,5 +22,11 @@ coverage
 
 # Compiled Dirs (http://nodejs.org/api/addons.html)
 build/
-dist/bundled.js
+public/dist/bundled.js
 
+images/
+
+database/restaurant.csv
+database/review.csv
+database/review2.csv
+database/mongoReview.json

README.md

@@ -51,4 +51,11 @@ From within the root directory:
 npm install -g webpack
 npm install
 ```
-
+## Endpoints
+
+| Action        | Method        | Endpoint                      | Purpose              |
+| ------------- | ------------- | ----------------------------- | -------------------- |
+| Create        | POST          | /restaurants/:name            | Insert new name      |
+| Read(one)     | GET           | /restaurant/:restaurant_id    | Get one row          |
+| Update        | PUT           | /api/:restaurant_id/          | Update one row       |
+| Delete        | DELETE        | /api/:restaurant_id/          | Delete one row       |

client/components/app.js → client/components/app.jsx

@@ -33,7 +33,7 @@ class App extends React.Component {
   }
 
   fetchReviews(id) {
-    $.ajax(`http://100.24.121.85:3000/api/${id}`, {
+    $.ajax(`http://localhost:3000/api/${id}`, {
       success: (reviews) => {
         const wrappedReviews = reviews.map(restaurant => {
           return {

client/components/user.js → client/components/user.jsx

@@ -72,6 +72,7 @@ const Wrapper = styled.div`
     .food_picture {
       height: 300px;
       width: 300px;
+      border-radius: 8px;
     }
   }
   .date {

client/components/users.js → client/components/users.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import User from './user.js';
+import User from './user';
 
 const Users = ({ reviews }) => {
   const filtered = reviews.filter(restaurant => restaurant.searched === true);

client/src/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import App from '../components/app.js';
+import App from '../components/app';
 
 
 ReactDOM.render(<App/>, document.getElementById('recommended-reviews'));

database/index.js

@@ -1,30 +1,119 @@
-const mysql = require('mysql');
+const mongoose = require('mongoose');
 
+<<<<<<< HEAD
+mongoose.connect('mongodb://localhost/whats_lunch');
+
+const restaurantSchema = mongoose.Schema({
+  id: Number,
+  restaurant_name: String,
+  reviews: [{
+    user_name: String,
+    user_avatar: String,
+    location: String,
+    date: String,
+    score: Number,
+    food_image: String,
+  }],
+});
+
+const Restaurant = mongoose.model('restaurant_reviews', restaurantSchema);
+
+// retrieve
+const retrieve = (id, callback) => {
+  Restaurant.find({ id }, (err, res) => {
+    if (err) {
+      callback(err, null);
+=======
 // connect to database
 const connection = mysql.createConnection({
-  host: 'database',
+  // host: 'database',
   user: 'root',
   database: 'yump_SF',
 });
 
-connection.connect();
-
-const restaurantReviews = function (id, callback) {
+const restaurantReviews = (id, callback) => {
+  // const query = `
+  //   select restaurant.name, user_info.user_avatar, user_info.user_name,
+  //   user_info.location, user_info.number_reviews, user_info.number_photos,
+  //   users_reviews.date, users_reviews.review_comment, users_reviews.score,
+  //   users_reviews.picture_food, restaurant.name FROM users_reviews 
+  //   INNER JOIN restaurant ON restaurant.id = users_reviews.id  
+  //   INNER JOIN user_info ON user_info.user_id = users_reviews.user_id
+  //   WHERE restaurant.id = ${id}
+  //   ORDER BY users_reviews.date desc
+  // `;
   const query = `
-    select restaurant.name, user_info.user_avatar, user_info.user_name, user_info.location, user_info.number_reviews, user_info.number_photos, users_reviews.date, users_reviews.review_comment, users_reviews.score, users_reviews.picture_food, restaurant.name FROM users_reviews 
-    INNER JOIN restaurant ON restaurant.restaurant_id = users_reviews.restaurant_id  
-    INNER JOIN user_info ON user_info.user_id = users_reviews.user_id
-    WHERE restaurant.restaurant_id = ${id}
-    ORDER BY users_reviews.date desc
+    select restaurant.name, reviews.user_avatar, reviews.user_name,
+    reviews.location, reviews.date, reviews.review_comment, reviews.score,
+    reviews.food_image, restaurant.name FROM reviews 
+    INNER JOIN restaurant ON restaurant.id = reviews.id  
+    ORDER BY reviews.date desc
   `;
   connection.query(query, (error, results) => {
     if (error) {
       callback(error, null);
+>>>>>>> 120b116db8885360688788a2bf49c32e16bfa8c1
     } else {
-      callback(null, results);
+      callback(null, res);
+    }
+  });
+};
+
+<<<<<<< HEAD
+const addRestaurant = (restaurant_name, callback) => {
+  Restaurant.create({ restaurant_name }, (err, res) => {
+    if (err) {
+      callback(err, null);
+    } else {
+      callback(null, res);
+    }
+  });
+};
+
+module.exports.retrieve = retrieve;
+module.exports.addRestaurant = addRestaurant;
+=======
+const getOne = (id, callback) => {
+  const query = 'SELECT * FROM restaurant WHERE id = (?)';
+  connection.query(query, [id], (error, results) => {
+    if (error) {
+      callback(error);
     }
+    callback(null, results);
   });
 };
 
+const addRestaurant = (name, callback) => {
+  const query = 'INSERT INTO restaurant (name) VALUES (?)';
+  connection.query(query, [name], (error, results) => {
+    if (error) {
+      callback(error);
+    }
+    callback(null, results);
+  });
+};
 
-module.exports = { connection, restaurantReviews };
+const editRestaurant = (id, newName, callback) => {
+  const query = `UPDATE restaurant SET name = (?) WHERE id = ${id}`;
+  connection.query(query, [newName], (error) => {
+    if (error) {
+      callback(error);
+    }
+    callback(null);
+  });
+};
+
+const deleteRestaurant = (id, callback) => {
+  const query = 'DELETE from restaurant WHERE id = ?';
+  connection.query(query, [Number(id)], (error) => {
+    if (error) {
+      callback(error);
+    }
+    callback(null);
+  });
+};
+
+module.exports = {
+  connection, restaurantReviews, addRestaurant, editRestaurant, deleteRestaurant, getOne,
+};
+>>>>>>> 120b116db8885360688788a2bf49c32e16bfa8c1

database/mongoSeed.js

@@ -0,0 +1,49 @@
+const faker = require('faker');
+const fs = require('fs');
+const moment = require('moment');
+
+const randomInt = max => Math.floor(Math.random() * max + 1);
+
+const stream = fs.createWriteStream('./database/mongoReview.json');
+
+let i = 0;
+
+function write() {
+  while (i < 10000000) {
+    i += 1;
+    let fakeDate = faker.date.past();
+    fakeDate = JSON.stringify(fakeDate).slice(1, 11);
+    const name = faker.company.companyName();
+    const reviewNum = randomInt(14);
+    const restaurantReviews = {};
+    restaurantReviews.id = i;
+    restaurantReviews.restaurant_name = name;
+    restaurantReviews.reviews = [];
+
+    for (let j = 0; j < reviewNum; j += 1) {
+      const newReview = {};
+      // newReview.review_id = j;
+      newReview.user_name = faker.name.findName();
+      newReview.user_avatar = faker.image.avatar();
+      newReview.location = `${faker.address.city()} ${faker.address.state()}`;
+      newReview.date = moment(fakeDate).format('YYYY-MM-DD');
+      newReview.score = randomInt(10);
+      newReview.food_image = `https://s3-us-west-1.amazonaws.com/yump-sf-images/${randomInt(499)}.jpg`;
+      restaurantReviews.reviews.push(newReview);
+    }
+
+    if (!stream.write(`${JSON.stringify(restaurantReviews)}\n`)) {
+      return;
+    }
+    if (i % 1000) {
+      console.log(`${(i / 10000000 * 100).toFixed(2)} %`);
+      console.clear();
+    }
+  }
+  stream.end();
+}
+stream.on('drain', () => {
+  write();
+});
+
+write();

database/mysql.js

@@ -0,0 +1,79 @@
+const mysql = require('mysql');
+
+// connect to database
+const connection = mysql.createConnection({
+  // host: 'database',
+  user: 'root',
+  database: 'yump_SF',
+});
+
+const restaurantReviews = (id, callback) => {
+  // const query = `
+  //   select restaurant.name, user_info.user_avatar, user_info.user_name,
+  //   user_info.location, user_info.number_reviews, user_info.number_photos,
+  //   users_reviews.date, users_reviews.review_comment, users_reviews.score,
+  //   users_reviews.picture_food, restaurant.name FROM users_reviews 
+  //   INNER JOIN restaurant ON restaurant.id = users_reviews.id  
+  //   INNER JOIN user_info ON user_info.user_id = users_reviews.user_id
+  //   WHERE restaurant.id = ${id}
+  //   ORDER BY users_reviews.date desc
+  // `;
+  const query = `
+    select restaurant.name, reviews.user_avatar, reviews.user_name,
+    reviews.location, reviews.date, reviews.review_comment, reviews.score,
+    reviews.food_image, restaurant.name FROM reviews 
+    INNER JOIN restaurant ON restaurant.id = reviews.id  
+    ORDER BY reviews.date desc
+  `;
+  connection.query(query, (error, results) => {
+    if (error) {
+      callback(error, null);
+    } else {
+      callback(null, results);
+    }
+  });
+};
+
+const getOne = (id, callback) => {
+  const query = 'SELECT * FROM restaurant WHERE id = (?)';
+  connection.query(query, [id], (error, results) => {
+    if (error) {
+      callback(error);
+    }
+    callback(null, results);
+  });
+};
+
+const addRestaurant = (name, callback) => {
+  const query = 'INSERT INTO restaurant (name) VALUES (?)';
+  connection.query(query, [name], (error, results) => {
+    if (error) {
+      callback(error);
+    }
+    callback(null, results);
+  });
+};
+
+const editRestaurant = (id, newName, callback) => {
+  const query = `UPDATE restaurant SET name = (?) WHERE id = ${id}`;
+  connection.query(query, [newName], (error) => {
+    if (error) {
+      callback(error);
+    }
+    callback(null);
+  });
+};
+
+const deleteRestaurant = (id, callback) => {
+  const query = 'DELETE from restaurant WHERE id = ?';
+  connection.query(query, [Number(id)], (error) => {
+    if (error) {
+      callback(error);
+    }
+    callback(null);
+  });
+};
+
+module.exports = {
+  connection, restaurantReviews, addRestaurant, editRestaurant, deleteRestaurant, getOne,
+};

database/mysqlSchema.sql

@@ -0,0 +1,37 @@
+CREATE DATABASE yump_SF;
+
+use yump_SF;
+
+create table restaurant (
+  id INT auto_increment primary key,
+  name TEXT not null
+);
+
+create table reviews (
+  id INT auto_increment primary key,
+  restaurant_id INT  not null,
+  user_name TEXT not null,
+  user_avatar TEXT not null,
+  location TEXT not null,
+  date DATE not null,
+  comment TEXT not null,
+  score TINYINT not null,
+  food_image TEXT not null,
+  foreign key (restaurant_id)
+    references restaurant (id)
+    ON DELETE CASCADE
+);
+
+LOAD DATA LOCAL INFILE './database/restaurant.csv' 
+INTO TABLE restaurant 
+FIELDS TERMINATED BY ',' 
+ENCLOSED BY '"'
+LINES TERMINATED BY '\n'
+IGNORE 1 ROWS;
+
+LOAD DATA LOCAL INFILE './database/review.csv' 
+INTO TABLE reviews 
+FIELDS TERMINATED BY ',' 
+ENCLOSED BY '"'
+LINES TERMINATED BY '\n'
+IGNORE 1 ROWS;