Merge pull request #8 from 00198216/Hotfix

Hotfix

Gemfile

@@ -11,7 +11,7 @@ gem 'puma', '~> 4.1'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.7'
 # Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 4.0'
+gem 'redis', '~> 4.0'
 # Use Active Model has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 

Gemfile.lock

@@ -129,6 +129,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rake (13.0.1)
+    redis (4.2.1)
     sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -162,6 +163,7 @@ DEPENDENCIES
   puma (~> 4.1)
   rails (~> 6.0.2, >= 6.0.2.2)
   rails_12factor
+  redis (~> 4.0)
   sqlite3 (~> 1.4)
   tzinfo-data
 

app/channels/list_channel.rb

@@ -13,25 +13,33 @@ def unsubscribed
   def message(data)
     @num=data['id'].to_i
     @user=User.find(@num)
-    @all= @user.lists
-    @message=
+    @all= List.all
+    @message= 
+     # Jbuilder.encode  do |json|
+     #  json.info @user, :id
+     # 
       Jbuilder.encode  do |json|
       json.info @all do |list|  
       json.id list.id
-      json.name list.name
-      json.creation list.created_at
+       json.name list.name
+       json.creation list.created_at
+       json.users list.users do |user|
+       json.user_id user.id
+       json.username user.username
+       end
       json.products list.products do |product|
       json.product_id product.id
       json.product_name product.name
       @help= @association= ListProduct.find_by(
-          list_id: list.id,
-          product_id: product.id)
-      json.product_quantity @help.quantity
-      json.product_descripcion @help.description
-      json.product_status @help.checked
+         list_id: list.id,
+         product_id: product.id)
+       json.product_quantity @help.quantity
+       json.product_descripcion @help.description
+       json.product_status @help.checked
       end
-  end
-end
+
+   end
+ end
   ActionCable.server.broadcast 'super_channel', message: @message
   end
 

app/controllers/api/v1/listproducts_controller.rb

@@ -17,13 +17,17 @@ def destroy
         @List.update_attribute(:quantity, @List.quantity)
          render json: { message: "Product succesfully removed from list" }, status: 200
          @User = @current_user
-         @all= @User.lists
+         @all= List.all
          @message=
            Jbuilder.encode  do |json|
            json.info @all do |list|  
            json.id list.id
            json.name list.name
            json.creation list.created_at
+           json.users list.users do |user|
+             json.user_id user.id
+             json.username user.username
+             end
            json.products list.products do |product|
            json.product_id product.id
            json.product_name product.name
@@ -32,7 +36,7 @@ def destroy
                product_id: product.id)
            json.product_quantity @help.quantity
            json.product_descripcion @help.description
-           json.product_status @help.checked
+            json.product_status @help.checked
            end
        end
      end
@@ -57,13 +61,17 @@ def add
       @lists=List.all
       @products=@List.products
       @User = @current_user
-      @all= @User.lists
+      @all= List.all
       @message=
         Jbuilder.encode  do |json|
         json.info @all do |list|  
         json.id list.id
         json.name list.name
         json.creation list.created_at
+        json.users list.users do |user|
+          json.user_id user.id
+          json.username user.username
+          end
         json.products list.products do |product|
         json.product_id product.id
         json.product_name product.name
@@ -72,7 +80,7 @@ def add
             product_id: product.id)
         json.product_quantity @help.quantity
         json.product_descripcion @help.description
-        json.product_status @help.checked
+         json.product_status @help.checked
         end
     end
   end
@@ -91,13 +99,17 @@ def update
         @association.update_attribute(:description, params[:description])
         render json: {status: "product quantity updated"}, status: 201
         @User = @current_user
-        @all= @User.lists
+        @all= List.all
         @message=
           Jbuilder.encode  do |json|
           json.info @all do |list|  
           json.id list.id
           json.name list.name
           json.creation list.created_at
+          json.users list.users do |user|
+            json.user_id user.id
+            json.username user.username
+            end
           json.products list.products do |product|
           json.product_id product.id
           json.product_name product.name
@@ -129,13 +141,17 @@ def check
       @association.update_attribute(:checked, false)
       render json: {status: "delisted product"}, status: 201
       @User = @current_user
-      @all= @User.lists
+      @all= List.all
       @message=
         Jbuilder.encode  do |json|
         json.info @all do |list|  
         json.id list.id
         json.name list.name
         json.creation list.created_at
+        json.users list.users do |user|
+          json.user_id user.id
+          json.username user.username
+          end
         json.products list.products do |product|
         json.product_id product.id
         json.product_name product.name
@@ -153,13 +169,17 @@ def check
       @association.update_attribute(:checked, true)
       render json: {status: "listed product"}, status: 201
       @User = @current_user
