Skip to content

Commit cd832f8

Browse files
committed
Adding a moonshots data import that can be scheduled on a recurring basis.
1 parent 09b84aa commit cd832f8

File tree

6 files changed

+227
-74
lines changed

6 files changed

+227
-74
lines changed

Diff for: README.md

+4-8
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,13 @@ git clone [email protected]:computate-org/computate_project.git ~/.ansible/roles/co
120120

121121
```bash
122122

123-
cd ~/.ansible/roles/computate.computate_postgres
124-
ansible-playbook install.yml
123+
ansible-playbook ~/.ansible/roles/computate.computate_postgres/install.yml
125124

126-
cd ~/.ansible/roles/computate.computate_zookeeper
127-
ansible-playbook install.yml
125+
ansible-playbook ~/.ansible/roles/computate.computate_zookeeper/install.yml
128126

129-
cd ~/.ansible/roles/computate.computate_solr
130-
ansible-playbook install.yml
127+
ansible-playbook ~/.ansible/roles/computate.computate_solr/install.yml
131128

132-
cd ~/.ansible/roles/computate.computate_project
133-
ansible-playbook install.yml -e SITE_NAME=ActiveLearningStudio-API -e ENABLE_CODE_GENERATION_SERVICE=true
129+
ansible-playbook ~/.ansible/roles/computate.computate_project/install.yml -e SITE_NAME=ActiveLearningStudio-API -e ENABLE_CODE_GENERATION_SERVICE=true -e SITE_ZONE=America/New_York -e @~/.local/src/ActiveLearningStudio-API-ansible/vaults/curriki-defaults/vault --vault-id @prompt
134130
```
135131

136132
# Configure Eclipse

Diff for: config/template.yml

+14-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,20 @@ ENABLE_SESSION_ID: {{ ENABLE_SESSION_ID }}
4949
ENABLE_DELETED: {{ ENABLE_DELETED }}
5050
# Enable an object in the database to be archived.
5151
ENABLE_ARCHIVED: {{ ENABLE_ARCHIVED }}
52-
# Enable data import in the site.
53-
ENABLE_IMPORT_DATA: {{ ENABLE_IMPORT_DATA }}
5452

5553
# The Auth roles required to be an admin in the site.
5654
AUTH_ROLES_ADMIN: {{ AUTH_ROLES_ADMIN }}
55+
56+
# Connection to the Moonshots MySQL database.
57+
MOONSHOTS_HOST: "{{ MOONSHOTS_HOST }}"
58+
MOONSHOTS_PORT: {{ MOONSHOTS_PORT }}
59+
MOONSHOTS_DATABASE: "{{ MOONSHOTS_DATABASE }}"
60+
MOONSHOTS_USERNAME: "{{ MOONSHOTS_USERNAME }}"
61+
MOONSHOTS_PASSWORD: "{{ MOONSHOTS_PASSWORD }}"
62+
63+
# Enable data import in the site.
64+
ENABLE_IMPORT_DATA: {{ ENABLE_IMPORT_DATA | lower }}
65+
66+
ENABLE_IMPORT_DATA_CurrikiResource: true
67+
IMPORT_DATA_START_TIME_CurrikiResource: 00:00 {{ SITE_ZONE }}
68+
IMPORT_DATA_PERIOD_CurrikiResource: 1 hour

Diff for: pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ TODO: Define the groupId and artifactId for ActiveLearningStudio-API.
3333
<maven-jarsigner-plugin.version>1.4</maven-jarsigner-plugin.version>
3434
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
3535
<postgresql.version>42.2.2.jre7</postgresql.version>
36+
<mysql.version>8.0.27</mysql.version>
3637
<solr.version>8.4.1</solr.version>
3738
<vertx-maven-plugin.version>1.0.9</vertx-maven-plugin.version>
3839
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
@@ -173,6 +174,16 @@ TODO: Define the groupId and artifactId for ActiveLearningStudio-API.
173174
<version>${postgresql.version}</version>
174175
</dependency>
175176

177+
<!-- ##### -->
178+
<!-- MySQL -->
179+
<!-- ##### -->
180+
181+
<dependency>
182+
<groupId>mysql</groupId>
183+
<artifactId>mysql-connector-java</artifactId>
184+
<version>${mysql.version}</version>
185+
</dependency>
186+
176187
<!-- #### -->
177188
<!-- Solr -->
178189
<!-- #### -->

Diff for: src/gen/java/org/curriki/api/enus/vertx/WorkerVerticleGen.java

