Splitting out note id to its own property

Author: josephmyers

src/RealtimeServer/scriptureforge/models/question.ts

@@ -30,4 +30,5 @@ export interface Question extends ProjectData {
   dateModified: string;
   dateCreated: string;
   transceleratorQuestionId?: string;
+  paratextNoteId?: string;
 }

src/RealtimeServer/scriptureforge/services/question-service.ts

@@ -189,6 +189,9 @@ export class QuestionService extends SFProjectDataService<Question> {
       },
       transceleratorQuestionId: {
         bsonType: 'string'
+      },
+      paratextNoteId: {
+        bsonType: 'string'
       }
     },
     additionalProperties: false

src/SIL.XForge.Scripture/ClientApp/src/app/checking/import-questions-dialog/import-questions-dialog.component.ts

@@ -343,9 +343,10 @@ export class ImportQuestionsDialogComponent implements OnDestroy {
       // Questions imported from a file should be skipped only if they are exactly the same as what is currently in SF.
       const sfVersionOfQuestion: QuestionDoc | undefined = questionQuery.docs.find(
         doc =>
-          doc.data != null &&
-          (useQuestionIds ? doc.data.transceleratorQuestionId === question.id : doc.data.text === question.text) &&
-          toVerseRef(doc.data.verseRef).equals(question.verseRef)
+          (doc.data != null &&
+            (useQuestionIds ? doc.data.transceleratorQuestionId === question.id : doc.data.text === question.text) &&
+            toVerseRef(doc.data.verseRef).equals(question.verseRef)) ||
+          (useQuestionIds ? doc.data?.paratextNoteId === question.id : doc.data?.text === question.text)
       );
 
       this.questionList.push({
@@ -414,6 +415,7 @@ export class ImportQuestionsDialogComponent implements OnDestroy {
 
   async importQuestions(): Promise<void> {
     this.importClicked = true;
+    const status = this.status; //capture the state before we update it
 
     if (this.selectedCount < 1) {
       return;
@@ -442,9 +444,15 @@ export class ImportQuestionsDialogComponent implements OnDestroy {
           answers: [],
           isArchived: false,
           dateCreated: currentDate,
-          dateModified: currentDate,
-          transceleratorQuestionId: listItem.question.id
+          dateModified: currentDate
         };
+
+        if (status === 'filter_questions') {
+          newQuestion.transceleratorQuestionId = listItem.question.id;
+        } else if (status === 'filter_notes') {
+          newQuestion.paratextNoteId = listItem.question.id;
+        }
+
         await this.zone.runOutsideAngular(() =>
           this.checkingQuestionsService.createQuestion(this.data.projectId, newQuestion, undefined, undefined)
         );

src/SIL.XForge.Scripture/Models/Question.cs

@@ -16,4 +16,5 @@ public class Question : ProjectData
     public DateTime DateModified { get; set; }
     public DateTime DateCreated { get; set; }
     public string TransceleratorQuestionId { get; set; }
+    public string ParatextNoteId { get; set; }
 }