Merge pull request #7 from CinCoders/feature/res-10

Fix: fix upsert of journal and conference publications
CinCoders · Oct 31, 2023 · b7d502f · b7d502f
2 parents 1601da3 + a508bae
commit b7d502f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/src/import-xml/import-xml.service.ts b/src/import-xml/import-xml.service.ts
@@ -1248,7 +1248,7 @@ export class ImportXmlService {
  }
  }
  } finally {
- queryRunner.release();
+ await queryRunner.release();
  }
  }
 }
diff --git a/src/post-graduation/post-graduation.service.ts b/src/post-graduation/post-graduation.service.ts
@@ -12,7 +12,7 @@ export class PostGraduationService {
 
  await queryRunner.connect();
 
- const result = queryRunner.query(`
+ const result = await queryRunner.query(`
  SELECT
  ${groupByProfessor ? 'p.id as "professorId",' : ''}
  ${groupByProfessor ? 'p.name as "professorName",' : ''}

diff --git a/src/professor/professor.service.ts b/src/professor/professor.service.ts
@@ -84,7 +84,7 @@ export class ProfessorService {
 
  const queryRunner = AppDataSource.createQueryRunner();
 
- const result = queryRunner.query(
+ const result = await queryRunner.query(
  `
  ${
  journalPublications

diff --git a/src/professor/services/article/journal-publication.service.ts b/src/professor/services/article/journal-publication.service.ts
@@ -39,14 +39,16 @@ export class JournalPublicationService {
  if (journal.issn === journalPublication.issn) {
  journalPublication.journal = journal;
  journalPublication.qualis = journal.qualis;
+
  if (journal.isTop) {
  journalPublication.isTop = true;
  }
+
  await AppDataSource.createQueryBuilder(queryRunner)
  .insert()
  .into(JournalPublication)
  .values(journalPublication)
- .orUpdate(['qualis', 'journal_id'], ['id'])
+ .orUpdate(['qualis', 'journal_id', 'is_top'], ['id'])
  .execute();
  return;
  }

diff --git a/src/professor/services/conference/conference.service.ts b/src/professor/services/conference/conference.service.ts
@@ -90,7 +90,7 @@ export class ConferencePublicationService {
  .into(ConferencePublication)
  .values(conferencePublication)
  .orUpdate(
- ['title', 'proceedings', 'qualis', 'conference_id'],
+ ['title', 'proceedings', 'qualis', 'conference_id', 'is_top'],
  ['id'],
  )
  .execute();