Merge branch 'master' into hkarakus/codecov_ba_demo

.github/workflows/run_codecov_on_pull_request.yml

@@ -1,6 +1,11 @@
 name: codecov.yml
 # Run Codecov on PR open or change
-on: pull_request
+on: 
+  push:
+    branches:
+      - master
+  pull_request:
+
 jobs:
   codecov:
     runs-on: ubuntu-20.04
@@ -16,8 +21,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: "18"
-
-      - name: Run React tests
+# Need to run "npm run build" command for bundle analysis: https://docs.codecov.com/docs/webpack-quick-start
+      - name: Build React and run tests
         env:
             CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |

auto-deploy.exclude

@@ -6,7 +6,5 @@ laravel
 tda
 postgres
 crons-python
-ruby-on-rails 
-# ^ see https://github.com/sentry-demos/empower/issues/439
 next
 # ^ uses Vercel automation

ruby-on-rails/Gemfile

@@ -30,4 +30,3 @@ group :development do
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
 end
-

ruby-on-rails/app/controllers/api/v1/products_controller.rb

@@ -12,12 +12,14 @@ def index
     span_products_db.finish
 
     # n+1 to db if done this way
-    products.each do |prod_slow|
+    products = products.map do |prod|
       span_products_slow_db = transaction.start_child(op: "custom.reviews_slow_db_call")
-      prod_slow["pg_sleep"] = ""
-      prod_slow["reviews"] = []
-      prod_slow["reviews"] = Reviews.select("id, productid, rating, customerid, description, created, Null as pg_sleep").where("productid="+prod_slow.id.to_s).to_a
+      prod_attrs = prod.attributes
+      prod_attrs["pg_sleep"] = ""
+      prod_attrs["reviews"] = []
+      prod_attrs["reviews"] = Reviews.select("id, productid, rating, customerid, description, created, Null as pg_sleep").where("productid="+prod.id.to_s).as_json
       span_products_slow_db.finish
+      prod_attrs
     end
 
     # fewer db calls this way -- done in products-join

ruby-on-rails/build.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bundle install
+# nothing to do