Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add teacher details directly to the users table #5303

Merged
merged 2 commits into from
Apr 18, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Rename users to raw_users. Also tidy up some comments and indices
Jon Betts committed Apr 18, 2023
commit 43502122a4b822d23f5fabfb903caaf04d465c9b
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
DROP MATERIALIZED VIEW IF EXISTS report.raw_users CASCADE;

-- The building blocks of a user. We won't export this. See
-- `*_entities_decorated/*_users` for the version for external consumers.
CREATE MATERIALIZED VIEW report.raw_users AS (
SELECT
id,
username,
registered_date::date
FROM h.user AS users
WHERE
users.authority = '{{ region.authority }}'
-- users.authority = 'lms.hypothes.is'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left from testing?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've left these in permanently as they are kind of handy when copy pasting things into Metabase to test

ORDER BY registered_date
) WITH NO DATA;
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
DROP INDEX IF EXISTS report.raw_users_id_idx;

REFRESH MATERIALIZED VIEW report.raw_users;

ANALYSE report.raw_users;

-- A unique index is mandatory for concurrent updates used in the refresh
CREATE UNIQUE INDEX raw_users_id_idx ON report.raw_users (id);

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ DROP MATERIALIZED VIEW IF EXISTS report.user_map CASCADE;
CREATE MATERIALIZED VIEW report.user_map AS (
SELECT
lms_users.id AS lms_user_id,
users.id AS user_id,
raw_users.id AS user_id,
application_instances.organization_id
FROM "user" AS lms_users
JOIN report.users ON
users.username = SUBSTRING(SPLIT_PART(lms_users.h_userid, '@', 1), 6)
JOIN report.raw_users ON
raw_users.username = SUBSTRING(SPLIT_PART(lms_users.h_userid, '@', 1), 6)
JOIN application_instances ON
lms_users.application_instance_id = application_instances.id
ORDER BY lms_user_id, user_id
4 changes: 2 additions & 2 deletions lms/data_tasks/report/refresh/01_entities_refresh.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
REFRESH MATERIALIZED VIEW CONCURRENTLY report.users;
ANALYSE report.users;
REFRESH MATERIALIZED VIEW CONCURRENTLY report.raw_users;
ANALYSE report.raw_users;

REFRESH MATERIALIZED VIEW CONCURRENTLY report.user_map;
ANALYSE report.user_map;