quietlight/skraak.app - Change ZYT3JRERMYXLMJHLPZYQHAINVMPQLBKGGN7A4C7OTVZDY42ZLTKQC

added a api/clusters route, simplified the api/locations route

Created by AEj8dahVWy718uSSFPe9VSRJ5qX5G8pC2zvFzJJ8yzBd on April 21, 2025

ZYT3JRERMYXLMJHLPZYQHAINVMPQLBKGGN7A4C7OTVZDY42ZLTKQC

Dependencies

In channels

main

Change contents

Replacement in src/worker/index.ts at line 5 [4.240196]

B:BD[3.124957] → [2.5513:5566]

import { dataset, location } from "../../db/schema";

[3.124957]

[5.9095]

import { dataset, location, cluster } from "../../db/schema";

Replacement in src/worker/index.ts at line 119 [4.240196]
B:BD[4.240328] → [2.5717:5750]
```
// Protected locations API route
```
[4.240328]
[2.5750]
```
// locations API route
```

Deletion in src/worker/index.ts at line 142 [4.240196]

B:BD[2.6479] → [2.6479:7218]

    // First, verify that the user owns the dataset
    console.log("Checking dataset ownership for datasetId:", datasetId);
    const datasetCheck = await db.select()
      .from(dataset)
      .where(eq(dataset.id, datasetId))
      .limit(1);
    
    console.log("Dataset check result:", datasetCheck);
      
    if (datasetCheck.length === 0) {
      console.log("Dataset not found:", datasetId);
      return c.json({
        error: "Dataset not found"
      }, 404);
    }
    
    if (datasetCheck[0].owner !== userId) {
      console.log("User doesn't own dataset. Owner:", datasetCheck[0].owner, "User:", userId);
      return c.json({
        error: "You don't have permission to access this dataset"
      }, 403);
    }

Insertion in src/worker/index.ts at line 149 [4.240196]

[2.7524]

    
    return c.json({
      data: results
    });
  } catch (error) {
    console.error("Error fetching locations:", error);
    return c.json(
      {
        error: "Failed to fetch locations",
        details: error instanceof Error ? error.message : String(error),
      },
      500
    );
  }
});
// locations API route
app.get("/api/clusters", authenticate, async (c) => {
  try {
    // Get the JWT payload (user info)
    const jwtPayload = (c as any).jwtPayload as JWTPayload;
    const userId = jwtPayload.sub; // Subject claim usually contains the user ID

Insertion in src/worker/index.ts at line 173 [4.240196]

[2.7529]

    // Get the cluster ID from query parameter
    const locationId = c.req.query("locationId");
    
    console.log("Cluster API called with locationId:", locationId, "userId:", userId);
    
    if (!locationId) {
      console.log("Missing locationId in request");
      return c.json({
        error: "Missing required query parameter: locationId"
      }, 400);
    }
    
    // Connect to the database
    const sql = neon(c.env.DATABASE_URL);
    const db = drizzle(sql);
    
    // Query clustears for the specified location
    console.log("Querying clusters for locationId:", locationId);
    const results = await db.select()
      .from(cluster)
      .where(eq(cluster.locationId, locationId));
    
    console.log("Found", results.length, "cluster for location", locationId);

Replacement in db/schema.ts at line 32 [3.50781]

B:BD[3.52719] → [3.52719:52968]

}, (table) => ({
  nameIdx: index("idx_dataset_name").on(table.name),
  ownerIdx: index("idx_dataset_owner").on(table.owner),
  activeIdx: index("idx_dataset_active").on(table.active),
  publicIdx: index("idx_dataset_public").on(table.public),
}));

[3.52719]

[3.52968]

}, (table) => ([
  index("idx_dataset_name").on(table.name),
  index("idx_dataset_owner").on(table.owner),
  index("idx_dataset_active").on(table.active),
  index("idx_dataset_public").on(table.public),
]));

Replacement in db/schema.ts at line 52 [3.50781]

B:BD[3.53773] → [3.53773:54066]

}, (table) => ({
  nameIdx: index("idx_location_name").on(table.name),
  datasetIdx: index("idx_location_dataset").on(table.datasetId),
  activeIdx: index("idx_location_active").on(table.active),
  datasetActiveIdx: index("idx_location_dataset_active").on(table.datasetId, table.active),
}));

[3.53773]

[3.54066]

}, (table) => ([
  index("idx_location_name").on(table.name),
  index("idx_location_dataset").on(table.datasetId),
  index("idx_location_active").on(table.active),
  index("idx_location_dataset_active").on(table.datasetId, table.active),
]));

Replacement in db/schema.ts at line 84 [3.50781]

