updater fix

empirical-org · Oct 6, 2017 · e4335c6 · e4335c6
1 parent c8d183e
commit e4335c6
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 60 deletions.
diff --git a/app/services/units/updater.rb b/app/services/units/updater.rb
@@ -19,7 +19,7 @@ def self.assign_unit_template_to_one_class(unit_id, classrooms_data, unit_templa
   end
 
   def self.fast_assign_unit_template(teacher_id, unit_template, unit_id)
-    activities_data = unit_template.activities.select('activity_id AS id, NULL as due_date').distinct
+    activities_data = unit_template.activities.select('activities.id AS id, NULL as due_date')
     classrooms_data = Classroom.where(teacher_id: teacher_id).ids.map{|id| {id: id, student_ids: [], assign_on_join: true}}
     self.update_helper(unit_id, activities_data, classrooms_data)
   end

diff --git a/db/structure.sql b/db/structure.sql
@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.6.1
--- Dumped by pg_dump version 9.6.1
+-- Dumped from database version 9.6.4
+-- Dumped by pg_dump version 9.6.4
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -1498,63 +1498,6 @@ CREATE SEQUENCE units_id_seq
 ALTER SEQUENCE units_id_seq OWNED BY units.id;
 
 
---
--- Name: users; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE users (
-    id integer NOT NULL,
-    name character varying(255),
-    email character varying(255),
-    password_digest character varying(255),
-    role character varying(255) DEFAULT 'user'::character varying,
-    created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL,
-    classcode character varying(255),
-    active boolean DEFAULT false,
-    username character varying(255),
-    token character varying(255),
-    ip_address inet,
-    clever_id character varying(255),
-    signed_up_with_google boolean DEFAULT false,
-    send_newsletter boolean DEFAULT false,
-    flag character varying,
-    google_id character varying,
-    last_sign_in timestamp without time zone
-);
-
-
---
--- Name: untitled_materialized_view; Type: MATERIALIZED VIEW; Schema: public; Owner: -
---
-
-CREATE MATERIALIZED VIEW untitled_materialized_view AS
- SELECT ((sum(a.total_students) / sum(b.total_students)) * (( SELECT count(DISTINCT s.id) AS students
-           FROM ((((((users t
-             LEFT JOIN ip_locations ON ((ip_locations.user_id = t.id)))
-             LEFT JOIN classrooms ON ((t.id = classrooms.teacher_id)))
-             LEFT JOIN users s ON (((classrooms.code)::text = (s.classcode)::text)))
-             LEFT JOIN activity_sessions ON ((s.id = activity_sessions.user_id)))
-             LEFT JOIN schools_users ON ((t.id = schools_users.user_id)))
-             LEFT JOIN schools ON ((schools_users.school_id = schools.id)))
-          WHERE (((activity_sessions.state)::text = 'finished'::text) AND (activity_sessions.completed_at < date_trunc('DAY'::text, (('now'::text)::date - '1 year'::interval))) AND ((ip_locations.country IS NULL) OR ((ip_locations.country)::text = 'United States'::text)))))::numeric)
-   FROM ( SELECT count(DISTINCT students.id) AS total_students
-           FROM ((((schools s
-             JOIN schools_users ON ((schools_users.school_id = s.id)))
-             JOIN users teacher ON ((schools_users.user_id = teacher.id)))
-             JOIN classrooms ON ((teacher.id = classrooms.teacher_id)))
-             JOIN users students ON (((students.classcode)::text = (classrooms.code)::text)))
-          WHERE ((schools_users.school_id IS NOT NULL) AND (s.free_lunches >= 40))) a,
-    ( SELECT count(DISTINCT students.id) AS total_students
-           FROM ((((schools s
-             JOIN schools_users ON ((schools_users.school_id = s.id)))
-             JOIN users teacher ON ((schools_users.user_id = teacher.id)))
-             JOIN classrooms ON ((teacher.id = classrooms.teacher_id)))
-             JOIN users students ON (((students.classcode)::text = (classrooms.code)::text)))
-          WHERE (schools_users.school_id IS NOT NULL)) b
-  WITH NO DATA;
-
-
 --
 -- Name: user_milestones; Type: TABLE; Schema: public; Owner: -
 --
@@ -1619,6 +1562,32 @@ CREATE SEQUENCE user_subscriptions_id_seq
 ALTER SEQUENCE user_subscriptions_id_seq OWNED BY user_subscriptions.id;
 
 
+--
+-- Name: users; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE users (
+    id integer NOT NULL,
+    name character varying(255),
+    email character varying(255),
+    password_digest character varying(255),
+    role character varying(255) DEFAULT 'user'::character varying,
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL,
+    classcode character varying(255),
+    active boolean DEFAULT false,
+    username character varying(255),
+    token character varying(255),
+    ip_address inet,
+    clever_id character varying(255),
+    signed_up_with_google boolean DEFAULT false,
+    send_newsletter boolean DEFAULT false,
+    flag character varying,
+    google_id character varying,
+    last_sign_in timestamp without time zone
+);
+
+
 --
 -- Name: users_id_seq; Type: SEQUENCE; Schema: public; Owner: -
 --
@@ -3389,5 +3358,19 @@ INSERT INTO schema_migrations (version) VALUES ('20170920133317');
 
 INSERT INTO schema_migrations (version) VALUES ('20170920211610');
 
+INSERT INTO schema_migrations (version) VALUES ('20170927213514');
+
 INSERT INTO schema_migrations (version) VALUES ('20170928203242');
 
+INSERT INTO schema_migrations (version) VALUES ('20171005193104');
+
+INSERT INTO schema_migrations (version) VALUES ('20171005210006');
+
+INSERT INTO schema_migrations (version) VALUES ('20171005211221');
+
+INSERT INTO schema_migrations (version) VALUES ('20171005214127');
+
+INSERT INTO schema_migrations (version) VALUES ('20171006150857');
+
+INSERT INTO schema_migrations (version) VALUES ('20171006151454');
+