fix(server,web): correctly show album level like (#4916)

* fix: like in global activity

* refactor: rename isGlobal to ReactionLevel.Album

* chore: open api

* chore: e2e test for album vs comment duplicate like checking

---------

Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
This commit is contained in:
martin
2023-11-10 03:32:31 +01:00
committed by GitHub
parent 986bbfa831
commit 92ec1ce77f
21 changed files with 262 additions and 26 deletions
@@ -6,10 +6,9 @@ import { ActivityEntity } from '../entities/activity.entity';
export interface ActivitySearch {
albumId?: string;
assetId?: string;
assetId?: string | null;
userId?: string;
isLiked?: boolean;
isGlobal?: boolean;
}
@Injectable()
@@ -17,11 +16,11 @@ export class ActivityRepository implements IActivityRepository {
constructor(@InjectRepository(ActivityEntity) private repository: Repository<ActivityEntity>) {}
search(options: ActivitySearch): Promise<ActivityEntity[]> {
const { userId, assetId, albumId, isLiked, isGlobal } = options;
const { userId, assetId, albumId, isLiked } = options;
return this.repository.find({
where: {
userId,
assetId: isGlobal ? IsNull() : assetId,
assetId: assetId === null ? IsNull() : assetId,
albumId,
isLiked,
},