Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
90cec3e
add renderings table. Move gateway to walangmeta. Rename some proper…
wkelly17 Mar 6, 2024
fe8ab5d
adjust makefile dump back to what it should be
wkelly17 Mar 6, 2024
a67b308
make runnable locally, add dev bus string
Mar 20, 2024
8f7c4f5
adjusted the logic for creating content row if not present while upda…
wkelly17 Mar 26, 2024
9d38750
add a view for getting source zips from wacs
wkelly17 Mar 26, 2024
afea3a4
add a localization table and cron trigger
wkelly17 Apr 3, 2024
17877f5
New translations en.ts (French)
danparisd Apr 24, 2024
3f43a24
New translations en.ts (Arabic)
danparisd Apr 24, 2024
7fd9061
New translations en.ts (Russian)
danparisd Apr 24, 2024
b29fe86
New translations en.ts (Chinese Simplified)
danparisd Apr 24, 2024
7f9498d
New translations en.ts (Urdu (Pakistan))
danparisd Apr 24, 2024
a6ea62b
New translations en.ts (Vietnamese)
danparisd Apr 24, 2024
aea6193
New translations en.ts (Portuguese, Brazilian)
danparisd Apr 24, 2024
1e3b8af
New translations en.ts (Indonesian)
danparisd Apr 24, 2024
b6cf937
New translations en.ts (Telugu)
danparisd Apr 24, 2024
4b5d9c4
New translations en.ts (Burmese)
danparisd Apr 24, 2024
1e5e48f
New translations en.ts (Swahili)
danparisd Apr 24, 2024
6678e85
New translations en.ts (Cebuano)
danparisd Apr 24, 2024
ea6db59
New translations en.ts (Spanish, Latin America)
danparisd Apr 24, 2024
dd815d2
New translations es.ts (French)
danparisd Apr 24, 2024
cd815e2
New translations es.ts (Arabic)
danparisd Apr 24, 2024
85d02f3
New translations es.ts (Russian)
danparisd Apr 24, 2024
8ea48dc
New translations es.ts (Chinese Simplified)
danparisd Apr 24, 2024
ba01d21
New translations es.ts (Urdu (Pakistan))
danparisd Apr 24, 2024
95e9d1d
New translations es.ts (Vietnamese)
danparisd Apr 24, 2024
3d3b849
New translations es.ts (Portuguese, Brazilian)
danparisd Apr 24, 2024
a1bcd1a
New translations es.ts (Indonesian)
danparisd Apr 24, 2024
ab2f335
New translations es.ts (Telugu)
danparisd Apr 24, 2024
95939ef
New translations es.ts (Burmese)
danparisd Apr 24, 2024
f1a63d7
New translations es.ts (Swahili)
danparisd Apr 24, 2024
30e64a1
New translations es.ts (Cebuano)
danparisd Apr 24, 2024
ddb1f11
New translations es.ts (Spanish, Latin America)
danparisd Apr 24, 2024
11d1dbf
New translations index.ts (French)
danparisd Apr 24, 2024
75793fe
New translations index.ts (Arabic)
danparisd Apr 24, 2024
e9e6f25
New translations index.ts (Russian)
danparisd Apr 24, 2024
8abe3d2
New translations index.ts (Chinese Simplified)
danparisd Apr 24, 2024
83951b5
New translations index.ts (Urdu (Pakistan))
danparisd Apr 24, 2024
299d536
New translations index.ts (Vietnamese)
danparisd Apr 24, 2024
7f595e8
New translations index.ts (Portuguese, Brazilian)
danparisd Apr 24, 2024
e20e3ae
New translations index.ts (Indonesian)
danparisd Apr 24, 2024
a3ef6dd
New translations index.ts (Telugu)
danparisd Apr 24, 2024
861606d
New translations index.ts (Burmese)
danparisd Apr 24, 2024
37636d7
New translations index.ts (Swahili)
danparisd Apr 24, 2024
577748d
New translations index.ts (Cebuano)
danparisd Apr 24, 2024
fc75b8c
New translations index.ts (Spanish, Latin America)
danparisd Apr 24, 2024
104a777
New translations en.ts (French)
danparisd Apr 24, 2024
0b991d2
New translations en.ts (Arabic)
danparisd Apr 24, 2024
12ff506
New translations en.ts (Russian)
danparisd Apr 24, 2024
423d6c9
New translations en.ts (Chinese Simplified)
danparisd Apr 24, 2024
3cc07af
New translations en.ts (Urdu (Pakistan))
danparisd Apr 24, 2024
b9e97b7
New translations en.ts (Vietnamese)
danparisd Apr 24, 2024
dcf6354
New translations en.ts (Portuguese, Brazilian)
danparisd Apr 24, 2024
ce211fd
New translations en.ts (Indonesian)
danparisd Apr 24, 2024
7a9419d
New translations en.ts (Telugu)
danparisd Apr 24, 2024
305e493
New translations en.ts (Burmese)
danparisd Apr 24, 2024
c2ae60c
New translations en.ts (Swahili)
danparisd Apr 24, 2024
b4724a7
New translations en.ts (Cebuano)
danparisd Apr 24, 2024
35e8da9
New translations en.ts (Spanish, Latin America)
danparisd Apr 24, 2024
480d744
New translations en.ts (French)
danparisd Apr 24, 2024
3862207
New translations en.ts (Arabic)
danparisd Apr 24, 2024
a53e394
New translations en.ts (Russian)
danparisd Apr 24, 2024
689bb43
New translations en.ts (Chinese Simplified)
danparisd Apr 24, 2024
369075a
New translations en.ts (Urdu (Pakistan))
danparisd Apr 24, 2024
0163e79
New translations en.ts (Vietnamese)
danparisd Apr 24, 2024
508cf14
New translations en.ts (Portuguese, Brazilian)
danparisd Apr 24, 2024
723e3ca
New translations en.ts (Indonesian)
danparisd Apr 24, 2024
09d519c
New translations en.ts (Telugu)
danparisd Apr 24, 2024
479dfdd
New translations en.ts (Burmese)
danparisd Apr 24, 2024
3eb3425
New translations en.ts (Swahili)
danparisd Apr 24, 2024
fde0e47
New translations en.ts (Cebuano)
danparisd Apr 24, 2024
7edffdd
New translations en.ts (Spanish, Latin America)
danparisd Apr 24, 2024
1ef5711
New translations en.ts (Spanish, Latin America)
danparisd Apr 24, 2024
7f06e1d
New translations en.ts (Arabic)
danparisd Apr 24, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/controller-deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jobs:
env:
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
DATABASE_URL: "op://AppDev Scripture Accessibility/languageapi-dev/connection string"
BUS_CONN: "op://AppDev Scripture Accessibility/languageapi-bus-con/dev/conn_string"
- name: "Load PNPM"
uses: pnpm/action-setup@v2
with:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ hasura/seeds/languageapi/data_dump.sql
data_dump.sql
proj_notes.md
mise.toml
.tool-versions
.tool-versions
launch.json
6 changes: 6 additions & 0 deletions controller/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
WORKDIR /home/site/wwwroot
COPY . .


