mirror of
https://github.com/spacebarchat/server.git
synced 2026-05-11 08:17:04 +00:00
Clean up BaseClient assign call
This commit is contained in:
@@ -3,32 +3,8 @@ import { BaseEntity, EntityMetadata, ObjectIdColumn, PrimaryColumn, FindOptionsW
|
||||
import { Snowflake } from "../util/Snowflake";
|
||||
|
||||
export class BaseClassWithoutId extends BaseEntity {
|
||||
constructor(props?: any) {
|
||||
constructor() {
|
||||
super();
|
||||
if(props != undefined && props != null && Object.keys(props).length > 0)
|
||||
this.assign(props);
|
||||
}
|
||||
|
||||
assign(props: any = {}) {
|
||||
//console.log(`assign (${typeof this})...`)
|
||||
delete props.opts;
|
||||
delete props.props;
|
||||
// will not include relational properties
|
||||
console.warn("WARNING: BaseClass.assign called! This will probably fail!");
|
||||
console.warn(this)
|
||||
Object.assign(this,props);
|
||||
if(/--debug|--inspect/.test(process.execArgv.join(' '))) debugger;
|
||||
/*for (const key in props) {
|
||||
// @ts-ignore
|
||||
const setter = this[`set${key.capitalize()}`]; // use setter function if it exists
|
||||
|
||||
if (setter) {
|
||||
setter.call(this, props[key]);
|
||||
} else {
|
||||
// @ts-ignore
|
||||
this[key] = props[key];
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,10 +14,9 @@ export class BaseClass extends BaseClassWithoutId {
|
||||
@PrimaryIdColumn()
|
||||
id: string;
|
||||
|
||||
assign(props: any = {}) {
|
||||
super.assign(props);
|
||||
constructor() {
|
||||
super();
|
||||
if (!this.id) this.id = Snowflake.generate();
|
||||
return this;
|
||||
}
|
||||
|
||||
save(options?: SaveOptions | undefined): Promise<this> {
|
||||
|
||||
Reference in New Issue
Block a user