From 5413b03aeeae0c61fa81499675c8b18142c60f34 Mon Sep 17 00:00:00 2001 From: anilgupta Date: Fri, 10 Nov 2023 11:12:35 +0530 Subject: [PATCH 1/5] Issue #LR-716 chore: Added if not exists clause in cassandra query. --- .../db/migration/cassandra/sunbird/V1.122_cassandra.cql | 2 +- .../db/migration/cassandra/sunbird/V1.67_cassandra.cql | 2 +- .../cassandra/sunbird_notifications/V1.126_cassandra.cql | 2 +- .../src/test/resources/migration/cql/V1__First.cql | 2 +- .../test/resources/migration/cql/V2_0__Add_contents_table.cql | 2 +- .../src/test/resources/migration/integ/V1_0_0__First.cql | 2 +- .../src/test/resources/migration/integ/V2_0_0__Second.cql | 4 ++-- .../resources/migration/integ_outoforder/V1_0_0__First.cql | 2 +- .../resources/migration/integ_outoforder/V2_0_0__Second.cql | 4 ++-- .../resources/migration/integ_outoforder2/V1_0_0__First.cql | 2 +- .../resources/migration/integ_outoforder2/V2_0_0__Second.cql | 4 ++-- .../resources/migration/integ_outoforder3/V1_0_0__First.cql | 2 +- .../resources/migration/integ_outoforder3/V2_0_0__Second.cql | 4 ++-- .../src/test/resources/migration/subdir/dir1/V1__First.cql | 2 +- .../migration/subdir/dir2/V2_0__Add_contents_table.cql | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.122_cassandra.cql b/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.122_cassandra.cql index b7c2ff95d..2c7c38f0c 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.122_cassandra.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.122_cassandra.cql @@ -1,4 +1,4 @@ -CREATE TABLE sunbird.user_roles( +CREATE TABLE IF NOT EXISTS sunbird.user_roles( userid text, role text, scope text, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.67_cassandra.cql b/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.67_cassandra.cql index e229b0e7c..e76484d15 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.67_cassandra.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.67_cassandra.cql @@ -1,6 +1,6 @@ ALTER TABLE sunbird.user ADD prevUsedPhone text; ALTER TABLE sunbird.user ADD prevUsedEmail text; -CREATE TABLE sunbird.user_cert (id text,certId text,userId text,store map,otherLink text,accessCode text,createdAt timestamp, updatedAt timestamp, PRIMARY KEY (id)); +CREATE TABLE IF NOT EXISTS sunbird.user_cert (id text,certId text,userId text,store map,otherLink text,accessCode text,createdAt timestamp, updatedAt timestamp, PRIMARY KEY (id)); CREATE INDEX inx_usrcert_user_id ON sunbird.user_cert(userId); CREATE INDEX inx_usrcert_cert_id ON sunbird.user_cert(certId); diff --git a/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird_notifications/V1.126_cassandra.cql b/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird_notifications/V1.126_cassandra.cql index 035e354ee..cae534ffb 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird_notifications/V1.126_cassandra.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird_notifications/V1.126_cassandra.cql @@ -12,7 +12,7 @@ createdBy text, lastUpdatedBy text, PRIMARY KEY(templateId)); -CREATE TABLE sunbird_notifications.notification_feed ( +CREATE TABLE IF NOT EXISTS sunbird_notifications.notification_feed ( id text PRIMARY KEY, category text, createdby text, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/cql/V1__First.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/cql/V1__First.cql index 0fb9f8416..037fddce0 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/cql/V1__First.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/cql/V1__First.cql @@ -1,4 +1,4 @@ -CREATE TABLE test ( +CREATE TABLE IF NOT EXISTS test ( space text, key text, value text, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/cql/V2_0__Add_contents_table.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/cql/V2_0__Add_contents_table.cql index c3f765938..2c08eefa9 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/cql/V2_0__Add_contents_table.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/cql/V2_0__Add_contents_table.cql @@ -1,4 +1,4 @@ -CREATE TABLE contents ( +CREATE TABLE IF NOT EXISTS contents ( id bigint PRIMARY KEY, title text, message text, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ/V1_0_0__First.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ/V1_0_0__First.cql index d6a5db707..93c178271 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ/V1_0_0__First.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ/V1_0_0__First.cql @@ -1,4 +1,4 @@ -CREATE TABLE test1 ( +CREATE TABLE IF NOT EXISTS test1 ( space text, key text, value text, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ/V2_0_0__Second.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ/V2_0_0__Second.cql index f1e27ad59..8f111db65 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ/V2_0_0__Second.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ/V2_0_0__Second.cql @@ -1,11 +1,11 @@ -CREATE TABLE contents ( +CREATE TABLE IF NOT EXISTS contents ( id bigint PRIMARY KEY, title text, message text, created timestamp ); -CREATE TABLE messages ( +CREATE TABLE IF NOT EXISTS messages ( id bigint PRIMARY KEY, contents_id bigint, type int, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder/V1_0_0__First.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder/V1_0_0__First.cql index d6a5db707..93c178271 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder/V1_0_0__First.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder/V1_0_0__First.cql @@ -1,4 +1,4 @@ -CREATE TABLE test1 ( +CREATE TABLE IF NOT EXISTS test1 ( space text, key text, value text, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder/V2_0_0__Second.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder/V2_0_0__Second.cql index f1e27ad59..8f111db65 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder/V2_0_0__Second.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder/V2_0_0__Second.cql @@ -1,11 +1,11 @@ -CREATE TABLE contents ( +CREATE TABLE IF NOT EXISTS contents ( id bigint PRIMARY KEY, title text, message text, created timestamp ); -CREATE TABLE messages ( +CREATE TABLE IF NOT EXISTS messages ( id bigint PRIMARY KEY, contents_id bigint, type int, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder2/V1_0_0__First.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder2/V1_0_0__First.cql index d6a5db707..93c178271 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder2/V1_0_0__First.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder2/V1_0_0__First.cql @@ -1,4 +1,4 @@ -CREATE TABLE test1 ( +CREATE TABLE IF NOT EXISTS test1 ( space text, key text, value text, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder2/V2_0_0__Second.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder2/V2_0_0__Second.cql index f1e27ad59..8f111db65 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder2/V2_0_0__Second.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder2/V2_0_0__Second.cql @@ -1,11 +1,11 @@ -CREATE TABLE contents ( +CREATE TABLE IF NOT EXISTS contents ( id bigint PRIMARY KEY, title text, message text, created timestamp ); -CREATE TABLE messages ( +CREATE TABLE IF NOT EXISTS messages ( id bigint PRIMARY KEY, contents_id bigint, type int, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder3/V1_0_0__First.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder3/V1_0_0__First.cql index d6a5db707..93c178271 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder3/V1_0_0__First.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder3/V1_0_0__First.cql @@ -1,4 +1,4 @@ -CREATE TABLE test1 ( +CREATE TABLE IF NOT EXISTS test1 ( space text, key text, value text, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder3/V2_0_0__Second.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder3/V2_0_0__Second.cql index f1e27ad59..8f111db65 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder3/V2_0_0__Second.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/integ_outoforder3/V2_0_0__Second.cql @@ -1,11 +1,11 @@ -CREATE TABLE contents ( +CREATE TABLE IF NOT EXISTS contents ( id bigint PRIMARY KEY, title text, message text, created timestamp ); -CREATE TABLE messages ( +CREATE TABLE IF NOT EXISTS messages ( id bigint PRIMARY KEY, contents_id bigint, type int, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/subdir/dir1/V1__First.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/subdir/dir1/V1__First.cql index 0fb9f8416..037fddce0 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/subdir/dir1/V1__First.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/subdir/dir1/V1__First.cql @@ -1,4 +1,4 @@ -CREATE TABLE test ( +CREATE TABLE IF NOT EXISTS test ( space text, key text, value text, diff --git a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/subdir/dir2/V2_0__Add_contents_table.cql b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/subdir/dir2/V2_0__Add_contents_table.cql index c3f765938..2c08eefa9 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/subdir/dir2/V2_0__Add_contents_table.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/test/resources/migration/subdir/dir2/V2_0__Add_contents_table.cql @@ -1,4 +1,4 @@ -CREATE TABLE contents ( +CREATE TABLE IF NOT EXISTS contents ( id bigint PRIMARY KEY, title text, message text, From d92deb73cb85420f63991759375264b14b0fe0f5 Mon Sep 17 00:00:00 2001 From: anilgupta Date: Fri, 10 Nov 2023 11:13:28 +0530 Subject: [PATCH 2/5] Issue #LR-716 chore: Added if not exists clause in cassandra query. --- sunbird-cassandra-migration/cassandra-migration/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sunbird-cassandra-migration/cassandra-migration/README.md b/sunbird-cassandra-migration/cassandra-migration/README.md index 74edb7bc6..93f9cc667 100644 --- a/sunbird-cassandra-migration/cassandra-migration/README.md +++ b/sunbird-cassandra-migration/cassandra-migration/README.md @@ -46,7 +46,7 @@ cassandra@cqlsh:cassandra_migration_test> select * from cassandra_migration_vers ### .cql files Example: ``` -CREATE TABLE test1 ( +CREATE TABLE IF NOT EXISTS test1 ( space text, key text, value text, From 6e1c33ccc04fcc11d5a8dab9279589c08094ed8a Mon Sep 17 00:00:00 2001 From: anilgupta Date: Tue, 26 Dec 2023 11:32:58 +0530 Subject: [PATCH 3/5] Issue #LR-686 chore: Added the new template for delete user OTP email --- .../db/migration/cassandra/sunbird/V1.145_cassandra.cql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.145_cassandra.cql diff --git a/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.145_cassandra.cql b/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.145_cassandra.cql new file mode 100644 index 000000000..4f90a55a7 --- /dev/null +++ b/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.145_cassandra.cql @@ -0,0 +1 @@ +INSERT INTO sunbird.email_template(name, template) VALUES('otpEmailDeleteUserTemplate', '
 
