Fix qa_custom_brokers bugs (#5659)

* separate results for different users

* separate results for different users

* separate results for different users

* fix last optout date set

* requested removal

* lint

* add profileid param to mocked results under maintenance

* remove console log

* replace onerepscanid with profile id

* add helpful comment

* rmv l10n file accidentally added

* reorg comments

* add todo comment

Author: codemist

src/app/(proper_react)/(redesign)/(authenticated)/admin/qa-customs/onerepConfig.tsx

@@ -29,6 +29,9 @@ const OnerepConfigPage = ({
 }: Props) => {
   const [brokers, setBrokers] = useState<OnerepScanResultDataBrokerRow[]>([]);
   const [newBroker, setNewBroker] = useState<OnerepScanResultDataBrokerRow>({
+    // TODO: MNTOR-4153 use onerep_profile_id instead
+    // Using the onerep_scan_id  as a placeholder for the profile ID
+    onerep_scan_id: onerepProfileId,
     link: "",
     age: 30,
     data_broker: "",
@@ -46,7 +49,6 @@ const OnerepConfigPage = ({
     url: "",
     id: 0,
     onerep_scan_result_id: Math.floor(Math.random() * 2147483647),
-    onerep_scan_id: 0,
     data_broker_id: 0,
     created_at: new Date(),
     updated_at: new Date(),
@@ -69,8 +71,10 @@ const OnerepConfigPage = ({
   const fetchBrokers = async () => {
     setBrokersFetchHappened(false);
     try {
+      // TODO: MNTOR-4153 use onerep_profile_id instead
+      // Using the onerep_scan_id  as a placeholder for the profile ID
       const response = await fetch(
-        `${endpointBase}?onerep_scan_result_id=${onerepProfileId}`,
+        `${endpointBase}?onerep_scan_id=${onerepProfileId}`,
       );
       const data = await response.json();
       setBrokers(data);
@@ -86,9 +90,12 @@ const OnerepConfigPage = ({
       | React.ChangeEvent<HTMLSelectElement>,
   ) => {
     const { name, value } = e.target;
+    const updatedValue =
+      name === "last_optout_at" ? (value ? new Date(value) : null) : value;
+
     setNewBroker({
       ...newBroker,
-      [name]: name === "manually_resolved" ? value === "true" : value,
+      [name]: name === "manually_resolved" ? value === "true" : updatedValue,
     });
   };
 
@@ -361,6 +368,9 @@ const OnerepConfigPage = ({
                   <option value="new">New</option>
                   <option value="optout_in_progress">In Progress</option>
                   <option value="removed">Removed</option>
+                  <option value="waiting_for_verification">
+                    Requested Removal
+                  </option>
                 </select>
               </label>
 
@@ -401,8 +411,11 @@ const OnerepConfigPage = ({
                   className={styles.input}
                   type="date"
                   name="last_optout_at"
-                  placeholder={new Date().toISOString().split("T")[0]}
-                  value={newBroker.last_optout_at?.toDateString()}
+                  value={
+                    newBroker.last_optout_at
+                      ? newBroker.last_optout_at.toISOString().split("T")[0]
+                      : ""
+                  }
                   onChange={handleChange}
                 />
               </label>

src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/fix/data-broker-profiles/removal-under-maintenance/page.tsx

@@ -48,7 +48,7 @@ export default async function RemovalUnderMaintenance() {
     process.env.NODE_ENV !== "production";
 
   const scanResultsWithRemovalUnderMaintenance = useMockedScans
-    ? await getMockedScanResultsWithBrokerUnderMaintenance()
+    ? await getMockedScanResultsWithBrokerUnderMaintenance(profileId)
     : await getScanResultsWithBrokerUnderMaintenance(profileId);
 
   const scanResults = useMockedScans

src/app/api/v1/admin/qa-customs/onerep/route.ts

@@ -17,6 +17,7 @@ import {
 } from "../../../../../../db/tables/qa_customs";
 import { getServerSession } from "../../../../../functions/server/getServerSession";
 import { OnerepScanResultDataBrokerRow } from "knex/types/tables";
+import { getOnerepProfileId } from "../../../../../../db/tables/subscribers";
 
 function successResponse() {
   return NextResponse.json(
@@ -54,7 +55,17 @@ export async function GET() {
   const prodErr = errorIfProduction();
   if (prodErr !== null) return prodErr;
 
-  return NextResponse.json(await getAllMockedScanResults());
+  const session = await getServerSession();
+  const email = session?.user.email;
+
+  const subscriberId = session?.user.subscriber?.id;
+  if (!session || !email || !subscriberId) return unauthError();
+
+  const onerepProfileId = await getOnerepProfileId(subscriberId);
+  if (!onerepProfileId)
+    return internalServerError("Unable to fetch OneRep profile ID");
+
+  return NextResponse.json(await getAllMockedScanResults(onerepProfileId));
 }
 
 export async function POST(req: NextRequest) {
@@ -85,6 +96,7 @@ export async function POST(req: NextRequest) {
   const scan_result_status = body.scan_result_status || "new";
   const broker_status = body.broker_status || "active";
   const url = "";
+  const onerep_scan_id = body.onerep_scan_id;
 
   const brokerData: OnerepScanResultDataBrokerRow = {
     link,
@@ -101,11 +113,11 @@ export async function POST(req: NextRequest) {
     manually_resolved,
     optout_attempts,
     last_optout_at,
-    scan_result_status: scan_result_status,
-    broker_status: broker_status,
-    url: url,
+    scan_result_status,
+    broker_status,
+    url,
     id: 0,
-    onerep_scan_id: 0,
+    onerep_scan_id,
     data_broker_id: 0,
     created_at: new Date(),
     updated_at: new Date(),

src/db/tables/onerep_scans.ts

@@ -18,7 +18,7 @@ import {
 } from "knex/types/tables";
 import { RemovalStatus } from "../../app/functions/universal/scanResult.js";
 import { CONST_DAY_MILLISECONDS } from "../../constants.ts";
-import { getAllMockedScanResults, getQaToggleRow } from "./qa_customs.ts";
+import { getAllMockedScanResults } from "./qa_customs.ts";
 
 const knex = createDbConnection();
 
@@ -159,43 +159,20 @@ async function getLatestOnerepScanResults(
   onerepProfileId: number | null,
 ): Promise<LatestOnerepScanDataOld> {
   const scan = await getLatestOnerepScan(onerepProfileId);
-
   let results: OnerepScanResultRow[] = [];
 
-  if (scan !== null) {
-    const qaToggles = await getQaToggleRow(onerepProfileId);
-    let showCustomBrokers = false;
-    let showRealBrokers = true;
-
-    if (qaToggles) {
-      showCustomBrokers = qaToggles.show_custom_brokers;
-      showRealBrokers = qaToggles.show_real_brokers;
-    }
-
-    const qaBrokers = !showCustomBrokers ? [] : await getAllMockedScanResults();
-    if (!showRealBrokers) {
-      logger.info("get_latest_results_custom_brokers", {
-        onerepProfileId,
-        onerepScanId: scan?.onerep_scan_id,
-        qaBrokers,
-      });
-      results = qaBrokers;
-    } else {
-      // Fetch initial results from onerep_scan_results
-      const scanResults = (await knex("onerep_scan_results as sr")
-        .select(
-          "sr.*",
-          "s.created_at as scan_created_at",
-          "s.updated_at as scan_updated_at",
-        )
-        .distinctOn("link")
-        .where("onerep_profile_id", onerepProfileId)
-        .innerJoin("onerep_scans as s", "sr.onerep_scan_id", "s.onerep_scan_id")
-        .orderBy("link")
-        .orderBy("onerep_scan_result_id", "desc")) as OnerepScanResultRow[];
-      results = [...scanResults];
-    }
-  }
+  const scanResults = (await knex("onerep_scan_results as sr")
+    .select(
+      "sr.*",
+      "s.created_at as scan_created_at",
+      "s.updated_at as scan_updated_at",
+    )
+    .distinctOn("link")
+    .where("onerep_profile_id", onerepProfileId)
+    .innerJoin("onerep_scans as s", "sr.onerep_scan_id", "s.onerep_scan_id")
+    .orderBy("link")
+    .orderBy("onerep_scan_result_id", "desc")) as OnerepScanResultRow[];
+  results = [...scanResults];
 
   return {
     scan: scan ?? null,
@@ -501,15 +478,25 @@ async function getMockedScanResults(
 
   const scan = await getLatestOnerepScan(onerepProfileId);
   const scanResults: OnerepScanResultDataBrokerRow[] | OnerepScanResultRow[] =
-    await getAllMockedScanResults();
+    await getAllMockedScanResults(onerepProfileId);
 
   return { scan: scan ?? null, results: scanResults } as LatestOnerepScanData;
 }
 
-async function getMockedScanResultsWithBrokerUnderMaintenance(): Promise<LatestOnerepScanData> {
+async function getMockedScanResultsWithBrokerUnderMaintenance(
+  onerepProfileId: number | null,
+): Promise<LatestOnerepScanData> {
+  if (onerepProfileId === null) {
+    return {
+      scan: null,
+      results: [],
+    } as LatestOnerepScanData;
+  }
+
   let scanResults = (await knex("qa_custom_brokers")
     .where("broker_status", "removal_under_maintenance")
     .where("manually_resolved", false)
+    .where("onerep_scan_id", onerepProfileId)
     .select("*")) as OnerepScanResultDataBrokerRow[];
 
   scanResults = scanResults.filter(

src/db/tables/qa_customs.ts

@@ -135,12 +135,22 @@ async function addQaCustomBroker(
   }
 }
 
-async function getAllMockedScanResults(): Promise<
-  OnerepScanResultDataBrokerRow[]
-> {
-  const res = (await knex("qa_custom_brokers").select(
-    "*",
-  )) as OnerepScanResultDataBrokerRow[];
+async function getAllMockedScanResults(
+  onerepProfileId: number | null,
+): Promise<OnerepScanResultDataBrokerRow[]> {
+  if (onerepProfileId === null) {
+    logger.error(`onerepProfileId not set`);
+  }
+
+  // TODO: MNTOR-4153 use onerep_profile_id instead
+  // Using the onerep_scan_id  as a placeholder for the profile ID
+  const res = (await knex("qa_custom_brokers")
+    .select("*")
+    .where(
+      "onerep_scan_id",
+      onerepProfileId,
+    )) as OnerepScanResultDataBrokerRow[];
+
   return res;
 }