Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: format create DB response #12

Merged
merged 3 commits into from
Jan 23, 2024
Merged

fix: format create DB response #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e06908d
fix: format `create` response
kevinmitch14 Jan 22, 2024
8163714
feat: format create response
notrab Jan 23, 2024
e2d56bd
refactor: ApiDatabaseResponse
notrab Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 38 additions & 20 deletions src/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,20 @@ export interface Database {
group?: string;
}

export interface ApiDatabaseResponse extends Database {
Name: string;
export interface ApiDatabaseResponse
extends Database,
ApiCreateDatabaseResponse {}

export interface ApiCreateDatabaseResponse {
DbId: string;
Hostname: string;
Name: string;
}

export interface DatabaseCreateResponse {
name: string;
id: string;
hostname: string;
}

export interface DatabaseInstanceUsageDetail {
Expand Down Expand Up @@ -76,7 +86,7 @@ export class DatabaseClient {
async create(
dbName: string,
options?: {
image: "latest" | "canary";
image?: "latest" | "canary";
group?: string;
seed?: {
type: "database" | "dump";
Expand All @@ -85,7 +95,7 @@ export class DatabaseClient {
timestamp?: string | Date;
};
}
): Promise<Database> {
): Promise<DatabaseCreateResponse> {
if (options?.seed) {
if (options.seed.type === "database" && !options.seed.name) {
throw new Error("Seed name is required when type is 'database'");
Expand All @@ -99,22 +109,20 @@ export class DatabaseClient {
options.seed.timestamp = this.formatDateParameter(options.seed.timestamp);
}

const response = await TursoClient.request<{ database: Database }>(
`organizations/${this.config.org}/databases`,
this.config,
{
method: "POST",
headers: {
"content-type": "application/json",
},
body: JSON.stringify({
name: dbName,
...options,
}),
}
);

return response.database;
const response = await TursoClient.request<{
database: ApiCreateDatabaseResponse;
}>(`organizations/${this.config.org}/databases`, this.config, {
method: "POST",
headers: {
"content-type": "application/json",
},
body: JSON.stringify({
name: dbName,
...options,
}),
});

return this.formatCreateResponse(response.database);
}

async updateVersion(dbName: string): Promise<void> {
Expand Down Expand Up @@ -244,4 +252,14 @@ export class DatabaseClient {
group: db.group,
};
}

private formatCreateResponse(
db: ApiCreateDatabaseResponse
): DatabaseCreateResponse {
return {
id: db.DbId,
hostname: db.Hostname,
name: db.Name,
};
}
}