Merge pull request #314 from labzero/jeffrey/fixes

Check for user instead of id; bring back CITEXT

src/components/RestaurantVoteCount/RestaurantVoteCount.test.js

@@ -14,7 +14,7 @@ describe("RestaurantAddTagForm", () => {
     props = {
       id: 1,
       votes: [{ restaurantId: 1 }],
-      user: {},
+      user: { id: 1 },
       users: [],
     };
   });

src/models/Invitation.ts

@@ -1,8 +1,8 @@
-import { Column, Model, Table } from "sequelize-typescript";
+import { Column, DataType, Model, Table } from "sequelize-typescript";
 
 @Table({ modelName: "invitation" })
 class Invitation extends Model {
-  @Column({ allowNull: false, unique: true })
+  @Column({ allowNull: false, type: DataType.CITEXT, unique: true })
   email: string;
 
   @Column

src/models/User.ts

@@ -1,6 +1,7 @@
 import {
   BelongsToMany,
   Column,
+  DataType,
   HasMany,
   Model,
   Scopes,
@@ -92,7 +93,7 @@ class User extends Model {
   @Column
   name: string;
 
-  @Column
+  @Column({ type: DataType.CITEXT })
   email: string;
 
   @Column

src/routes/helpers/renderIfHasName.js

@@ -10,7 +10,7 @@ export default (context, makeRoute) => {
     redirect = `${redirect}&team=${context.subdomain}`;
   }
 
-  if (user.id) {
+  if (user) {
     if (user.name) {
       return makeRoute();
     }

src/routes/helpers/tests/renderIfHasName.test.js

@@ -30,7 +30,7 @@ describe("routes/helpers/renderIfHasName", () => {
       }).default;
       context = {
         store: mockStore({
-          user: {},
+          user: null,
         }),
       };
       renderIfHasNameProxy(context, makeRouteSpy);

src/routes/main/account/index.js

@@ -18,7 +18,7 @@ export default (context) => {
   const state = context.store.getState();
   const user = state.user;
 
-  if (user.id) {
+  if (user) {
     return {
       title,
       chunks: ["account"],

src/routes/main/welcome/index.js

@@ -18,7 +18,7 @@ export default (context) => {
   const state = context.store.getState();
   const user = state.user;
 
-  if (user.id) {
+  if (user) {
     return {
       title,
       chunks: ["welcome"],

src/routes/team/home/Home.js

@@ -14,7 +14,7 @@ import s from "./Home.scss";
 
 export class _Home extends Component {
   static propTypes = {
-    user: PropTypes.object.isRequired,
+    user: PropTypes.object,
     fetchDecisions: PropTypes.func.isRequired,
     fetchRestaurants: PropTypes.func.isRequired,
     fetchTags: PropTypes.func.isRequired,
@@ -28,6 +28,10 @@ export class _Home extends Component {
     wsPort: PropTypes.number.isRequired,
   };
 
+  static defaultProps = {
+    user: null,
+  };
+
   componentDidMount() {
     const { messageReceived, wsPort } = this.props;
 
@@ -98,7 +102,7 @@ export class _Home extends Component {
         </div>
         <div className={s.listContainer} id="listContainer">
           <section className={s.forms} id="listForms">
-            {user.id && <RestaurantAddFormContainer />}
+            {user && <RestaurantAddFormContainer />}
             <NameFilterFormContainer />
             <TagFilterFormContainer />
             <TagFilterFormContainer exclude />

src/routes/team/home/Home.test.js

@@ -78,7 +78,7 @@ describe("Home", () => {
       invalidateUsers,
       messageReceived: () => undefined,
       pastDecisionsShown: false,
-      user: {},
+      user: null,
       wsPort: 3000,
     };
   });
@@ -91,7 +91,7 @@ describe("Home", () => {
   };
 
   it("renders form if user is logged in", async () => {
-    props.user.id = 1;
+    props.user = { id: 1 };
 
     await renderComponent();