RUN apt-get update && \
apt-get install -y postgresql-client && \
rm -rf /var/lib/apt/lists/*


ARG DATABASE_URL
# I have no clue why, but when I included azure core tools as part of the controller dependencies using the core tools node package, the func command reliably broke, but not when installed globally
# Enable `pnpm add --global` on Alpine Linux by setting
Expand Down
49 changes: 49 additions & 0 deletions controller/drizzle/0015_outgoing_the_anarchist.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@

-- REMOVE OLD CONSTRAINTS
ALTER TABLE "languages_to_languages" DROP CONSTRAINT "languages_to_languages_gateway_language_ietf_language_ietf_code";
--> statement-breakpoint

ALTER TABLE "languages_to_languages" DROP CONSTRAINT "languages_to_languages_gateway_language_to_ietf_language_ietf_c";
--> statement-breakpoint

ALTER TABLE "languages_to_languages" DROP CONSTRAINT "languages_to_languages_gateway_language_ietf_gateway_language_t";
--> statement-breakpoint

ALTER TABLE "connected_content" DROP CONSTRAINT "connected_content_content_id_1_content_id_2";--> statement-breakpoint
ALTER TABLE "country_to_language" DROP CONSTRAINT "country_to_language_language_ietf_code_country_alpha_2";--> statement-breakpoint
ALTER TABLE "connected_content" ADD CONSTRAINT "connected_content_pkey" PRIMARY KEY("content_id_1","content_id_2");--> statement-breakpoint
ALTER TABLE "country_to_language" ADD CONSTRAINT "country_to_language_pkey" PRIMARY KEY("language_ietf_code","country_alpha_2");--> statement-breakpoint


-- RENAME TABLE
ALTER TABLE IF EXISTS "languages_to_languages" RENAME TO "gateway_language_to_dependent_language";
--> statement-breakpoint

-- RENAME COLUMN
ALTER TABLE "gateway_language_to_dependent_language" RENAME COLUMN "gateway_language_to_ietf" TO "dependent_language_ietf";
--> statement-breakpoint





-- ADD NEW CONSTRAINTS
-- primary
ALTER TABLE "gateway_language_to_dependent_language" ADD CONSTRAINT "gateway_dependent_pkey" PRIMARY KEY("gateway_language_ietf","dependent_language_ietf");
--> statement-breakpoint

-- foreign
DO $$ BEGIN
ALTER TABLE "gateway_language_to_dependent_language" ADD CONSTRAINT "gl_glietf_language_ietf_code_fk" FOREIGN KEY ("gateway_language_ietf") REFERENCES "language"("ietf_code") ON DELETE cascade ON UPDATE cascade;
EXCEPTION
WHEN duplicate_object THEN null;
END $$;
--> statement-breakpoint

-- foreign
DO $$ BEGIN
ALTER TABLE "gateway_language_to_dependent_language" ADD CONSTRAINT "gl_dependent_ietf_language_ietf_code_fk" FOREIGN KEY ("dependent_language_ietf") REFERENCES "language"("ietf_code") ON DELETE cascade ON UPDATE cascade;
EXCEPTION
WHEN duplicate_object THEN null;
END $$;
--> statement-breakpoint
5 changes: 5 additions & 0 deletions controller/drizzle/0016_sudden_jocasta.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ALTER TABLE "scriptural_rendering_metadata" ALTER COLUMN "book_name" DROP NOT NULL;--> statement-breakpoint
ALTER TABLE "scriptural_rendering_metadata" ALTER COLUMN "chapter" DROP NOT NULL;--> statement-breakpoint
ALTER TABLE "scriptural_rendering_metadata" ADD COLUMN "is_whole_chapter" boolean NOT NULL;--> statement-breakpoint
ALTER TABLE "scriptural_rendering_metadata" ADD COLUMN "is_whole_book" boolean NOT NULL;--> statement-breakpoint
ALTER TABLE "scriptural_rendering_metadata" ADD COLUMN "is_whole_project" boolean NOT NULL;
2 changes: 2 additions & 0 deletions controller/drizzle/0017_fat_loa.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE "wa_language_meta" ADD COLUMN "is_gateway" boolean NOT NULL;--> statement-breakpoint
ALTER TABLE "rendering" ADD COLUMN "hash" varchar;
31 changes: 31 additions & 0 deletions controller/drizzle/0018_dry_professor_monster.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
-- Custom SQL migration file, put you code below! --
-- Custom SQL migration file, put your code below! --
-- View: public.vw_langnames

CREATE OR REPLACE VIEW public.vw_langnames
AS
SELECT language.ietf_code AS lc,
language.national_name AS ln,
language.english_name AS ang,
language.direction AS ld,
CASE
WHEN (
EXISTS (
SELECT 1 FROM wa_language_meta WHERE wa_language_meta.ietf_code = language.ietf_code AND wa_language_meta.is_gateway
)
) THEN true
ELSE false
END AS gw,
array_agg(DISTINCT country_cc.alpha_2) AS cc,
array_remove(array_agg(DISTINCT language_alternate_name.name), NULL::text) AS alt,
language.home_country_alpha2 AS hc,
world_region.region AS lr,
1 AS pk
FROM language
LEFT JOIN country_to_language ON language.ietf_code::text = country_to_language.language_ietf_code::text
LEFT JOIN country AS country_cc ON country_to_language.country_alpha_2::text = country_cc.alpha_2::text
LEFT JOIN country AS country_hc ON language.home_country_alpha2::text = country_hc.alpha_2::text
LEFT JOIN language_alternate_name ON language.ietf_code::text = language_alternate_name.ietf_code::text
LEFT JOIN world_region ON country_hc.world_region_id = world_region.id
LEFT JOIN wa_language_meta on language.ietf_code::text = wa_language_meta.ietf_code::text
GROUP BY language.ietf_code, language.national_name, language.english_name, language.direction, world_region.region;
2 changes: 2 additions & 0 deletions controller/drizzle/0019_square_jubilee.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE "rendering" DROP COLUMN IF EXISTS "does_cover_all_content";--> statement-breakpoint
ALTER TABLE "scriptural_rendering_metadata" DROP COLUMN IF EXISTS "is_whole_chapter";
1 change: 1 addition & 0 deletions controller/drizzle/0020_right_mojo.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE "scriptural_rendering_metadata" ALTER COLUMN "book_slug" DROP NOT NULL;
16 changes: 16 additions & 0 deletions controller/drizzle/0021_first_ink.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
CREATE OR REPLACE VIEW source_zips AS
SELECT c.*, CONCAT(g.repo_url, '/archive/master.zip') AS zip_url, COUNT(DISTINCT srm.book_slug) AS unique_book_slugs_count,
m.show_on_biel, m.status AS meta_status, l.national_name, l.english_name

FROM content c
JOIN rendering r ON r.content_id = c.id
JOIN scriptural_rendering_metadata srm ON srm.rendering_id = r.id
JOIN git_repo g ON g.id = c.git_id
JOIN wa_content_meta m ON m.content_id = c.id
JOIN language l on c.language_id = l.ietf_code
WHERE c.domain = 'scripture'
AND m.show_on_biel = false
AND m.status = 'Active'
AND c.git_id IS NOT NULL
GROUP BY c.id, CONCAT(g.repo_url, '/archive/master.zip'), m.id, l.national_name, l.english_name
HAVING COUNT(DISTINCT srm.book_slug) > 26
12 changes: 12 additions & 0 deletions controller/drizzle/0022_stiff_raider.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
CREATE TABLE IF NOT EXISTS "localization" (
"ietf_code" varchar NOT NULL,
"key" varchar NOT NULL,
"value" text NOT NULL,
CONSTRAINT "localization_pkey" PRIMARY KEY("ietf_code","key")
);
--> statement-breakpoint
DO $$ BEGIN
ALTER TABLE "localization" ADD CONSTRAINT "localization_ietf_code_language_ietf_code_fk" FOREIGN KEY ("ietf_code") REFERENCES "language"("ietf_code") ON DELETE cascade ON UPDATE cascade;
EXCEPTION
WHEN duplicate_object THEN null;
END $$;
Loading