Current sync

README.md

@@ -1,24 +1,6 @@
 # README
 
-This README would normally document whatever steps are necessary to get the
+## Running
-application up and running.
+docker run --name gangstadb -d -p 5432:5432 -e POSTGRES_PASSWORD=docker roraccounting
-
+PORT=3001 bundle exec rails s
-Things you may want to cover:
+PORT=3000 yarn --cwd client start
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...

app/controllers/money_moves_controller.rb

@@ -4,7 +4,7 @@ class MoneyMovesController < ApplicationController
   end
 
   def create
-   money_move = MoneyMove.new(money_move_params)
+   money_move = MoneyMove.create_move(money_move_params)
    if money_move.save
      json_response(money_move)
    else

app/models/homie.rb

@@ -1,14 +1,12 @@
 class Homie < ApplicationRecord
-  has_many :money_moves_from, class_name: 'MoneyMove', foreign_key: :from_homie_id
+  has_many :money_moves
-  has_many :money_moves_to, class_name: 'MoneyMove', foreign_key: :to_homie_id
 
   def self.cash(importance)
-    got = Homie.all.joins(:money_moves_to).group(:id).order(:id).sum(:amount)
+     totals = Homie.all.joins(:money_moves).group(:id).order(:id).sum(:amount)
-    owe = Homie.all.joins(:money_moves_from).group(:id).order(:id).sum(:amount)
 
     result = [] 
     Homie.where(["importance > ?", importance]).map do |homie|
-      total = got.fetch(homie.id, 0) - owe.fetch(homie.id,0)
+      total = totals.fetch(homie.id, 0) 
       { homie: homie, amount: total } 
     end
   end

app/models/money_move.rb

@@ -1,4 +1,25 @@
 class MoneyMove < ApplicationRecord
-  belongs_to :from_homie, class_name: 'Homie'
+  belongs_to :homie
-  belongs_to :to_homie, class_name: 'Homie'
+
+  def create_move(params)
+    common_params = { description: params[:description] } 
+
+    move_from = MoneyMove.new(
+      common_params + { 
+        homie_id: params[:from_homie_id],
+        amount: -BigDecimal.new(params[:amount])   
+      } 
+    )
+    move_to = MoneyMove.new(
+      common_params + { 
+        homie_id: params[:from_homie_id],
+        amount: BigDecimal.new(params[:amount])
+      }
+    )
+
+    MoneyMove.transaction do 
+      move_from.save!
+      move_to.save!
+    end
+  end
 end

client/src/cash/MakeMoneyMove.js

@@ -1,68 +1,92 @@
 import React, { useState, useEffect } from 'react'; 
-import { Modal, Select, TextInput, Collection, CollectionItem } from 'react-materialize';
+import {Icon, Select, TextInput, Button} from 'react-materialize';
 import './Cash.css';
 import axios from 'axios';
 
 const MakeMoneyMove = (props) => {
 
-  const [selectedFrom, setSelectedFrom] = useState(null); 
+  const [selectedFrom, setSelectedFrom] = useState(""); 
+  const [selectedTo, setSelectedTo] = useState(""); 
+  const [homiesCash, setHomiesCash] = useState([]);
+  const [amountToMove, setAmountToMove] = useState(null);
+
+  useEffect( () => { 
+    const getCashForHomies = async () => {
+      try { 
+        const cash = await axios.get(`/homies/cash`);
+        setHomiesCash(cash.data);
+      } catch (e) {
+        console.log("Error fetching", e); 
+      }
+    };
+    getCashForHomies(); 
+  }, []);
+
+  const handleAmountChange = (e) => {
+    setAmountToMove(parseFloat(e.target.value))
+  }
+
+  const homieToOptionMapper = (homieCash) => {
+    const homie = homieCash.homie;
+    return (
+    <option key={homie.id} value={homie.id}>{homie.name}</option>
+    );
+  };
+
+  const homieOptions = homiesCash.map(homieToOptionMapper);    
+  
+  const handleFromHomieChange = (e) => {
+    console.log("from homie", e.target.value);
+    setSelectedFrom(e.target.value); 
+  };
+  const filteredHomieCashes = homiesCash.filter( (homieCash) => homieCash.homie.id !== parseInt(selectedFrom) );
+  const filteredHomieOptions = filteredHomieCashes.map(homieToOptionMapper); 
+
+  const handleToHomieChange = (e) => {
+    setSelectedTo(e.target.value); 
+  }
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    console.log("Submitting");
+  }
+
+  const formComplete = () => (
+    selectedFrom !== "" && 
+    selectedFrom !== selectedTo && 
+    selectedTo !== "" &&
+    amountToMove > 0
+  );
 
 return (
-<div>
+<div className="center-align">
+   <form onSubmit={handleSubmit}>
    <h3>Make Money Move</h3>
-   <TextInput label="How Much?" />
+   <TextInput label="How Much?" type="number" 
-   <label>From: </label>
+               required pattern="^\\?(([1-9](\\d*|\\d{0,2}(,\\d{3})*))|0)(\\.\\d{1,2})?$" 
-   <Collection>
+               defaultValue={`${amountToMove}`} step="0.01" onChange={handleAmountChange} />
-     <CollectionItem>
+     <label>From: </label>
-       Alvin
+     <Select  value={selectedFrom} name="from_homie" onChange={handleFromHomieChange}>
-      </CollectionItem>
+       <option disabled value="" >Select Homie</option>
-     <CollectionItem>
+        {homieOptions}
-       Alvin
+     </Select>
-     </CollectionItem>
-     <CollectionItem>
-       Alvin
-     </CollectionItem>
-     <CollectionItem>
-       Alvin
-      </CollectionItem>
-     <CollectionItem>
-       Alvin
-      </CollectionItem>
-     <CollectionItem>
-       Alvin
-     </CollectionItem>
-     <CollectionItem>
-       Alvin
-     </CollectionItem>
-     <CollectionItem>
-       Alvin
-      </CollectionItem>
-      <CollectionItem>
-       Alvin
-      </CollectionItem>
-     <CollectionItem>
-       Alvin
-     </CollectionItem>
-     <CollectionItem>
-       Alvin
-     </CollectionItem>
-     <CollectionItem>
-       Alvin
-      </CollectionItem>
-     <CollectionItem>
-       Alvin
-      </CollectionItem>
-     <CollectionItem>
-       Alvin
-     </CollectionItem>
-     <CollectionItem>
-       Alvin
-     </CollectionItem>
-     <CollectionItem>
-       Alvin
-      </CollectionItem>
 
-    </Collection>  
+     <label>To: </label>
+     <Select  value={selectedTo} name="to_homie" onChange={handleToHomieChange}>
+        <option disabled value="">Select Homie</option>
+        {filteredHomieOptions}
+      </Select>
+      
+    
+      <div>  
+      <Button disabled={!formComplete()} waves="light">
+        Do it
+       <Icon left>
+         attach_money
+       </Icon>
+      </Button>
+      </div>
+   </form>
 </div>
 );
 

