adjust .env variables and readme

Author: rwieruch

README.md

@@ -4,6 +4,10 @@
 
 A full-fledged Apollo Server with Apollo Client starter project with React and Express. [Read more about it in this tutorial to build it yourself](https://www.robinwieruch.de/graphql-apollo-server-tutorial/).
 
+Further Readings:
+ * [TODO: write setup tutorial]
+ * [TODO: write migration tutorial]
+
 **This repository is the fullstack Apollo Server with Express and MongoDB project. You can find a working client application that can be used with this server in the list below:**
 
 * [React Client](https://github.com/the-road-to-graphql/fullstack-apollo-react-boilerplate)
@@ -39,27 +43,19 @@ A full-fledged Apollo Server with Apollo Client starter project with React and E
 
 #### .env file
 
-Since this boilerplate project is using MongoDB, you have to install it for your machine and get a database up and running. You find everything for the set up over here: [Setup MongoDB with Mongoose in Express Tutorial](https://www.robinwieruch.de/mongodb-express-setup-tutorial) [TODO: write tutorial]. After you have created a database and a database user, you can fill out the environment variables in the *server/.env* file.
+Since this boilerplate project is using MongoDB, you have to install it for your machine and get a database up and running. You find everything for the set up over here: [Setup MongoDB with Mongoose in Express Tutorial](https://www.robinwieruch.de/mongodb-express-setup-tutorial) [TODO: write setup tutorial]. After you have created a MongoDB database, you can fill out the environment variables in the *server/.env* file.
 
 ```
-DATABASE=mydatabase
-
-DATABASE_USER=postgres
-DATABASE_PASSWORD=postgres
-
 SECRET=asdlplplfwfwefwekwself.2342.dawasdq
 
-MONGO_URI=mongodb://localhost:27017/mydatabase
+DATABASE_URL=mongodb://localhost:27017/mydatabase
 ```
 
 The `SECRET` is just a random string for your authentication. Keep all these information secure by adding the *.env* file to your *.gitignore* file. No third-party should have access to this information.
 
 #### Testing
 
-[TODO: change psql to MongoDB equivalent]
-
-* adjust `test:run-server` npm script with `TEST_DATABASE` environment variable in package.json to match your testing database name
- * to match it from package.json: `createdb mytestdatabase` with psql
+* adjust `test:run-server` npm script with `TEST_DATABASE_URL` environment variable in package.json to match your testing database name
 * one terminal: npm run test:run-server
 * second terminal: test:execute-test
 

package.json

@@ -8,7 +8,7 @@
  },
  "scripts": {
  "start": "nodemon --exec babel-node src/index.js",
- "test:run-server": "TEST_DATABASE=mytestdatabase npm start",
+ "test:run-server": "TEST_DATABASE_URL=mongodb://localhost:27017/mytestdatabase npm start",
  "test:execute-test": "mocha --require @babel/register 'src/**/*.spec.js'",
  "test": "echo \"No test specified\" && exit 0"
  },

src/index.js

@@ -85,17 +85,18 @@ server.applyMiddleware({ app, path: '/graphql' });
 const httpServer = http.createServer(app);
 server.installSubscriptionHandlers(httpServer);
 
-const isTest = !!process.env.TEST_DATABASE;
-const isProduction = !!process.env.DATABASE_URL;
+const isTest = !!process.env.TEST_DATABASE_URL;
+const isProduction = process.env.NODE_ENV === 'production';
 const port = process.env.PORT || 8000;
 
 connectDb().then(async () => {
  if (isTest || isProduction) {
- // resetDb
+ // reset database
  await Promise.all([
  models.User.remove({}),
  models.Message.remove({}),
  ]);
+
  createUsersWithMessages(new Date());
  }
 
@@ -105,40 +106,35 @@ connectDb().then(async () => {
 });
 
 const createUsersWithMessages = async date => {
- try {
- await models.User.create({
- username: 'rwieruch',
- email: 'hello@robin.com',
- password: 'rwieruch',
- role: 'ADMIN',
- }).then(createdUser => {
- return models.Message.create({
- text: 'Published the Road to learn React',
- createdAt: date.setSeconds(date.getSeconds() + 1),
- userId: createdUser._id,
- });
+ await models.User.create({
+ username: 'rwieruch',
+ email: 'hello@robin.com',
+ password: 'rwieruch',
+ role: 'ADMIN',
+ }).then(createdUser => {
+ return models.Message.create({
+ text: 'Published the Road to learn React',
+ createdAt: date.setSeconds(date.getSeconds() + 1),
+ userId: createdUser._id,
  });
+ });
 
- await models.User.create({
- username: 'ddavids',
- email: 'hello@david.com',
- password: 'ddavids',
- }).then(createdUser => {
- return models.Message.create(
- {
- text: 'Happy to release ...',
- createdAt: date.setSeconds(date.getSeconds() + 1),
- userId: createdUser._id,
- },
- {
- text: 'Published a complete ...',
- createdAt: date.setSeconds(date.getSeconds() + 1),
- userId: createdUser._id,
- },
- );
- });
- } catch (e) {
- console.log(e);
- throw e;
- }
+ await models.User.create({
+ username: 'ddavids',
+ email: 'hello@david.com',
+ password: 'ddavids',
+ }).then(createdUser => {
+ return models.Message.create(
+ {
+ text: 'Happy to release ...',
+ createdAt: date.setSeconds(date.getSeconds() + 1),
+ userId: createdUser._id,
+ },
+ {
+ text: 'Published a complete ...',
+ createdAt: date.setSeconds(date.getSeconds() + 1),
+ userId: createdUser._id,
+ },
+ );
+ });
 };

src/models/index.js

@@ -7,13 +7,10 @@ export function connectDb() {
  if (process.env.DATABASE_URL) {
  return mongoose.connect(process.env.DATABASE_URL);
  }
- if (process.env.TEST_DATABASE) {
- return mongoose.connect(
- `mongodb://localhost:27017/${process.env.TEST_DATABASE}`,
- );
- }
 
- return mongoose.connect(process.env.MONGO_URI);
+ if (process.env.TEST_DATABASE_URL) {
+ return mongoose.connect(process.env.TEST_DATABASE_URL);
+ }
 }
 
 export default {