hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
Details

Browse source
This commit is contained in:
harid 2025-11-17 11:14:32 +07:00
commit 2462128f22
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/MainController.ts
View file

@ -36,14 +36,14 @@ export class MainController extends Controller {
*/ */
@Get("main/person") @Get("main/person")
async getMainPerson() { async getMainPerson() {
const bloodGroups = await this.bloodGroupRepo.find(); const bloodGroups = await this.bloodGroupRepo.find({order: { name: "ASC" }});
const genders = await this.genderRepo.find(); const genders = await this.genderRepo.find({order: { name: "ASC" }});
const prefixs = await this.prefixeRepo.find(); const prefixs = await this.prefixeRepo.find({order: { name: "ASC" }});
const relationships = await this.relationshipRepo.find(); const relationships = await this.relationshipRepo.find({order: { name: "ASC" }});
const religions = await this.religionRepo.find(); const religions = await this.religionRepo.find({order: { name: "ASC" }});
const rank = await this.rankRepo.find(); const rank = await this.rankRepo.find({order: { name: "ASC" }});
const educationLevels = await this.educationLevelRepo.find(); const educationLevels = await this.educationLevelRepo.find({order: { rank: "ASC" }});
const provinces = await this.provinceRepo.find(); const provinces = await this.provinceRepo.find({order: { name: "ASC" }});
return new HttpSuccess({ return new HttpSuccess({
bloodGroups, bloodGroups,

4
src/database/data-source.ts
View file

@ -47,7 +47,9 @@ export const AppDataSource = new DataSource({
logging: true, logging: true,
// timezone: "Z", // timezone: "Z",
entities: entities:
process.env.NODE_ENV !== "production" ? ["src/entities/*.ts"] : ["dist/entities/*{.ts,.js}"], process.env.NODE_ENV !== "production"
? ["src/entities/**/*.ts"]
: ["dist/entities/**/*{.ts,.js}"],
migrations: migrations:
process.env.NODE_ENV !== "production" process.env.NODE_ENV !== "production"
? ["src/migration/**/*.ts"] ? ["src/migration/**/*.ts"]