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

Committing changes related to creating data center table and entity and refactor program entity #421

Merged
merged 18 commits into from
Sep 27, 2023
Merged
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5f8dc22
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 12, 2023
794c071
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 12, 2023
8af736d
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 12, 2023
c01c457
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 12, 2023
b94c980
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 12, 2023
afcfdd8
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 14, 2023
de1594c
Merge branch 'develop' into feature/refactorProgramEntity
Azher2Ali Sep 14, 2023
ce3fe7a
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 14, 2023
b1b9a0e
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 14, 2023
3a44688
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 14, 2023
1ce470e
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 14, 2023
34e299b
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 14, 2023
e5a5502
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 14, 2023
f1fe559
Committing changes related to creating data center table and entity a…
Azher2Ali Sep 14, 2023
5c800ce
Committing changes related to removing the Region from the Program en…
Azher2Ali Sep 19, 2023
fe5de41
Revert "Committing changes related to removing the Region from the Pr…
Azher2Ali Sep 19, 2023
0db59af
Updating V17__create_data_center.sql
Azher2Ali Sep 26, 2023
a27f745
Modifying the query as requested by replacing the URL's
Azher2Ali Sep 26, 2023
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
Prev Previous commit
Next Next commit
Committing changes related to creating data center table and entity a…
…nd refactor program entity
  • Loading branch information
Azher2Ali committed Sep 14, 2023
commit 3a44688d730421ade8facf13df9b7d9fded759e6
2 changes: 1 addition & 1 deletion src/main/resources/flyway/sql/V17__create_data_center.sql
Original file line number Diff line number Diff line change
@@ -19,5 +19,5 @@ INSERT INTO data_center (id, name, short_name, organization, email, ui_url, gate
(uuid_generate_v4(), 'DataCenter1', 'DC1', '', 'abc@xyz.com', 'https://dcc.icgc.org/datacenter/BRCA-US', 'https://dcc.icgc.org/datacenter/BRCA-US', 'ABC', 'https://dcc.icgc.org/datacenter/BRCA-US', 'https://dcc.icgc.org/datacenter/BRCA-US', 'XYZ', 'https://dcc.icgc.org/datacenter/BRCA-US', 'https://dcc.icgc.org/datacenter/BRCA-US');

ALTER TABLE program
ADD COLUMN data_center_id UUID NULL,
ADD COLUMN data_center_id VARCHAR(255) NULL,
ADD CONSTRAINT program_data_center_fkey FOREIGN KEY(data_center_id) REFERENCES data_center(id);
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@
import io.grpc.testing.GrpcCleanupRule;
import java.io.IOException;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
@@ -138,7 +139,7 @@ public void createProgramAndGet() {
.setShortName(shortName)
.setMembershipType(membershipTypeValue(ASSOCIATE))
.setWebsite(stringValue("http://site.org"))
.setDataCenterId(StringValue.of("ea22873e-3abc-48e2-be23-c2c729f65ccd"))
.setDataCenterId(StringValue.of(UUID.randomUUID().toString()))
.addInstitutions("Ontario Institute for Cancer Research")
.addRegions("Canada")
.setName(stringValue(RandomString.make(15)))
@@ -213,7 +214,7 @@ public void joinAndLeaveProgram() {
Program.newBuilder()
.setShortName(name)
.setMembershipType(membershipTypeValue(ASSOCIATE))
.setDataCenterId(StringValue.of("ea22873e-3abc-48e2-be23-c2c729f65ccd"))
.setDataCenterId(StringValue.of(UUID.randomUUID().toString()))
.setWebsite(stringValue("http://site.org"))
.addInstitutions("Ontario Institute for Cancer Research")
.addRegions("Canada")
@@ -362,7 +363,7 @@ public void updateProgramAddNewInstitution() {
.setShortName(name)
.setMembershipType(membershipTypeValue(ASSOCIATE))
.setWebsite(stringValue("http://site.org"))
.setDataCenterId(StringValue.of("ea22873e-3abc-48e2-be23-c2c729f65ccd"))
.setDataCenterId(StringValue.of(UUID.randomUUID().toString()))
.addInstitutions("Ontario Institute for Cancer Research")
.addRegions("Canada")
.setName(stringValue(RandomString.make(15)))