Skip to content

Commit

Permalink
Merge pull request TexasDigitalLibrary#75 from TAMULib/sprint1-58-73-…
Browse files Browse the repository at this point in the history
…bypass-dataloader-merge

[73][MERGE] Add config option to bypass data loader
  • Loading branch information
jsavell authored Apr 30, 2024
2 parents 465a92f + b9da386 commit a187f84
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 32 deletions.
71 changes: 39 additions & 32 deletions src/main/java/org/tdl/vireo/service/SystemDataLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -84,6 +85,9 @@ public class SystemDataLoader {

private final Pattern SUBJECT_PATTERN = Pattern.compile("\\s*Subject:(.*)[\\n\\r]{1}");

@Value("${app.dataLoader.initialize:true}")
private Boolean doInitialize;

@Autowired
private ObjectMapper objectMapper;

Expand Down Expand Up @@ -161,53 +165,56 @@ public class SystemDataLoader {

@Transactional(rollbackFor = IOException.class)
public void loadSystemData() throws IOException {
if (!doInitialize) {
logger.info("Bypassing data load based on app configuration");
} else {
logger.info("Loading system languages");
loadLanguages();

logger.info("Loading system languages");
loadLanguages();

logger.info("Loading system input types");
loadInputTypes();
logger.info("Loading system input types");
loadInputTypes();

logger.info("Loading system email templates");
loadEmailTemplates();
logger.info("Loading system email templates");
loadEmailTemplates();

logger.info("Loading system degree levels");
loadDegreeLevels();
logger.info("Loading system degree levels");
loadDegreeLevels();

logger.info("Loading system degrees");
loadDegrees();
logger.info("Loading system degrees");
loadDegrees();

logger.info("Loading system graduation months");
loadGraduationMonths();
logger.info("Loading system graduation months");
loadGraduationMonths();

logger.info("Loading system embargos");
loadEmbargos();
logger.info("Loading system embargos");
loadEmbargos();

logger.info("Loading system submission statuses");
loadSubmissionStatuses();
logger.info("Loading system submission statuses");
loadSubmissionStatuses();

logger.info("Loading system organization catagories");
loadOrganizationCategories();
logger.info("Loading system organization catagories");
loadOrganizationCategories();

logger.info("Loading system document types");
loadDocumentTypes();
logger.info("Loading system document types");
loadDocumentTypes();

logger.info("Loading system organization");
loadOrganization();
logger.info("Loading system organization");
loadOrganization();

logger.info("Loading system controlled vocabularies");
loadControlledVocabularies();
logger.info("Loading system controlled vocabularies");
loadControlledVocabularies();

logger.info("Loading system Proquest subject codes controlled vocabulary");
loadProquestSubjectCodesControlledVocabulary();
logger.info("Loading system Proquest subject codes controlled vocabulary");
loadProquestSubjectCodesControlledVocabulary();

logger.info("Loading system submission list columns");
loadSubmissionListColumns();
logger.info("Loading system submission list columns");
loadSubmissionListColumns();

logger.info("Loading system packagers");
loadPackagers();
logger.info("Loading system packagers");
loadPackagers();

logger.info("Finished loading system data");
logger.info("Finished loading system data");
}
}

private void loadLanguages() throws IOException {
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@ app:
embargoTypeNone: None
submissionTypeNone: None

# org.tdl.vireo.service.SystemDataLoader
dataLoader:
initialize: true

# edu.tamu.weaver.token.service.TokenService
auth:
security.jwt:
Expand Down

0 comments on commit a187f84

Please sign in to comment.