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

#3774 - Refactoring Import Modules #3853

Merged
merged 2 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export * from "./sfas-application.service";
export * from "./sfas-application-import.service";
export * from "./sfas-data-importer";
export * from "./sfas-individual.service";
export * from "./sfas-part-time-application.service";
export * from "./sfas-restriction.service";
export * from "./sfas-individual-import.service";
export * from "./sfas-part-time-application-import.service";
export * from "./sfas-restriction-import.service";
export * from "./sims-to-sfas.model";
export * from "./sims-to-sfas.service";
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { SFASApplicationRecord } from "../../sfas-integration/sfas-files/sfas-ap
* Manages the data related to an individual/student in SFAS.
*/
@Injectable()
export class SFASApplicationService
export class SFASApplicationImportService
extends DataModelService<SFASApplication>
implements SFASDataImporter
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const DISBURSEMENT_OVERAWARD_RAW_SQL_FOLDER = "disbursement-overawards";
* Manages the data related to an individual/student in SFAS.
*/
@Injectable()
export class SFASIndividualService
export class SFASIndividualImportService
extends DataModelService<SFASIndividual>
implements SFASDataImporter
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { SFASPartTimeApplicationRecord } from "../../sfas-integration/sfas-files
* Manages the part time application data related to an individual/student in SFAS.
*/
@Injectable()
export class SFASPartTimeApplicationsService
export class SFASPartTimeApplicationsImportService
extends DataModelService<SFASPartTimeApplications>
implements SFASDataImporter
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const SFAS_RESTRICTIONS_RAW_SQL_FOLDER = "sfas-restrictions";
* process the Federal Restriction file on a regular basis.
*/
@Injectable()
export class SFASRestrictionService
export class SFASRestrictionImportService
extends DataModelService<SFASRestriction>
implements SFASDataImporter
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { Module } from "@nestjs/common";
import { SshService } from "@sims/integrations/services";
import { ConfigModule } from "@sims/utilities/config";
import {
SFASIndividualService,
SFASApplicationService,
SFASRestrictionService,
SFASPartTimeApplicationsService,
SFASIndividualImportService,
SFASApplicationImportService,
SFASRestrictionImportService,
SFASPartTimeApplicationsImportService,
SIMSToSFASService,
} from "../services/sfas";
import { SFASIntegrationService } from "./sfas-integration.service";
Expand All @@ -21,21 +21,17 @@ import {
SshService,
SFASIntegrationService,
SFASIntegrationProcessingService,
SFASIndividualService,
SFASApplicationService,
SFASRestrictionService,
SFASPartTimeApplicationsService,
SFASIndividualImportService,
SFASApplicationImportService,
SFASRestrictionImportService,
SFASPartTimeApplicationsImportService,
SIMSToSFASService,
SIMSToSFASIntegrationService,
SIMSToSFASProcessingService,
],
exports: [
SFASIntegrationService,
SFASIntegrationProcessingService,
SFASIndividualService,
SFASApplicationService,
SFASRestrictionService,
SFASPartTimeApplicationsService,
SIMSToSFASService,
SIMSToSFASProcessingService,
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import {
} from "./sfas-integration.models";
import { SFASIntegrationService } from "./sfas-integration.service";
import {
SFASApplicationService,
SFASApplicationImportService,
SFASDataImporter,
SFASIndividualService,
SFASRestrictionService,
SFASPartTimeApplicationsService,
SFASIndividualImportService,
SFASRestrictionImportService,
SFASPartTimeApplicationsImportService,
} from "../services/sfas";
import { SFAS_IMPORT_RECORDS_PROGRESS_REPORT_PACE } from "@sims/services/constants";
import * as os from "os";
Expand All @@ -23,10 +23,10 @@ export class SFASIntegrationProcessingService {
private readonly ftpReceiveFolder: string;
constructor(
private readonly sfasService: SFASIntegrationService,
private readonly sfasIndividualService: SFASIndividualService,
private readonly sfasApplicationService: SFASApplicationService,
private readonly sfasRestrictionService: SFASRestrictionService,
private readonly sfasPartTimeApplicationsService: SFASPartTimeApplicationsService,
private readonly sfasIndividualImportService: SFASIndividualImportService,
private readonly sfasApplicationImportService: SFASApplicationImportService,
private readonly sfasRestrictionImportService: SFASRestrictionImportService,
private readonly sfasPartTimeApplicationsImportService: SFASPartTimeApplicationsImportService,
config: ConfigService,
) {
this.ftpReceiveFolder = config.sfasIntegration.ftpReceiveFolder;
Expand Down Expand Up @@ -193,22 +193,22 @@ export class SFASIntegrationProcessingService {
postFileImportResult.summary.push(
"Updating student ids for SFAS individuals.",
);
await this.sfasIndividualService.updateStudentId();
await this.sfasIndividualImportService.updateStudentId();
postFileImportResult.summary.push("Student ids updated.");
// Update the disbursement overawards if there is atleast one file to process.
if (executeDisbursementOverawardsUpdate) {
postFileImportResult.summary.push(
"Updating and inserting new disbursement overaward balances from sfas to disbursement overawards table.",
);
await this.sfasIndividualService.updateDisbursementOverawards();
await this.sfasIndividualImportService.updateDisbursementOverawards();
postFileImportResult.summary.push(
"New disbursement overaward balances inserted to disbursement overawards table.",
);
}
postFileImportResult.summary.push(
"Inserting student restrictions from SFAS restrictions data.",
);
await this.sfasRestrictionService.insertStudentRestrictions();
await this.sfasRestrictionImportService.insertStudentRestrictions();
postFileImportResult.summary.push(
"Inserted student restrictions from SFAS restrictions data.",
);
Expand Down Expand Up @@ -237,16 +237,16 @@ export class SFASIntegrationProcessingService {
let dataImporter: SFASDataImporter = undefined;
switch (recordTypeCode) {
case RecordTypeCodes.IndividualDataRecord:
dataImporter = this.sfasIndividualService;
dataImporter = this.sfasIndividualImportService;
break;
case RecordTypeCodes.ApplicationDataRecord:
dataImporter = this.sfasApplicationService;
dataImporter = this.sfasApplicationImportService;
break;
case RecordTypeCodes.RestrictionDataRecord:
dataImporter = this.sfasRestrictionService;
dataImporter = this.sfasRestrictionImportService;
break;
case RecordTypeCodes.PartTimeApplicationDataRecord:
dataImporter = this.sfasPartTimeApplicationsService;
dataImporter = this.sfasPartTimeApplicationsImportService;
break;
}
return dataImporter;
Expand Down