add to routine from brands

app/controllers/api/v1/active_ingredients_controller.rb

@@ -0,0 +1,6 @@
+class Api::V1::ActiveIngredientsController < ApplicationController
+
+    def index 
+        render json: ActiveIngredient.all 
+    end 
+end

app/controllers/api/v1/list_products_controller.rb

@@ -1,22 +1,20 @@
 class Api::V1::ListProductsController < ApplicationController
     def create 
         # byebug
-        brand = Brand.find_or_create_by(name: params[:brand])
-        product = Product.find_or_create_by(name: params[:product_name], brand_id: brand.id, product_type: params[:product_type])
-        list = List.find_or_create_by(user_id: params[:id])
-        list_product = ListProduct.find_or_create_by(product_id: product.id, list_id: list.id)
-        # byebug
+        list = List.find_or_create_by(user_id: params[:user_id])
+        list_product = ListProduct.find_or_create_by(list_id: list.id, product_id: params[:product_id], purchased: false)
+        # # byebug
         render json: list_product
     end 
 
     def index 
-        list_products = ListProduct.find_by(list_id: params[:list_id])
+        list_products = Product.find_by(id: params[:product_id])
         render json: list_products
     end 
 
     def destroy 
         # byebug
-        list_product = ListProduct.find_by(product_id: params[:id])
+        list_product = ListProduct.find(params[:id])
         # byebug
         list_product.destroy
 # listProduct.destroy(params[:id])

app/controllers/api/v1/products_controller.rb

@@ -1,7 +1,6 @@
 class Api::V1::ProductsController < ApplicationController
 
     def create 
-
         brand = Brand.find_or_create_by(params[:brand_name])
         product = Product.create(params)
         render json: product 

app/controllers/api/v1/routine_products_controller.rb

@@ -4,8 +4,9 @@ def create
         # byebug
         brand = Brand.find_or_create_by(name: params[:brand])
         product = Product.find_or_create_by(name: params[:product_name], brand_id: brand.id, product_type: params[:product_type])
-        active_ingredients = params[:active_ingredients].split(",").map{|ingredient|ActiveIngredient.find_or_create_by(product_id: product.id, name: ingredient).id}
+        active_ingredients = params[:active_ingredients] ? params[:active_ingredients].split(",").map{|ingredient|ActiveIngredient.find_or_create_by(product_id: product.id, name: ingredient).id} : nil
         routine = Routine.find_or_create_by(routine_type: params[:routine], user_id: params[:id])
+        # byebug
         routine_product = RoutineProduct.find_or_create_by(product_id: product.id, routine_id: routine.id)
         # byebug
         render json: routine_product

app/models/active_ingredient.rb

@@ -1,3 +1,5 @@
 class ActiveIngredient < ApplicationRecord
   belongs_to :product
+
+
 end

app/models/routine_product.rb

@@ -2,4 +2,5 @@ class RoutineProduct < ApplicationRecord
   belongs_to :product
   belongs_to :routine
   has_many :comments
+  has_many :active_ingredients, through: :product
 end

app/models/user.rb

@@ -11,6 +11,7 @@ class User < ApplicationRecord
     has_many :lists
     has_many :list_products, through: :lists
 
+
     def morning_products
        routine_products ? routine_products.select{|rp| rp.routine.routine_type == "am"}.map{|rp| rp.product} : null
     end

app/serializers/active_ingredients_serializer.rb

@@ -0,0 +1,5 @@
+class ActiveIngredientSerializer < ActiveModel::Serializer
+  attributes :id, :name
+  belongs_to :product
+  belongs_to :routine_product, through: :product
+end

app/serializers/list_product_serializer.rb

@@ -1,3 +1,3 @@
 class ListProductSerializer < ActiveModel::Serializer
-  attributes :id, :list_id, :product_id
+  attributes :id, :list_id, :product_id, :purchased
 end

app/serializers/product_serializer.rb

@@ -1,4 +1,5 @@
 class ProductSerializer < ActiveModel::Serializer
-  attributes :id, :name, :brand_id, :product_type
+  attributes :id, :name, :brand_id, :product_type, :active_ingredients
   has_many :routine_products
+  has_many :active_ingredients
 end

app/serializers/routine_product_serializer.rb

@@ -1,5 +1,6 @@
 class RoutineProductSerializer < ActiveModel::Serializer
-  attributes :id, :product_id, :routine_id
+  attributes :id, :product_id, :routine_id, :active_ingredients
   belongs_to :product
   has_many :comments
+  has_many :active_ingredients, through: :products
 end

app/serializers/user_serializer.rb

@@ -7,6 +7,7 @@ class UserSerializer < ActiveModel::Serializer
   has_many :entries, through: :diaries 
   has_many :lists
   has_many :list_products, through: :lists
+
   # has_many :comments, through: :routines
 
 

config/routes.rb

@@ -11,6 +11,7 @@
           resources :comments 
           resources :products
           resources :entries
+          resources :active_ingredients
 
           post "/signup", to: "users#create"
           post '/login', to: 'authentication#create'

db/seeds.rb

@@ -5,15 +5,16 @@
 #
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
-Diary.destroy_all 
+RoutineProduct.destroy_all
+ListProduct.destroy_all
+ActiveIngredient.destroy_all 
 Entry.destroy_all 
+Diary.destroy_all 
 Comment.destroy_all
 Routine.destroy_all 
 Product.destroy_all 
-RoutineProduct.destroy_all
 List.destroy_all
 User.destroy_all 
-ActiveIngredient.destroy_all 
 Brand.destroy_all 
 
 

test/controllers/active_ingredients_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ActiveIngredientsControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/controllers/api/v1/active_ingredients_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class Api::V1::ActiveIngredientsControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end