mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-10-27 20:44:07 +00:00
0ca70e9d43
Summary: Removing `createNewConnection` method that was used in tests to create a "scoped" version of `HomeDbManager`. Currently this won't work as there are many methods (like `Users.findOne`) that are using the default (global) connection. Additionally `HomeDBManger` had couple of bugs that were causing locks, which manifested themselves in postgresql tests (that are not serializing transactions). Repository methods like `Users.findOne` or `user.save()`, even when wrapped in transaction were using a separate connection from the pool (and a separate transaction). Some tests in `UsersManager` are still skipped or refactored, as sinon's `fakeTimers` doesn't work well with postgresql driver (which is using `setTimout` a lot). Date mappings in `User` entity were fixed, they were using `SQLite` configuration only, which caused problems with postgresql database. Test Plan: Refactored. Reviewers: paulfitz Reviewed By: paulfitz Subscribers: paulfitz Differential Revision: https://phab.getgrist.com/D4342
84 lines
2.5 KiB
TypeScript
84 lines
2.5 KiB
TypeScript
import {UserOptions} from 'app/common/UserAPI';
|
|
import {nativeValues} from 'app/gen-server/lib/values';
|
|
import {makeId} from 'app/server/lib/idUtils';
|
|
import {BaseEntity, BeforeInsert, Column, Entity, JoinTable, ManyToMany, OneToMany, OneToOne,
|
|
PrimaryGeneratedColumn} from "typeorm";
|
|
|
|
import {Group} from "./Group";
|
|
import {Login} from "./Login";
|
|
import {Organization} from "./Organization";
|
|
import {Pref} from './Pref';
|
|
|
|
@Entity({name: 'users'})
|
|
export class User extends BaseEntity {
|
|
|
|
@PrimaryGeneratedColumn()
|
|
public id: number;
|
|
|
|
@Column({type: String})
|
|
public name: string;
|
|
|
|
@Column({name: 'api_key', type: String, nullable: true})
|
|
// Found how to make a type nullable in this discussion: https://github.com/typeorm/typeorm/issues/2567
|
|
// todo: adds constraint for api_key not to equal ''
|
|
public apiKey: string | null;
|
|
|
|
@Column({name: 'picture', type: String, nullable: true})
|
|
public picture: string | null;
|
|
|
|
@Column({name: 'first_login_at', type: nativeValues.dateTimeType, nullable: true})
|
|
public firstLoginAt: Date | null;
|
|
|
|
@Column({name: 'last_connection_at', type: nativeValues.dateTimeType, nullable: true})
|
|
public lastConnectionAt: Date | null;
|
|
|
|
@OneToOne(type => Organization, organization => organization.owner)
|
|
public personalOrg: Organization;
|
|
|
|
@OneToMany(type => Login, login => login.user)
|
|
public logins: Login[];
|
|
|
|
@OneToMany(type => Pref, pref => pref.user)
|
|
public prefs: Pref[];
|
|
|
|
@ManyToMany(type => Group)
|
|
@JoinTable({
|
|
name: 'group_users',
|
|
joinColumn: {name: 'user_id'},
|
|
inverseJoinColumn: {name: 'group_id'}
|
|
})
|
|
public groups: Group[];
|
|
|
|
@Column({name: 'is_first_time_user', type: Boolean, default: false})
|
|
public isFirstTimeUser: boolean;
|
|
|
|
@Column({name: 'options', type: nativeValues.jsonEntityType, nullable: true})
|
|
public options: UserOptions | null;
|
|
|
|
@Column({name: 'connect_id', type: String, nullable: true})
|
|
public connectId: string | null;
|
|
|
|
/**
|
|
* Unique reference for this user. Primarily used as an ownership key in a cell metadata (comments).
|
|
*/
|
|
@Column({name: 'ref', type: String, nullable: false})
|
|
public ref: string;
|
|
|
|
@BeforeInsert()
|
|
public async beforeInsert() {
|
|
if (!this.ref) {
|
|
this.ref = makeId();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get user's email. Returns undefined if logins has not been joined, or no login
|
|
* is available
|
|
*/
|
|
public get loginEmail(): string|undefined {
|
|
const login = this.logins && this.logins[0];
|
|
if (!login) { return undefined; }
|
|
return login.email;
|
|
}
|
|
}
|