Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// SPDX-License-Identifier: FSL-1.1-MIT
import type { MigrationInterface, QueryRunner } from 'typeorm';

export class PrivateAddressBookAttributionToUserId1778000000000
implements MigrationInterface
{
public async up(queryRunner: QueryRunner): Promise<void> {
// Pre-prod: drop wallet-string actor columns; OIDC users have no wallet.
// Identity is now derived from existing user FKs.

await queryRunner.query(`
ALTER TABLE user_address_book_items
DROP COLUMN created_by;
`);

await queryRunner.query(`
ALTER TABLE address_book_requests
DROP COLUMN requested_by_wallet,
DROP COLUMN reviewed_by;
`);

await queryRunner.query(`
ALTER TABLE address_book_requests
ADD COLUMN reviewed_by integer;
`);

await queryRunner.query(`
ALTER TABLE address_book_requests
ADD CONSTRAINT "FK_ABR_reviewed_by"
FOREIGN KEY (reviewed_by) REFERENCES users(id) ON DELETE SET NULL;
`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE address_book_requests
DROP CONSTRAINT "FK_ABR_reviewed_by";
`);

await queryRunner.query(`
ALTER TABLE address_book_requests
DROP COLUMN reviewed_by;
`);

await queryRunner.query(`
ALTER TABLE address_book_requests
ADD COLUMN requested_by_wallet varchar(42),
ADD COLUMN reviewed_by varchar(42);
`);

await queryRunner.query(`
ALTER TABLE user_address_book_items
ADD COLUMN created_by varchar(42);
`);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
} from 'typeorm';
import type { Address } from 'viem';
import { databaseAddressTransformer } from '@/domain/common/transformers/databaseAddress.transformer';
import { nullableDatabaseAddressTransformer } from '@/domain/common/transformers/nullableDatabaseAddress.transformer';
import { databaseEnumTransformer } from '@/domain/common/utils/enum';
import { Space } from '@/modules/spaces/datasources/entities/space.entity.db';
import { ADDRESS_BOOK_NAME_MAX_LENGTH } from '@/modules/spaces/domain/address-books/entities/address-book-item.entity';
Expand Down Expand Up @@ -67,15 +66,6 @@ export class AddressBookRequest implements DomainAddressBookRequest {
})
public readonly chainIds!: Array<string>;

@Column({
name: 'requested_by_wallet',
type: 'varchar',
length: 42,
nullable: false,
transformer: databaseAddressTransformer,
})
requestedByWallet!: Address;

@Column({
name: 'address',
type: 'varchar',
Expand All @@ -99,12 +89,10 @@ export class AddressBookRequest implements DomainAddressBookRequest {

@Column({
name: 'reviewed_by',
type: 'varchar',
length: 42,
type: 'integer',
nullable: true,
transformer: nullableDatabaseAddressTransformer,
})
reviewedBy!: Address | null;
reviewedBy!: number | null;

@Column({
name: 'created_at',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,6 @@ export class UserAddressBookItem implements DomainUserAddressBookItem {
})
public readonly creator!: User;

@Column({
name: 'created_by',
type: 'varchar',
length: 42,
nullable: false,
transformer: databaseAddressTransformer,
})
createdBy!: Address;

@Column({
name: 'chain_ids',
type: 'varchar',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: FSL-1.1-MIT

import type { Address } from 'viem';
import type { AddressBookItem } from '@/modules/spaces/domain/address-books/entities/address-book-item.entity';
import type {
AddressBookRequest,
Expand Down Expand Up @@ -33,15 +32,14 @@ export interface IAddressBookRequestsRepository {
create(args: {
spaceId: Space['id'];
requestedById: User['id'];
requestedByWallet: Address;
item: AddressBookItem;
}): Promise<AddressBookRequest>;

transitionFromPending(args: {
id: AddressBookRequest['id'];
spaceId: Space['id'];
toStatus: 'APPROVED' | 'REJECTED';
reviewedBy: Address;
reviewedBy: User['id'];
}): Promise<boolean>;

revertToPending(args: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import { Injectable, NotFoundException } from '@nestjs/common';
import type { FindOptionsWhere, InsertResult } from 'typeorm';
import type { Address } from 'viem';
import { PostgresDatabaseService } from '@/datasources/db/v2/postgres-database.service';
import { isUniqueConstraintError } from '@/datasources/errors/helpers/is-unique-constraint-error.helper';
import { UniqueConstraintError } from '@/datasources/errors/unique-constraint-error';
Expand Down Expand Up @@ -81,7 +80,6 @@ export class AddressBookRequestsRepository
public async create(args: {
spaceId: Space['id'];
requestedById: User['id'];
requestedByWallet: Address;
item: AddressBookItem;
}): Promise<AddressBookRequest> {
const repository = await this.db.getRepository(DbAddressBookRequest);
Expand All @@ -90,7 +88,6 @@ export class AddressBookRequestsRepository
result = await repository.insert({
space: { id: args.spaceId },
requestedBy: { id: args.requestedById },
requestedByWallet: args.requestedByWallet,
address: args.item.address,
name: args.item.name,
chainIds: args.item.chainIds,
Expand All @@ -112,7 +109,7 @@ export class AddressBookRequestsRepository
id: AddressBookRequest['id'];
spaceId: Space['id'];
toStatus: 'APPROVED' | 'REJECTED';
reviewedBy: Address;
reviewedBy: User['id'];
}): Promise<boolean> {
const repository = await this.db.getRepository(DbAddressBookRequest);
const result = await repository.update(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,20 @@ export const AddressBookRequestSchema: z.ZodType<
z.infer<typeof RowSchema> & {
space: Space;
requestedBy: User;
requestedByWallet: Address;
chainIds: Array<string>;
address: Address;
name: string;
status: keyof typeof AddressBookRequestStatus;
reviewedBy: Address | null;
reviewedBy: number | null;
}
> = RowSchema.extend({
space: z.lazy(() => SpaceSchema),
requestedBy: z.lazy(() => UserSchema),
requestedByWallet: AddressSchema as z.ZodType<Address>,
chainIds: z.array(z.string()),
address: AddressSchema as z.ZodType<Address>,
name: makeNameSchema({ maxLength: ADDRESS_BOOK_NAME_MAX_LENGTH }),
status: z.enum(getStringEnumKeys(AddressBookRequestStatus)),
reviewedBy: (AddressSchema as z.ZodType<Address>).nullable(),
reviewedBy: z.number().int().nullable(),
});

export type AddressBookRequest = z.infer<typeof AddressBookRequestSchema>;
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ export const UserAddressBookItemSchema: z.ZodType<
z.infer<typeof RowSchema> & {
space: Space;
creator: User;
createdBy: Address;
chainIds: Array<string>;
address: Address;
name: string;
}
> = RowSchema.extend({
space: z.lazy(() => SpaceSchema),
creator: z.lazy(() => UserSchema),
createdBy: AddressSchema as z.ZodType<Address>,
chainIds: z.array(z.string()),
address: AddressSchema as z.ZodType<Address>,
name: makeNameSchema({ maxLength: ADDRESS_BOOK_NAME_MAX_LENGTH }),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: FSL-1.1-MIT

import type { Address } from 'viem';
import type { AddressBookItem } from '@/modules/spaces/domain/address-books/entities/address-book-item.entity';
import type { UserAddressBookItem } from '@/modules/spaces/domain/address-books/entities/user-address-book-item.entity';
import type { Space } from '@/modules/spaces/domain/entities/space.entity';
Expand All @@ -25,7 +24,6 @@ export interface IUserAddressBookItemsRepository {
upsertMany(args: {
spaceId: Space['id'];
creatorId: User['id'];
signerAddress: Address;
items: Array<AddressBookItem>;
}): Promise<Array<UserAddressBookItem>>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { BadRequestException, Inject, Injectable } from '@nestjs/common';
import { type EntityManager, In } from 'typeorm';
import { type Address, isAddressEqual } from 'viem';
import { isAddressEqual } from 'viem';
import { IConfigurationService } from '@/config/configuration.service.interface';
import { PostgresDatabaseService } from '@/datasources/db/v2/postgres-database.service';
import { UserAddressBookItem as DbUserAddressBookItem } from '@/modules/spaces/datasources/entities/user-address-book-item.entity.db';
Expand Down Expand Up @@ -55,7 +55,6 @@ export class UserAddressBookItemsRepository
public async upsertMany(args: {
spaceId: Space['id'];
creatorId: User['id'];
signerAddress: Address;
items: Array<AddressBookItem>;
}): Promise<Array<UserAddressBookItem>> {
const repository = await this.db.getRepository(DbUserAddressBookItem);
Expand Down Expand Up @@ -84,7 +83,6 @@ export class UserAddressBookItemsRepository
newItems.map((item) => ({
space: { id: args.spaceId },
creator: { id: args.creatorId },
createdBy: args.signerAddress,
address: item.address,
name: item.name,
chainIds: item.chainIds,
Expand Down
Loading