Skip to content

Commit

Permalink
chore: wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@glennmichael123
glennmichael123 committed Feb 6, 2025
1 parent 52ed97c commit 1b1adf4
Show file tree
Hide file tree
Showing 18 changed files with 198 additions and 666 deletions.
48 changes: 11 additions & 37 deletions storage/framework/core/orm/src/generate.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -971,9 +971,7 @@ export async function generateModelString(
if (!model)
return undefined
const result = await this.mapWith(model)
const data = new ${modelName}Model(result as ${modelName}Type)
const data = new ${modelName}Model(model as ${modelName}Type)
cache.getOrSet(\`${formattedModelName}:\${id}\`, JSON.stringify(model))
Expand All @@ -999,9 +997,7 @@ export async function generateModelString(
if (! model)
return undefined
const result = await this.mapWith(model)
const data = new ${modelName}Model(result as ${modelName}Type)
const data = new ${modelName}Model(model as ${modelName}Type)
return data
}
Expand All @@ -1022,9 +1018,7 @@ export async function generateModelString(
if (model === undefined)
throw new ModelNotFoundException(404, 'No ${modelName}Model results found for query')
const result = await this.mapWith(model)
const data = new ${modelName}Model(result as ${modelName}Type)
const data = new ${modelName}Model(model as ${modelName}Type)
return data
}
Expand Down Expand Up @@ -1054,7 +1048,7 @@ export async function generateModelString(
const data = await Promise.all(models.map(async (model: ${modelName}Type) => {
const instance = new ${modelName}Model(model)
return new ${modelName}Model(results)
return new ${modelName}Model(model)
}))
return data
Expand All @@ -1068,18 +1062,14 @@ export async function generateModelString(
static async findOrFail(id: number): Promise<${modelName}Model> {
const model = await DB.instance.selectFrom('${tableName}').where('id', '=', id).selectAll().executeTakeFirst()
const instance = new ${modelName}Model(null)
${instanceSoftDeleteStatementsSelectFrom}
if (model === undefined)
throw new ModelNotFoundException(404, \`No ${modelName}Model results for \${id}\`)
cache.getOrSet(\`${formattedModelName}:\${id}\`, JSON.stringify(model))
const result = await instance.mapWith(model)
const data = new ${modelName}Model(result as ${modelName}Type)
const data = new ${modelName}Model(model as ${modelName}Type)
return data
}
Expand Down Expand Up @@ -1277,11 +1267,7 @@ export async function generateModelString(
}
const data = await Promise.all(models.map(async (model: ${modelName}Model) => {
const instance = new ${modelName}Model(model)
const results = await instance.mapWith(model)
return new ${modelName}Model(results)
return new ${modelName}Model(model)
}))
return data
Expand Down Expand Up @@ -1843,9 +1829,7 @@ export async function generateModelString(
if (!model)
return undefined
const instance = new ${modelName}Model(null)
const result = await instance.mapWith(model)
const data = new ${modelName}Model(result as ${modelName}Type)
const data = new ${modelName}Model(model as ${modelName}Type)
return data
}
Expand All @@ -1859,9 +1843,7 @@ export async function generateModelString(
if (!model)
return undefined
const instance = new ${modelName}Model(null)
const result = await instance.mapWith(model)
const data = new ${modelName}Model(result as ${modelName}Type)
const data = new ${modelName}Model(model as ${modelName}Type)
return data
}
Expand All @@ -1886,9 +1868,7 @@ export async function generateModelString(
.executeTakeFirst()
if (existing${modelName}) {
const instance = new ${modelName}Model(null)
const result = await instance.mapWith(existing${modelName})
return new ${modelName}Model(result as ${modelName}Type)
return new ${modelName}Model(existing${modelName} as ${modelName}Type)
}
else {
return await this.create(new${modelName})
Expand Down Expand Up @@ -1932,11 +1912,9 @@ export async function generateModelString(
throw new HttpError(500, 'Failed to fetch updated record')
}
const result = await instance.mapWith(updated${modelName})
instance.hasSaved = true
return new ${modelName}Model(result as ${modelName}Type)
return new ${modelName}Model(updated${modelName} as ${modelName}Type)
} else {
// If not found, create a new record
return await this.create(new${modelName})
Expand Down Expand Up @@ -1970,11 +1948,7 @@ export async function generateModelString(
if (!model)
return undefined
const instance = new ${modelName}Model(null)
const result = await instance.mapWith(model)
const data = new ${modelName}Model(result as ${modelName}Type)
const data = new ${modelName}Model(model as ${modelName}Type)
return data
}
Expand Down
48 changes: 11 additions & 37 deletions storage/framework/orm/src/models/AccessToken.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,7 @@ export class AccessTokenModel {
if (!model)
return undefined

const result = await this.mapWith(model)

const data = new AccessTokenModel(result as AccessTokenType)
const data = new AccessTokenModel(model as AccessTokenType)

cache.getOrSet(`accesstoken:${id}`, JSON.stringify(model))

Expand All @@ -236,9 +234,7 @@ export class AccessTokenModel {
if (!model)
return undefined

const result = await this.mapWith(model)

const data = new AccessTokenModel(result as AccessTokenType)
const data = new AccessTokenModel(model as AccessTokenType)

return data
}
Expand All @@ -259,9 +255,7 @@ export class AccessTokenModel {
if (model === undefined)
throw new ModelNotFoundException(404, 'No AccessTokenModel results found for query')

const result = await this.mapWith(model)

const data = new AccessTokenModel(result as AccessTokenType)
const data = new AccessTokenModel(model as AccessTokenType)

return data
}
Expand Down Expand Up @@ -290,7 +284,7 @@ export class AccessTokenModel {
const data = await Promise.all(models.map(async (model: AccessTokenType) => {
const instance = new AccessTokenModel(model)

return new AccessTokenModel(results)
return new AccessTokenModel(model)
}))

return data
Expand All @@ -303,16 +297,12 @@ export class AccessTokenModel {
static async findOrFail(id: number): Promise<AccessTokenModel> {
const model = await DB.instance.selectFrom('personal_access_tokens').where('id', '=', id).selectAll().executeTakeFirst()

const instance = new AccessTokenModel(null)

if (model === undefined)
throw new ModelNotFoundException(404, `No AccessTokenModel results for ${id}`)

cache.getOrSet(`accesstoken:${id}`, JSON.stringify(model))

const result = await instance.mapWith(model)

const data = new AccessTokenModel(result as AccessTokenType)
const data = new AccessTokenModel(model as AccessTokenType)

return data
}
Expand Down Expand Up @@ -509,11 +499,7 @@ export class AccessTokenModel {
}

const data = await Promise.all(models.map(async (model: AccessTokenModel) => {
const instance = new AccessTokenModel(model)

const results = await instance.mapWith(model)

return new AccessTokenModel(results)
return new AccessTokenModel(model)
}))

return data
Expand Down Expand Up @@ -1094,9 +1080,7 @@ export class AccessTokenModel {
if (!model)
return undefined

const instance = new AccessTokenModel(null)
const result = await instance.mapWith(model)
const data = new AccessTokenModel(result as AccessTokenType)
const data = new AccessTokenModel(model as AccessTokenType)

return data
}
Expand All @@ -1110,9 +1094,7 @@ export class AccessTokenModel {
if (!model)
return undefined

const instance = new AccessTokenModel(null)
const result = await instance.mapWith(model)
const data = new AccessTokenModel(result as AccessTokenType)
const data = new AccessTokenModel(model as AccessTokenType)

return data
}
Expand All @@ -1137,9 +1119,7 @@ export class AccessTokenModel {
.executeTakeFirst()

if (existingAccessToken) {
const instance = new AccessTokenModel(null)
const result = await instance.mapWith(existingAccessToken)
return new AccessTokenModel(result as AccessTokenType)
return new AccessTokenModel(existingAccessToken as AccessTokenType)
}
else {
return await this.create(newAccessToken)
Expand Down Expand Up @@ -1183,11 +1163,9 @@ export class AccessTokenModel {
throw new HttpError(500, 'Failed to fetch updated record')
}

const result = await instance.mapWith(updatedAccessToken)

instance.hasSaved = true

return new AccessTokenModel(result as AccessTokenType)
return new AccessTokenModel(updatedAccessToken as AccessTokenType)
}
else {
// If not found, create a new record
Expand Down Expand Up @@ -1222,11 +1200,7 @@ export class AccessTokenModel {
if (!model)
return undefined

const instance = new AccessTokenModel(null)

const result = await instance.mapWith(model)

const data = new AccessTokenModel(result as AccessTokenType)
const data = new AccessTokenModel(model as AccessTokenType)

return data
}
Expand Down
48 changes: 11 additions & 37 deletions storage/framework/orm/src/models/Activity.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,7 @@ export class ActivityModel {
if (!model)
return undefined

const result = await this.mapWith(model)

const data = new ActivityModel(result as ActivityType)
const data = new ActivityModel(model as ActivityType)

cache.getOrSet(`activity:${id}`, JSON.stringify(model))

Expand All @@ -251,9 +249,7 @@ export class ActivityModel {
if (!model)
return undefined

const result = await this.mapWith(model)

const data = new ActivityModel(result as ActivityType)
const data = new ActivityModel(model as ActivityType)

return data
}
Expand All @@ -274,9 +270,7 @@ export class ActivityModel {
if (model === undefined)
throw new ModelNotFoundException(404, 'No ActivityModel results found for query')

const result = await this.mapWith(model)

const data = new ActivityModel(result as ActivityType)
const data = new ActivityModel(model as ActivityType)

return data
}
Expand Down Expand Up @@ -305,7 +299,7 @@ export class ActivityModel {
const data = await Promise.all(models.map(async (model: ActivityType) => {
const instance = new ActivityModel(model)

return new ActivityModel(results)
return new ActivityModel(model)
}))

return data
Expand All @@ -318,8 +312,6 @@ export class ActivityModel {
static async findOrFail(id: number): Promise<ActivityModel> {
const model = await DB.instance.selectFrom('activities').where('id', '=', id).selectAll().executeTakeFirst()

const instance = new ActivityModel(null)

if (instance.softDeletes) {
instance.selectFromQuery = instance.selectFromQuery.where('deleted_at', 'is', null)
}
Expand All @@ -329,9 +321,7 @@ export class ActivityModel {

cache.getOrSet(`activity:${id}`, JSON.stringify(model))

const result = await instance.mapWith(model)

const data = new ActivityModel(result as ActivityType)
const data = new ActivityModel(model as ActivityType)

return data
}
Expand Down Expand Up @@ -532,11 +522,7 @@ export class ActivityModel {
}

const data = await Promise.all(models.map(async (model: ActivityModel) => {
const instance = new ActivityModel(model)

const results = await instance.mapWith(model)

return new ActivityModel(results)
return new ActivityModel(model)
}))

return data
Expand Down Expand Up @@ -1144,9 +1130,7 @@ export class ActivityModel {
if (!model)
return undefined

const instance = new ActivityModel(null)
const result = await instance.mapWith(model)
const data = new ActivityModel(result as ActivityType)
const data = new ActivityModel(model as ActivityType)

return data
}
Expand All @@ -1160,9 +1144,7 @@ export class ActivityModel {
if (!model)
return undefined

const instance = new ActivityModel(null)
const result = await instance.mapWith(model)
const data = new ActivityModel(result as ActivityType)
const data = new ActivityModel(model as ActivityType)

return data
}
Expand All @@ -1187,9 +1169,7 @@ export class ActivityModel {
.executeTakeFirst()

if (existingActivity) {
const instance = new ActivityModel(null)
const result = await instance.mapWith(existingActivity)
return new ActivityModel(result as ActivityType)
return new ActivityModel(existingActivity as ActivityType)
}
else {
return await this.create(newActivity)
Expand Down Expand Up @@ -1233,11 +1213,9 @@ export class ActivityModel {
throw new HttpError(500, 'Failed to fetch updated record')
}

const result = await instance.mapWith(updatedActivity)

instance.hasSaved = true

return new ActivityModel(result as ActivityType)
return new ActivityModel(updatedActivity as ActivityType)
}
else {
// If not found, create a new record
Expand Down Expand Up @@ -1272,11 +1250,7 @@ export class ActivityModel {
if (!model)
return undefined

const instance = new ActivityModel(null)

const result = await instance.mapWith(model)

const data = new ActivityModel(result as ActivityType)
const data = new ActivityModel(model as ActivityType)

return data
}
Expand Down
Loading

0 comments on commit 1b1adf4

Please sign in to comment.