+20-10
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,32 @@ public abstract class WorkerVerticleGen<DEV> extends AbstractVerticle {
5252
public static final String configureEmailFail1 = "Configure sending email failed. ";
5353
public static final String configureEmailFail = configureEmailFail1;
5454

55+
public static final String configureMoonshotsDataComplete1 = "The Moonshot database was configured successfully. ";
56+
public static final String configureMoonshotsDataComplete = configureMoonshotsDataComplete1;
57+
public static final String configureMoonshotsDataFail1 = "The Moonshot database configuration failed. ";
58+
public static final String configureMoonshotsDataFail = configureMoonshotsDataFail1;
59+
5560
public static final String importTimerScheduling1 = "Scheduling the %s import at %s";
5661
public static final String importTimerScheduling = importTimerScheduling1;
5762
public static final String importTimerSkip1 = "Skip importing %s data. ";
5863
public static final String importTimerSkip = importTimerSkip1;
5964

60-
public static final String configureMoonshotsDataComplete1 = "Skip The Moonshot database was configured successfully. ";
61-
public static final String configureMoonshotsDataComplete = configureMoonshotsDataComplete1;
62-
public static final String configureMoonshotsDataFail1 = "Skip The Moonshot database configuration failed. ";
63-
public static final String configureMoonshotsDataFail = configureMoonshotsDataFail1;
64-
65-
public static final String importDataComplete1 = "Importing initial data completed. ";
65+
public static final String importDataComplete1 = "Configuring the import of %s data completed. ";
6666
public static final String importDataComplete = importDataComplete1;
67-
public static final String importDataFail1 = "Importing initial data failed. ";
67+
public static final String importDataFail1 = "Configuring the import of %s data failed. ";
6868
public static final String importDataFail = importDataFail1;
69-
public static final String importDataSkip1 = "Skip importing data. ";
70-
public static final String importDataSkip = importDataSkip1;
69+
70+
public static final String importDataCurrikiResourceComplete1 = "Importing all CurrikiResource records completed. ";
71+
public static final String importDataCurrikiResourceComplete = importDataCurrikiResourceComplete1;
72+
public static final String importDataCurrikiResourceFail1 = "Importing CurrikiResource records failed. ";
73+
public static final String importDataCurrikiResourceFail = importDataCurrikiResourceFail1;
74+
public static final String importDataCurrikiResourceSkip1 = "Skip importing CurrikiResource records. ";
75+
public static final String importDataCurrikiResourceSkip = importDataCurrikiResourceSkip1;
76+
77+
public static final String processRowCurrikiResourceComplete1 = "Importing CurrikiResource row completed. ";
78+
public static final String processRowCurrikiResourceComplete = processRowCurrikiResourceComplete1;
79+
public static final String processRowCurrikiResourceFail1 = "Importing CurrikiResource row failed. ";
80+
public static final String processRowCurrikiResourceFail = processRowCurrikiResourceFail1;
7181

7282
public static final String syncDbToSolrComplete1 = "Syncing database to Solr completed. ";
7383
public static final String syncDbToSolrComplete = syncDbToSolrComplete1;
@@ -267,6 +277,6 @@ public Object defineWorkerVerticle(String var, Object val) {
267277
return sb.toString();
268278
}
269279

270-
public static final String[] WorkerVerticleVals = new String[] { configureSharedWorkerExecutorFail1, configureSharedWorkerExecutorComplete1, configureEmailComplete1, configureEmailFail1, importTimerScheduling1, importTimerSkip1, configureMoonshotsDataComplete1, configureMoonshotsDataFail1, importDataComplete1, importDataFail1, importDataSkip1, syncDbToSolrComplete1, syncDbToSolrFail1, syncDbToSolrSkip1, syncDataComplete1, syncDataFail1, syncDataCounterResetFail1, syncDataSkip1, syncDataStarted1, refreshAllDataComplete1, refreshAllDataFail1, refreshAllDataSkip1, refreshDataComplete1, refreshDataFail1, refreshDataSkip1 };
280+
public static final String[] WorkerVerticleVals = new String[] { configureSharedWorkerExecutorFail1, configureSharedWorkerExecutorComplete1, configureEmailComplete1, configureEmailFail1, configureMoonshotsDataComplete1, configureMoonshotsDataFail1, importTimerScheduling1, importTimerSkip1, importDataComplete1, importDataFail1, importDataCurrikiResourceComplete1, importDataCurrikiResourceFail1, importDataCurrikiResourceSkip1, processRowCurrikiResourceComplete1, processRowCurrikiResourceFail1, syncDbToSolrComplete1, syncDbToSolrFail1, syncDbToSolrSkip1, syncDataComplete1, syncDataFail1, syncDataCounterResetFail1, syncDataSkip1, syncDataStarted1, refreshAllDataComplete1, refreshAllDataFail1, refreshAllDataSkip1, refreshDataComplete1, refreshDataFail1, refreshDataSkip1 };
271281

272282
}

0 commit comments

Comments
 (0)