B:BD[3.55535] → [3.55535:55869]

}, (table) => ({
  datasetIdx: index("idx_cluster_dataset").on(table.datasetId),
  activeIdx: index("idx_cluster_active").on(table.active),
  datasetActiveIdx: index("idx_cluster_dataset_active").on(table.datasetId, table.active),
  recordingPatternIdx: index("idx_cluster_recording_pattern").on(table.cyclicRecordingPatternId),
}));

[3.55535]

[3.55869]

}, (table) => ([
  index("idx_cluster_dataset").on(table.datasetId),
  index("idx_cluster_active").on(table.active),
  index("idx_cluster_dataset_active").on(table.datasetId, table.active),
  index("idx_cluster_recording_pattern").on(table.cyclicRecordingPatternId),
]));

Replacement in db/schema.ts at line 113 [3.50781]

B:BD[3.57180] → [3.57180:57634]

}, (table) => ({
  locationIdx: index("idx_file_location").on(table.locationId),
  activeIdx: index("idx_file_active").on(table.active),
  timestampLocalIdx: index("idx_file_timestamp_local").on(table.timestampLocal),
  clusterIdx: index("idx_file_cluster").on(table.clusterId),
  maybeSolarNightIdx: index("idx_file_maybe_solar_night").on(table.maybeSolarNight),
  maybeCivilNightIdx: index("idx_file_maybe_civil_night").on(table.maybeCivilNight),
}));

[3.57180]

[3.57634]

}, (table) => ([
  index("idx_file_location").on(table.locationId),
  index("idx_file_active").on(table.active),
  index("idx_file_timestamp_local").on(table.timestampLocal),
  index("idx_file_cluster").on(table.clusterId),
  index("idx_file_maybe_solar_night").on(table.maybeSolarNight),
  index("idx_file_maybe_civil_night").on(table.maybeCivilNight),
]));

Replacement in db/schema.ts at line 144 [3.50781]

B:BD[3.58826] → [3.58826:58907]

}, (table) => ({
  jsonIdx: index("idx_file_metadata_json").on(table.json),
}));

[3.58826]

[3.58907]

}, (table) => ([
  index("idx_file_metadata_json").on(table.json),
]));

Replacement in db/schema.ts at line 156 [3.50781]

B:BD[3.59455] → [3.59455:59668]

}, (table) => ({
  pk: primaryKey({columns: [table.fileId, table.datasetId]}),
  fileIdx: index("idx_file_dataset_file").on(table.fileId),
  datasetIdx: index("idx_file_dataset_dataset").on(table.datasetId),
}));

[3.59455]

[3.59668]

}, (table) => ([
  primaryKey({columns: [table.fileId, table.datasetId]}),
  index("idx_file_dataset_file").on(table.fileId),
  index("idx_file_dataset_dataset").on(table.datasetId),
]));

Replacement in db/schema.ts at line 183 [3.50781]

B:BD[3.60927] → [3.60927:61428]

}, (table) => ({
  fileIdx: index("idx_selection_file").on(table.fileId),
  datasetIdx: index("idx_selection_dataset").on(table.datasetId),
  activeIdx: index("idx_selection_active").on(table.active),
  approvedIdx: index("idx_selection_approved").on(table.approved),
  isSolarNightIdx: index("idx_selection_is_solar_night").on(table.isSolarNight),
  isCivilNightIdx: index("idx_selection_is_civil_night").on(table.isCivilNight),
  moonPhaseIdx: index("idx_selection_moon_phase").on(table.moonPhase),

[3.60927]

[3.61428]

}, (table) => ([
  index("idx_selection_file").on(table.fileId),
  index("idx_selection_dataset").on(table.datasetId),
  index("idx_selection_active").on(table.active),
  index("idx_selection_approved").on(table.approved),
  index("idx_selection_is_solar_night").on(table.isSolarNight),
  index("idx_selection_is_civil_night").on(table.isCivilNight),
  index("idx_selection_moon_phase").on(table.moonPhase),

Replacement in db/schema.ts at line 192 [3.50781]
B:BD[3.61482] → [3.61482:61512]
```
  fkFileDataset: foreignKey({
```
[3.61482]
[3.61512]
```
  foreignKey({
```
Replacement in db/schema.ts at line 197 [3.50781]
B:BD[3.61667] → [3.61667:61672]
```
}));
```
[3.61667]
[3.61672]
```
]));
```

Replacement in db/schema.ts at line 207 [3.50781]

B:BD[3.62170] → [3.62170:62256]

}, (table) => ({
  jsonIdx: index("idx_selection_metadata_json").on(table.json),
}));

[3.62170]

[3.62256]

}, (table) => ([
  index("idx_selection_metadata_json").on(table.json),
]));

Replacement in db/schema.ts at line 227 [3.50781]