client/src/homies/Homie.js

@@ -0,0 +1,55 @@
+import React, { useState, useEffect } from 'react'; 
+import {Icon, Select, TextInput, Button} from 'react-materialize';
+import './Homie.css';
+import axios from 'axios';
+
+const Homie = (props) => {
+
+  const [homieName, setHomieName] = useState("");
+ 
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    console.log("Submitting");
+  }
+
+  const formComplete = () => (
+    selectedFrom !== "" && 
+    selectedFrom !== selectedTo && 
+    selectedTo !== "" &&
+    amountToMove > 0
+  );
+
+return (
+<div className="center-align">
+   <form onSubmit={handleSubmit}>
+   <h3>Homie Data</h3>
+   <TextInput label="Homies Name" type="text" 
+               required defaultValue="" onChange={handleNameChange} />
+     <label>From: </label>
+     <Select  value={selectedFrom} name="from_homie" onChange={handleFromHomieChange}>
+       <option disabled value="" >Select Homie</option>
+        {homieOptions}
+     </Select>
+
+     <label>To: </label>
+     <Select  value={selectedTo} name="to_homie" onChange={handleToHomieChange}>
+        <option disabled value="">Select Homie</option>
+        {filteredHomieOptions}
+      </Select>
+      
+    
+      <div>  
+      <Button disabled={!formComplete()} waves="light">
+        Do it
+       <Icon left>
+         attach_money
+       </Icon>
+      </Button>
+      </div>
+   </form>
+</div>
+);
+
+}
+
+export default Homie;

config/database.yml

@@ -23,7 +23,7 @@ default: &default
 
 development:
   <<: *default
-  username: "docker"
+  username: "postgres"
   password: "docker"
   host: localhost 
   port: 5432

db/migrate/20190620200006_create_money_moves.rb

@@ -3,8 +3,7 @@ class CreateMoneyMoves < ActiveRecord::Migration[5.2]
     create_table :money_moves do |t|
       t.text :description
       t.decimal :amount, precision: 12, scale: 3
-      t.integer :from_homie_id, null: false
+      t.integer :homie_id, null: false
-      t.integer :to_homie_id, null: false 
       t.timestamps
     end
   end

db/schema.rb

@@ -26,8 +26,7 @@ ActiveRecord::Schema.define(version: 2019_06_20_200006) do
   create_table "money_moves", force: :cascade do |t|
     t.text "description"
     t.decimal "amount", precision: 12, scale: 3
-    t.integer "from_homie_id", null: false
+    t.integer "homie_id", null: false
-    t.integer "to_homie_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end

db/seeds.rb

@@ -5,3 +5,5 @@
 #
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
+#
+#