Skip to content

Commit 82484e2

Browse files
chore: wip
1 parent 80b3fee commit 82484e2

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

storage/framework/core/actions/src/orm/generate-model.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,14 @@ async function writeModelRequest() {
158158
for (const otherModel of otherModelRelations) {
159159
fieldString += ` ${otherModel.foreignKey}: number\n `
160160

161-
fieldStringType += ` | '${otherModel.foreignKey}'`
162-
163-
if (keyCounterForeign < otherModelRelations.length - 1)
161+
if (keyCounter >= attributes.length - 1)
164162
fieldStringType += ' |'
165163

164+
fieldStringType += `'${otherModel.foreignKey}'`
165+
166+
// if (keyCounterForeign < otherModelRelations.length - 1)
167+
// fieldStringType += ' |'
168+
166169
fieldStringInt += `public ${otherModel.foreignKey} = 0\n`
167170

168171
keyCounterForeign++

storage/framework/orm/routes.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ await route.get('users', 'Actions/UserIndexOrmAction').middleware(['Auth'])
2525

2626
await route.patch('users/{id}', 'Actions/UserUpdateOrmAction').middleware(['Auth'])
2727

28-
await route.post('users', 'Actions/UserStoreOrmAction').middleware(['Auth', 'Api'])
28+
await route.post('users', 'Actions/UserStoreOrmAction').middleware(['Auth'])
2929

3030
await route.delete('users/{id}', 'Actions/UserDestroyOrmAction').middleware(['Auth'])
3131

3232
await route.get('users/{id}', 'Actions/UserShowOrmAction').middleware(['Auth'])
3333

34+
th'])
35+

storage/framework/types/requests.d.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ interface RequestDataAccessToken {
5555
}
5656
export interface AccessTokenRequestType extends Request {
5757
validate(): void
58-
get(key: 'id' |'name' |'token' |'plainTextToken' |'abilities' | 'team_id'): string | number | undefined;
58+
get(key: 'id' |'name' |'token' |'plainTextToken' |'abilities' |'team_id'): string | number | undefined;
5959
all(): RequestDataAccessToken
6060
id?: number
6161
name: string
@@ -85,7 +85,7 @@ interface RequestDataTeam {
8585
}
8686
export interface TeamRequestType extends Request {
8787
validate(): void
88-
get(key: 'id' |'name' |'companyName' |'email' |'billingEmail' |'status' |'description' |'path' |'isPersonal' | 'accesstoken_id'): string | number | undefined;
88+
get(key: 'id' |'name' |'companyName' |'email' |'billingEmail' |'status' |'description' |'path' |'isPersonal' |'accesstoken_id'): string | number | undefined;
8989
all(): RequestDataTeam
9090
id?: number
9191
name: string
@@ -112,7 +112,7 @@ interface RequestDataSubscriber {
112112
}
113113
export interface SubscriberRequestType extends Request {
114114
validate(): void
115-
get(key: 'id' |'subscribed' | 'user_id'): string | number | undefined;
115+
get(key: 'id' |'subscribed' |'user_id'): string | number | undefined;
116116
all(): RequestDataSubscriber
117117
id?: number
118118
subscribed: boolean
@@ -138,7 +138,7 @@ interface RequestDataDeployment {
138138
}
139139
export interface DeploymentRequestType extends Request {
140140
validate(): void
141-
get(key: 'id' |'commitSha' |'commitMessage' |'branch' |'status' |'executionTime' |'deployScript' |'terminalOutput' | 'user_id'): string | number | undefined;
141+
get(key: 'id' |'commitSha' |'commitMessage' |'branch' |'status' |'executionTime' |'deployScript' |'terminalOutput' |'user_id'): string | number | undefined;
142142
all(): RequestDataDeployment
143143
id?: number
144144
commitSha: string
@@ -186,7 +186,7 @@ interface RequestDataUser {
186186
}
187187
export interface UserRequestType extends Request {
188188
validate(): void
189-
get(key: 'id' |'name' |'email' |'jobTitle' |'password' | 'deployment_id' | | 'post_id'): string | number | undefined;
189+
get(key: 'id' |'name' |'email' |'jobTitle' |'password' |'deployment_id' |'post_id'): string | number | undefined;
190190
all(): RequestDataUser
191191
id?: number
192192
name: string
@@ -211,7 +211,7 @@ interface RequestDataPost {
211211
}
212212
export interface PostRequestType extends Request {
213213
validate(): void
214-
get(key: 'id' |'title' |'body' | 'user_id'): string | number | undefined;
214+
get(key: 'id' |'title' |'body' |'user_id'): string | number | undefined;
215215
all(): RequestDataPost
216216
id?: number
217217
title: string

0 commit comments

Comments
 (0)