B:BD[3.63119] → [3.63119:63224]

}, (table) => ({
  speciesCodeVersionUnique: unique().on(table.speciesCode, table.taxonomyVersion),
}));

[3.63119]

[3.63224]

}, (table) => ([
  unique().on(table.speciesCode, table.taxonomyVersion),
]));

Replacement in db/schema.ts at line 244 [3.50781]

B:BD[3.63953] → [3.63953:64086]

}, (table) => ({
  labelIdx: index("idx_species_label").on(table.label),
  ebirdIdx: index("idx_species_ebird").on(table.ebirdCode),

[3.63953]

[3.64086]

}, (table) => ([
  index("idx_species_label").on(table.label),
  index("idx_species_ebird").on(table.ebirdCode),

Replacement in db/schema.ts at line 248 [3.50781]
B:BD[3.64131] → [3.64131:64164]
```
  ebirdTaxonomyRef: foreignKey({
```
[3.64131]
[3.64164]
```
  foreignKey({
```
Replacement in db/schema.ts at line 252 [3.50781]
B:BD[3.64305] → [3.64305:64310]
```
}));
```
[3.64305]
[3.64310]
```
]));
```

Replacement in db/schema.ts at line 264 [3.50781]

B:BD[3.64912] → [3.64912:65058]

}, (table) => ({
  speciesIdx: index("idx_call_type_species").on(table.speciesId),
  labelIdx: index("idx_call_type_label").on(table.label),
}));

[3.64912]

[3.65058]

}, (table) => ([
  index("idx_call_type_species").on(table.speciesId),
  index("idx_call_type_label").on(table.label),
]));

Replacement in db/schema.ts at line 294 [3.50781]

B:BD[3.66437] → [3.66437:66599]

}, (table) => ({
  selectionIdIdx: index("idx_label_selection_id").on(table.selectionId),
  speciesIdIdx: index("idx_label_species_id").on(table.speciesId),
}));

[3.66437]

[3.66599]

}, (table) => ([
  index("idx_label_selection_id").on(table.selectionId),
  index("idx_label_species_id").on(table.speciesId),
]));

Replacement in db/schema.ts at line 319 [3.50781]

B:BD[3.67760] → [3.67760:67839]

}, (table) => ({
  fileIdx: index("idx_file_size_file").on(table.fileId),
}));

[3.67760]

[3.67839]

}, (table) => ([
  index("idx_file_size_file").on(table.fileId),
]));

Replacement in db/schema.ts at line 331 [3.50781]

B:BD[3.68400] → [3.68400:68631]

}, (table) => ({
  pk: primaryKey({columns: [table.speciesId, table.datasetId]}),
  speciesIdx: index("idx_species_dataset_species").on(table.speciesId),
  datasetIdx: index("idx_species_dataset_dataset").on(table.datasetId),
}));

[3.68400]

[3.68631]

}, (table) => ([
  primaryKey({columns: [table.speciesId, table.datasetId]}),
  index("idx_species_dataset_species").on(table.speciesId),
  index("idx_species_dataset_dataset").on(table.datasetId),
]));

Replacement in db/schema.ts at line 349 [3.50781]

B:BD[3.69329] → [3.69329:69507]

}, (table) => ({
  uniqueAccessGrant: unique().on(table.datasetId, table.role, table.permission, table.userId),
  uniqueRolePermission: uniqueIndex("idx_unique_role_permission")

[3.69329]

[3.69507]

}, (table) => ([
  unique().on(table.datasetId, table.role, table.permission, table.userId),
  uniqueIndex("idx_unique_role_permission")

Replacement in db/schema.ts at line 354 [3.50781]

B:BD[3.69596] → [3.69596:69928]

  datasetIdx: index("idx_access_grant_dataset").on(table.datasetId),
  roleIdx: index("idx_access_grant_role").on(table.role),
  permissionIdx: index("idx_access_grant_permission").on(table.permission),
  userIdx: index("idx_access_grant_user").on(table.userId),
  activeIdx: index("idx_access_grant_active").on(table.active),
}));

[3.69596]

[3.69928]

  index("idx_access_grant_dataset").on(table.datasetId),
  index("idx_access_grant_role").on(table.role),
  index("idx_access_grant_permission").on(table.permission),
  index("idx_access_grant_user").on(table.userId),
  index("idx_access_grant_active").on(table.active),
]));

Replacement in db/schema.ts at line 369 [3.50781]

B:BD[3.70392] → [3.70392:70470]

}, (table) => ({
  userRoleIdx: index("idx_user_role").on(table.userId),
}));

[3.70392]

}, (table) => ([
  index("idx_user_role").on(table.userId),
]));

Insertion in db/migrations.sql at line 666 [3.94401]

[3.123619]


-- Need an index on cluster(location) because I need to get all clusters for any given location