-      @all= @User.lists
+      @all= List.all
       @message=
         Jbuilder.encode  do |json|
         json.info @all do |list|  
         json.id list.id
         json.name list.name
         json.creation list.created_at
+        json.users list.users do |user|
+          json.user_id user.id
+          json.username user.username
+          end
         json.products list.products do |product|
         json.product_id product.id
         json.product_name product.name

app/controllers/api/v1/lists_controller.rb

@@ -20,13 +20,17 @@ def create
     if @list.save
       render json: {status: "List created successfully"}, status: 201
       @User = @current_user
-      @all= @User.lists
+      @all= List.all
       @message=
         Jbuilder.encode  do |json|
         json.info @all do |list|  
         json.id list.id
         json.name list.name
         json.creation list.created_at
+        json.users list.users do |user|
+          json.user_id user.id
+          json.username user.username
+          end
         json.products list.products do |product|
         json.product_id product.id
         json.product_name product.name
@@ -35,7 +39,7 @@ def create
             product_id: product.id)
         json.product_quantity @help.quantity
         json.product_descripcion @help.description
-        json.product_status @help.checked
+         json.product_status @help.checked
         end
     end
   end
@@ -53,13 +57,17 @@ def update
       if @List.update(list_params)
         render json: {status: "list updated"}, status: 201
         @User = @current_user
-        @all= @User.lists
+        @all= List.all
         @message=
           Jbuilder.encode  do |json|
           json.info @all do |list|  
           json.id list.id
           json.name list.name
           json.creation list.created_at
+          json.users list.users do |user|
+            json.user_id user.id
+            json.username user.username
+            end
           json.products list.products do |product|
           json.product_id product.id
           json.product_name product.name
@@ -68,7 +76,7 @@ def update
               product_id: product.id)
           json.product_quantity @help.quantity
           json.product_descripcion @help.description
-          json.product_status @help.checked
+           json.product_status @help.checked
           end
       end
     end
@@ -98,13 +106,17 @@ def destroy
     if @List.destroy
       render json: { message: "List Successfully Deleted." }, status: 200
       @User = @current_user
-      @all= @User.lists
+      @all= List.all
       @message=
         Jbuilder.encode  do |json|
         json.info @all do |list|  
         json.id list.id
         json.name list.name
         json.creation list.created_at
+        json.users list.users do |user|
+          json.user_id user.id
+          json.username user.username
+          end
         json.products list.products do |product|
         json.product_id product.id
         json.product_name product.name
@@ -113,7 +125,7 @@ def destroy
             product_id: product.id)
         json.product_quantity @help.quantity
         json.product_descripcion @help.description
-        json.product_status @help.checked
+         json.product_status @help.checked
         end
     end
   end

app/controllers/api/v1/listusers_controller.rb

@@ -15,7 +15,7 @@ def destroy
         render json: {status: "deleted friend drom the list successfully"}, status: 201
     end
 
-    #Agrega un usuario de una lista
+    #Agrega un usuario a una lista
     def add
       @user = User.find_by(id: params[:id])
       @List= List.find_by(name: params[:name])
@@ -24,13 +24,17 @@ def add
       @lists=List.all
       @products=@List.products
       @User = @user
-      @all= @User.lists
+      @all= List.all
       @message=
         Jbuilder.encode  do |json|
         json.info @all do |list|  
         json.id list.id
         json.name list.name
         json.creation list.created_at
+        json.users list.users do |user|
+          json.user_id user.id
+          json.username user.username
+          end
         json.products list.products do |product|
         json.product_id product.id
         json.product_name product.name

app/controllers/api/v1/users_controller.rb

@@ -48,7 +48,7 @@ def show
       #Mostrar las listas de un usuario
       def lists
         @user = User.find_by(id: params[:id])
-
+        @all= @user.lists
       end
 
       #Buscar un usuario

app/views/api/v1/users/lists.json.jbuilder

@@ -1,3 +1,21 @@
-@list=@user.lists
 
-json.lists  @list, :id, :name, :products
+
+json.info @all do |list|  
+    json.id list.id
+    json.name list.name
+    json.creation list.created_at
+    json.users list.users do |user|
+      json.user_id user.id
+      json.username user.username
+      end
+    json.products list.products do |product|
+    json.product_id product.id
+    json.product_name product.name
+    @help= @association= ListProduct.find_by(
+        list_id: list.id,
+        product_id: product.id)
+    json.product_quantity @help.quantity
+    json.product_descripcion @help.description
+     json.product_status @help.checked
+    end
+end

config/cable.yml

@@ -4,6 +4,11 @@ development:
 test:
   adapter: test
 
+# production:
+#  adapter: postgresql
+#  channel_prefix: proyect_production
+
 production:
-  adapter: postgresql
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
   channel_prefix: proyect_production