Hello User,

To confirm the deletion of your $installationName account, please enter the following OTP: $otp.

This OTP is valid for the next $otpExpiryInMinutes.

If you did not request this account deletion, please ignore this message or contact our support team immediately at $supportEmail.

Thank you for using $installationName.

Best regards,
The $installationName Team
 
'); From 8edfdab6ce767aa625651641a49f99148cd13c89 Mon Sep 17 00:00:00 2001 From: anilgupta Date: Wed, 17 Jan 2024 15:26:36 +0530 Subject: [PATCH 4/5] Issue #LR-686 chore: Added the new template for delete user OTP email --- .../sunbird/{V1.145_cassandra.cql => V1.146_cassandra.cql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/{V1.145_cassandra.cql => V1.146_cassandra.cql} (100%) diff --git a/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.145_cassandra.cql b/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.146_cassandra.cql similarity index 100% rename from sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.145_cassandra.cql rename to sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.146_cassandra.cql From 0a1dd9c12e5f7b716da752c85a52e93756aec27d Mon Sep 17 00:00:00 2001 From: anilgupta Date: Thu, 8 Feb 2024 13:39:35 +0530 Subject: [PATCH 5/5] Issue #LR-686 chore: Added the new template for delete user OTP email --- .../db/migration/cassandra/sunbird/V1.146_cassandra.cql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.146_cassandra.cql b/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.146_cassandra.cql index 4f90a55a7..80dfb2745 100644 --- a/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.146_cassandra.cql +++ b/sunbird-cassandra-migration/cassandra-migration/src/main/resources/db/migration/cassandra/sunbird/V1.146_cassandra.cql @@ -1 +1 @@ -INSERT INTO sunbird.email_template(name, template) VALUES('otpEmailDeleteUserTemplate', '
 
Hello User,

To confirm the deletion of your $installationName account, please enter the following OTP: $otp.

This OTP is valid for the next $otpExpiryInMinutes.

If you did not request this account deletion, please ignore this message or contact our support team immediately at $supportEmail.

Thank you for using $installationName.

Best regards,
The $installationName Team
 
'); +INSERT INTO sunbird.email_template(name, template) VALUES('otpEmailDeleteUserTemplate', '
 
Hello User,

To confirm the deletion of your $installationName account, please enter the following OTP: $otp.

This OTP is valid for the next $otpExpiryInMinutes minutes.

If you did not request this account deletion, please ignore this message or contact our support team immediately at $supportEmail.

Thank you for using $installationName.

Best regards,
The $installationName Team
 
');