Skip to content

Commit e950cd5

Browse files
chore: wip
1 parent 5f8f9d8 commit e950cd5

File tree

7 files changed

+17
-4
lines changed

7 files changed

+17
-4
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ async function writeOrmActions(apiRoute: string, modelName: String): Promise<voi
203203

204204
if (apiRoute === 'store') {
205205
handleString += `async handle(request: ${modelName}RequestType) {
206+
request.validate()
206207
const model = await ${modelName}.create(request.all())
207208
208209
return model
@@ -213,6 +214,8 @@ async function writeOrmActions(apiRoute: string, modelName: String): Promise<voi
213214

214215
if (apiRoute === 'update') {
215216
handleString += `async handle(request: ${modelName}RequestType) {
217+
request.validate()
218+
216219
const id = request.getParam('id')
217220
218221
const model = await ${modelName}.findOrFail(Number(id))

storage/framework/core/router/src/router.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,8 @@ export class Router implements RouterInterface {
279279

280280
if (modulePath.includes('OrmAction')) importPathFunction = p.projectStoragePath
281281

282+
283+
282284
// Remove trailing .ts if present
283285
modulePath = modulePath.endsWith('.ts') ? modulePath.slice(0, -3) : modulePath
284286

storage/framework/core/validation/src/validator.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ interface RequestData {
99
}
1010

1111
export async function validateField(modelFile: string, params: RequestData): Promise<void> {
12-
const model = (await import(path.userModelsPath(modelFile))).default
1312

13+
console.log(params)
14+
const model = (await import(path.userModelsPath(modelFile))).default
1415
const attributes = model.attributes
1516

1617
const ruleObject: Record<string, SchemaTypes> = {}
@@ -19,20 +20,21 @@ export async function validateField(modelFile: string, params: RequestData): Pro
1920
for (const key in attributes) {
2021
// biome-ignore lint/suspicious/noPrototypeBuiltins: <explanation>
2122
if (attributes.hasOwnProperty(key)) {
22-
ruleObject[key] = model.attributes[key].validator.rule
23+
ruleObject[key] = attributes[key].validator.rule
2324

24-
const validatorMessages = model.attributes[key].validator.message
25+
const validatorMessages = attributes[key].validator.message
2526

2627
for (const validatorMessageKey in validatorMessages) {
2728
const validatorMessageString = `${key}.${validatorMessageKey}`
2829

29-
messageObject[validatorMessageString] = model.attributes[key].validator.message[validatorMessageKey]
30+
messageObject[validatorMessageString] = attributes[key].validator.message[validatorMessageKey]
3031
}
3132
}
3233
}
3334

3435
schema.messagesProvider = new SimpleMessagesProvider(messageObject)
3536

37+
console.log(ruleObject)
3638
try {
3739
const vineSchema = schema.object(ruleObject)
3840
const validator = schema.compile(vineSchema)

storage/framework/orm/Actions/SubscriberStoreOrmAction.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export default new Action({
77
description: 'Subscriber Store ORM Action',
88
method: 'POST',
99
async handle(request: SubscriberRequestType) {
10+
request.validate()
1011
const model = await Subscriber.create(request.all())
1112

1213
return model

storage/framework/orm/Actions/SubscriberUpdateOrmAction.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ export default new Action({
77
description: 'Subscriber Update ORM Action',
88
method: 'PATCH',
99
async handle(request: SubscriberRequestType) {
10+
request.validate()
11+
1012
const id = request.getParam('id')
1113

1214
const model = await Subscriber.findOrFail(Number(id))

storage/framework/orm/Actions/UserStoreOrmAction.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export default new Action({
77
description: 'User Store ORM Action',
88
method: 'POST',
99
async handle(request: UserRequestType) {
10+
request.validate()
1011
const model = await User.create(request.all())
1112

1213
return model

storage/framework/orm/Actions/UserUpdateOrmAction.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ export default new Action({
77
description: 'User Update ORM Action',
88
method: 'PATCH',
99
async handle(request: UserRequestType) {
10+
request.validate()
11+
1012
const id = request.getParam('id')
1113

1214
const model = await User.findOrFail(Number(id))

0 commit comments

Comments
 (0)