fix: clean up

Author: lumakyns

apps/data-pipeline/degreeworks-scraper/src/components/AuditParser.ts

@@ -14,6 +14,7 @@ export class AuditParser {
   private static readonly electiveMatcher = /ELECTIVE @+/;
   private static readonly wildcardMatcher = /\w@/;
   private static readonly rangeMatcher = /-\w+/;
+  private requirementIdMap = new Map<string, string>();
 
   constructor(private readonly db: ReturnType<typeof database>) {
     console.log("[AuditParser.new] AuditParser initialized");
@@ -100,27 +101,24 @@ export class AuditParser {
       .limit(1);
   }
 
-  requirementIdMap = new Map<string, string>();
-  generateRequirementId(rule: Rule, downstreamIdentifier = ""): string {
+  generateRequirementId(rule: Rule, childRequirementBlockId: string): string {
     const requirementObjectStr = JSON.stringify({
       label: rule.label,
       labelTag: rule.labelTag,
       ruleType: rule.ruleType,
       ruleId: rule.ruleId,
       nodeId: rule.nodeId,
-      downstreamIdentifier,
+      childRequirementBlockId,
     });
 
     const requirementId = createHash("md5")
       .update(requirementObjectStr)
       .digest("base64url")
       .slice(0, 10);
 
-    if (
-      this.requirementIdMap.has(requirementId) &&
-      this.requirementIdMap.get(requirementId) !== requirementObjectStr
-    ) {
-      console.log("Collision detected between two requirementIds");
+    const existingRequirementObjectStr = this.requirementIdMap.get(rule.ruleId);
+    if (existingRequirementObjectStr && existingRequirementObjectStr !== requirementObjectStr) {
+      console.error("Collision detected between two requirementIds");
     }
     this.requirementIdMap.set(requirementId, requirementObjectStr);
 
@@ -228,10 +226,11 @@ export class AuditParser {
         }
         case "Complete":
         case "Incomplete": {
-          const downstreamIdentifier = AuditParser.suppressLabelPolymorphism(rule.label);
+          const label = AuditParser.suppressLabelPolymorphism(rule.label);
+          const downstreamIdentifier = label;
           const requirementId = this.generateRequirementId(rule, downstreamIdentifier);
           ret.push({
-            label: AuditParser.suppressLabelPolymorphism(rule.label),
+            label,
             requirementId,
             requirementType: "Marker",
           });

apps/data-pipeline/degreeworks-scraper/src/types.ts

@@ -9,7 +9,6 @@ export type RuleBase = {
   ruleId: string;
   ruleType: string;
   nodeId: string;
-  nodeType: string;
 };
 /**
  * A group of `numberOfRules` rules,