sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: prefix Mi for all entities (#11719)

Browse Source 
* wip

* wip

* wip

* wip

* Update RepositoryModule.ts

* wip

* wip

* wip

* Revert "wip"

This reverts commit c1c13b37d2.
This commit is contained in:
syuilo
2023-08-16 17:51:28 +09:00
committed by GitHub
parent 9264ca336b
commit 792622aead
229 changed files with 1990 additions and 1990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/backend/src/core/MetaService.ts
View File

@@ -7,7 +7,7 @@ import { Inject, Injectable } from '@nestjs/common';
import { DataSource } from 'typeorm';
import * as Redis from 'ioredis';
import { DI } from '@/di-symbols.js';
import { Meta } from '@/models/entities/Meta.js';
import { MiMeta } from '@/models/entities/Meta.js';
import { GlobalEventService } from '@/core/GlobalEventService.js';
import { bindThis } from '@/decorators.js';
import { StreamMessages } from '@/server/api/stream/types.js';
@@ -15,7 +15,7 @@ import type { OnApplicationShutdown } from '@nestjs/common';
@Injectable()
export class MetaService implements OnApplicationShutdown {
private cache: Meta | undefined;
private cache: MiMeta | undefined;
private intervalId: NodeJS.Timer;
constructor(
@@ -59,12 +59,12 @@ export class MetaService implements OnApplicationShutdown {
}
@bindThis
public async fetch(noCache = false): Promise<Meta> {
public async fetch(noCache = false): Promise<MiMeta> {
if (!noCache && this.cache) return this.cache;
return await this.db.transaction(async transactionalEntityManager => {
// 過去のバグでレコードが複数出来てしまっている可能性があるので新しいIDを優先する
const metas = await transactionalEntityManager.find(Meta, {
const metas = await transactionalEntityManager.find(MiMeta, {
order: {
id: 'DESC',
},
@@ -79,13 +79,13 @@ export class MetaService implements OnApplicationShutdown {
// metaが空のときfetchMetaが同時に呼ばれるとここが同時に呼ばれてしまうことがあるのでフェイルセーフなupsertを使う
const saved = await transactionalEntityManager
.upsert(
Meta,
MiMeta,
{
id: 'x',
},
['id'],
)
.then((x) => transactionalEntityManager.findOneByOrFail(Meta, x.identifiers[0]));
.then((x) => transactionalEntityManager.findOneByOrFail(MiMeta, x.identifiers[0]));
this.cache = saved;
return saved;
@@ -94,9 +94,9 @@ export class MetaService implements OnApplicationShutdown {
}
@bindThis
public async update(data: Partial<Meta>): Promise<Meta> {
public async update(data: Partial<MiMeta>): Promise<MiMeta> {
const updated = await this.db.transaction(async transactionalEntityManager => {
const metas = await transactionalEntityManager.find(Meta, {
const metas = await transactionalEntityManager.find(MiMeta, {
order: {
id: 'DESC',
},
@@ -105,9 +105,9 @@ export class MetaService implements OnApplicationShutdown {
const meta = metas[0];
if (meta) {
await transactionalEntityManager.update(Meta, meta.id, data);
await transactionalEntityManager.update(MiMeta, meta.id, data);
const metas = await transactionalEntityManager.find(Meta, {
const metas = await transactionalEntityManager.find(MiMeta, {
order: {
id: 'DESC',
},
@@ -115,7 +115,7 @@ export class MetaService implements OnApplicationShutdown {
return metas[0];
} else {
return await transactionalEntityManager.save(Meta, data);
return await transactionalEntityManager.save(MiMeta, data);
}
});