Skip to content

Clean unused db models and columns #3553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
isTravis wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Clean unused db models and columns #3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48f848a
First pass on removing dead code
isTravis Apr 5, 2026
06c4d06
Lint
isTravis Apr 5, 2026
d0e8fdc
Catch one miss
isTravis Apr 5, 2026
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
10 changes: 0 additions & 10 deletions client/components/PubShareDialog/PubShareDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,6 @@ const MembersOptions = (props: SharedProps) => {
{!!membersByType.community.length && activeTargetType !== 'community' && (
<InheritedMembersBlock members={membersByType.community} scope="Community" />
)}

{
// @ts-expect-error FIXME: Organization aren't really a thing anymore
!!membersByType.organization.length && activeTargetType !== 'organization' && (
<InheritedMembersBlock
members={membersByType.organization}
scope="Organization"
/>
)
}
</React.Fragment>
);
};
Expand Down
12 changes: 1 addition & 11 deletions client/containers/DashboardMembers/DashboardMembers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@ const DashboardMembers = (props: Props) => {

const hasInheritedMembers =
(membersByType.collection.length && activeTargetType !== 'collection') ||
(membersByType.community.length && activeTargetType !== 'community') ||
// @ts-expect-error FIXME: Organization aren't really a thing anymore
(membersByType.organization.length && activeTargetType !== 'organization');
(membersByType.community.length && activeTargetType !== 'community');

const membersContent = (
<>
Expand Down Expand Up @@ -167,14 +165,6 @@ const DashboardMembers = (props: Props) => {
scope="Community"
/>
)}
{!!membersByType.organization.length &&
// @ts-expect-error FIXME: Organization aren't really a thing anymore
activeTargetType !== 'organization' && (
<InheritedMembersBlock
members={membersByType.organization}
scope="Organization"
/>
)}
</SettingsSection>
)}
</>
Expand Down
13 changes: 0 additions & 13 deletions client/containers/DashboardReview/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export const reviewData = {
number: 2,
status: 'open',
releaseRequested: true,
labels: null,
threadId: '2ba640b8-44b1-479e-8cac-94a56fe92922',
visibilityId: 'f33419db-b559-486f-b608-c023573e2478',
userId: 'b242f616-7aaa-479c-8ee5-3933dcf70859',
Expand Down Expand Up @@ -32,8 +31,6 @@ export const reviewData = {
googleScholar: '',
resetHashExpiration: '2019-06-29T18:24:58.629Z',
resetHash: '',
inactive: null,
pubpubV3Id: 14,
passwordDigest: 'sha512',
hash: '40797096af954a1953597a92adf727d7b5cea30ccdce40c22c2b6e17fdaa418ad9f0eb71a74701b2107ca43a3370a099b6406d430e1defc87ed38f6ee7c888db9413ae6acaa9f8e846e66f005ebaa2d2ef54b6dcbce77327690446a1d696347452977910efb5c760f29889755ca6456abc59e010e4739d7d24d50cd69c130396fc6dd64e1c8b53bb2f3aa08ffbcf02fc7739fa74a6d244d885916009de480b70d35ee55644cddfd1bd488deb9686a87ffa165a589c370532b587e9a106e590f213da89bae375a791a378e272108937dbc54539fda8b6144f9a673b4dd3a2d50984f34bebf8216262c2219e93b65ac1ca06aa1016900b01cad18cb7f4580baeda42f38f50bf5ff47c3093ba043bff38c1ff16e3fa9e824bca31ee0c85c1bf3eda2a392fff938b47580fb7712e5f8a5b8c9001bacfdd82bd3aa68124d715d1ef6e91f669a4ac737545fe792c2ac6257a31f089acf25140b1722ef86a251fb080f06ebf18e94bae1b6dcaf8ad2c2daa15d6c963891ea0ac9be1a05e4be706e6e84cf6f92c7017c7bc43a549bf498a2613eb0a5e5cc0a34084a8cbd5f937829cf0c92667700723bf7b68505a2dae8c0b68ed77fd569d7bdc775d9c1e7e104df46ab927e7d86df520b64b229ab93bb49f2eb97ee38567476287c2987d1542737d0d3f49f3c20c23f6e2b9233a60d5cf9496cec93ba6935dfb1f653d791002ebe378af',
salt: '1e3ce838e6e22837da61d5805cedd61e34d2ba8b033a1d16474887cdc33f9ad2',
Expand Down Expand Up @@ -93,8 +90,6 @@ export const reviewData = {
googleScholar: '',
resetHashExpiration: '2019-06-29T18:24:58.629Z',
resetHash: '',
inactive: null,
pubpubV3Id: 14,
passwordDigest: 'sha512',
hash: '40797096af954a1953597a92adf727d7b5cea30ccdce40c22c2b6e17fdaa418ad9f0eb71a74701b2107ca43a3370a099b6406d430e1defc87ed38f6ee7c888db9413ae6acaa9f8e846e66f005ebaa2d2ef54b6dcbce77327690446a1d696347452977910efb5c760f29889755ca6456abc59e010e4739d7d24d50cd69c130396fc6dd64e1c8b53bb2f3aa08ffbcf02fc7739fa74a6d244d885916009de480b70d35ee55644cddfd1bd488deb9686a87ffa165a589c370532b587e9a106e590f213da89bae375a791a378e272108937dbc54539fda8b6144f9a673b4dd3a2d50984f34bebf8216262c2219e93b65ac1ca06aa1016900b01cad18cb7f4580baeda42f38f50bf5ff47c3093ba043bff38c1ff16e3fa9e824bca31ee0c85c1bf3eda2a392fff938b47580fb7712e5f8a5b8c9001bacfdd82bd3aa68124d715d1ef6e91f669a4ac737545fe792c2ac6257a31f089acf25140b1722ef86a251fb080f06ebf18e94bae1b6dcaf8ad2c2daa15d6c963891ea0ac9be1a05e4be706e6e84cf6f92c7017c7bc43a549bf498a2613eb0a5e5cc0a34084a8cbd5f937829cf0c92667700723bf7b68505a2dae8c0b68ed77fd569d7bdc775d9c1e7e104df46ab927e7d86df520b64b229ab93bb49f2eb97ee38567476287c2987d1542737d0d3f49f3c20c23f6e2b9233a60d5cf9496cec93ba6935dfb1f653d791002ebe378af',
salt: '1e3ce838e6e22837da61d5805cedd61e34d2ba8b033a1d16474887cdc33f9ad2',
Expand Down Expand Up @@ -134,8 +129,6 @@ export const reviewData = {
googleScholar: '',
resetHashExpiration: '2019-06-29T18:24:58.629Z',
resetHash: '',
inactive: null,
pubpubV3Id: 14,
passwordDigest: 'sha512',
hash: '40797096af954a1953597a92adf727d7b5cea30ccdce40c22c2b6e17fdaa418ad9f0eb71a74701b2107ca43a3370a099b6406d430e1defc87ed38f6ee7c888db9413ae6acaa9f8e846e66f005ebaa2d2ef54b6dcbce77327690446a1d696347452977910efb5c760f29889755ca6456abc59e010e4739d7d24d50cd69c130396fc6dd64e1c8b53bb2f3aa08ffbcf02fc7739fa74a6d244d885916009de480b70d35ee55644cddfd1bd488deb9686a87ffa165a589c370532b587e9a106e590f213da89bae375a791a378e272108937dbc54539fda8b6144f9a673b4dd3a2d50984f34bebf8216262c2219e93b65ac1ca06aa1016900b01cad18cb7f4580baeda42f38f50bf5ff47c3093ba043bff38c1ff16e3fa9e824bca31ee0c85c1bf3eda2a392fff938b47580fb7712e5f8a5b8c9001bacfdd82bd3aa68124d715d1ef6e91f669a4ac737545fe792c2ac6257a31f089acf25140b1722ef86a251fb080f06ebf18e94bae1b6dcaf8ad2c2daa15d6c963891ea0ac9be1a05e4be706e6e84cf6f92c7017c7bc43a549bf498a2613eb0a5e5cc0a34084a8cbd5f937829cf0c92667700723bf7b68505a2dae8c0b68ed77fd569d7bdc775d9c1e7e104df46ab927e7d86df520b64b229ab93bb49f2eb97ee38567476287c2987d1542737d0d3f49f3c20c23f6e2b9233a60d5cf9496cec93ba6935dfb1f653d791002ebe378af',
salt: '1e3ce838e6e22837da61d5805cedd61e34d2ba8b033a1d16474887cdc33f9ad2',
Expand Down Expand Up @@ -173,8 +166,6 @@ export const reviewData = {
googleScholar: '',
resetHashExpiration: '2019-06-29T18:24:58.629Z',
resetHash: '',
inactive: null,
pubpubV3Id: 14,
passwordDigest: 'sha512',
hash: '40797096af954a1953597a92adf727d7b5cea30ccdce40c22c2b6e17fdaa418ad9f0eb71a74701b2107ca43a3370a099b6406d430e1defc87ed38f6ee7c888db9413ae6acaa9f8e846e66f005ebaa2d2ef54b6dcbce77327690446a1d696347452977910efb5c760f29889755ca6456abc59e010e4739d7d24d50cd69c130396fc6dd64e1c8b53bb2f3aa08ffbcf02fc7739fa74a6d244d885916009de480b70d35ee55644cddfd1bd488deb9686a87ffa165a589c370532b587e9a106e590f213da89bae375a791a378e272108937dbc54539fda8b6144f9a673b4dd3a2d50984f34bebf8216262c2219e93b65ac1ca06aa1016900b01cad18cb7f4580baeda42f38f50bf5ff47c3093ba043bff38c1ff16e3fa9e824bca31ee0c85c1bf3eda2a392fff938b47580fb7712e5f8a5b8c9001bacfdd82bd3aa68124d715d1ef6e91f669a4ac737545fe792c2ac6257a31f089acf25140b1722ef86a251fb080f06ebf18e94bae1b6dcaf8ad2c2daa15d6c963891ea0ac9be1a05e4be706e6e84cf6f92c7017c7bc43a549bf498a2613eb0a5e5cc0a34084a8cbd5f937829cf0c92667700723bf7b68505a2dae8c0b68ed77fd569d7bdc775d9c1e7e104df46ab927e7d86df520b64b229ab93bb49f2eb97ee38567476287c2987d1542737d0d3f49f3c20c23f6e2b9233a60d5cf9496cec93ba6935dfb1f653d791002ebe378af',
salt: '1e3ce838e6e22837da61d5805cedd61e34d2ba8b033a1d16474887cdc33f9ad2',
Expand Down Expand Up @@ -212,8 +203,6 @@ export const reviewData = {
googleScholar: '',
resetHashExpiration: '2019-06-29T18:24:58.629Z',
resetHash: '',
inactive: null,
pubpubV3Id: 14,
passwordDigest: 'sha512',
hash: '40797096af954a1953597a92adf727d7b5cea30ccdce40c22c2b6e17fdaa418ad9f0eb71a74701b2107ca43a3370a099b6406d430e1defc87ed38f6ee7c888db9413ae6acaa9f8e846e66f005ebaa2d2ef54b6dcbce77327690446a1d696347452977910efb5c760f29889755ca6456abc59e010e4739d7d24d50cd69c130396fc6dd64e1c8b53bb2f3aa08ffbcf02fc7739fa74a6d244d885916009de480b70d35ee55644cddfd1bd488deb9686a87ffa165a589c370532b587e9a106e590f213da89bae375a791a378e272108937dbc54539fda8b6144f9a673b4dd3a2d50984f34bebf8216262c2219e93b65ac1ca06aa1016900b01cad18cb7f4580baeda42f38f50bf5ff47c3093ba043bff38c1ff16e3fa9e824bca31ee0c85c1bf3eda2a392fff938b47580fb7712e5f8a5b8c9001bacfdd82bd3aa68124d715d1ef6e91f669a4ac737545fe792c2ac6257a31f089acf25140b1722ef86a251fb080f06ebf18e94bae1b6dcaf8ad2c2daa15d6c963891ea0ac9be1a05e4be706e6e84cf6f92c7017c7bc43a549bf498a2613eb0a5e5cc0a34084a8cbd5f937829cf0c92667700723bf7b68505a2dae8c0b68ed77fd569d7bdc775d9c1e7e104df46ab927e7d86df520b64b229ab93bb49f2eb97ee38567476287c2987d1542737d0d3f49f3c20c23f6e2b9233a60d5cf9496cec93ba6935dfb1f653d791002ebe378af',
salt: '1e3ce838e6e22837da61d5805cedd61e34d2ba8b033a1d16474887cdc33f9ad2',
Expand Down Expand Up @@ -251,8 +240,6 @@ export const reviewData = {
googleScholar: '',
resetHashExpiration: '2019-06-29T18:24:58.629Z',
resetHash: '',
inactive: null,
pubpubV3Id: 14,
passwordDigest: 'sha512',
hash: '40797096af954a1953597a92adf727d7b5cea30ccdce40c22c2b6e17fdaa418ad9f0eb71a74701b2107ca43a3370a099b6406d430e1defc87ed38f6ee7c888db9413ae6acaa9f8e846e66f005ebaa2d2ef54b6dcbce77327690446a1d696347452977910efb5c760f29889755ca6456abc59e010e4739d7d24d50cd69c130396fc6dd64e1c8b53bb2f3aa08ffbcf02fc7739fa74a6d244d885916009de480b70d35ee55644cddfd1bd488deb9686a87ffa165a589c370532b587e9a106e590f213da89bae375a791a378e272108937dbc54539fda8b6144f9a673b4dd3a2d50984f34bebf8216262c2219e93b65ac1ca06aa1016900b01cad18cb7f4580baeda42f38f50bf5ff47c3093ba043bff38c1ff16e3fa9e824bca31ee0c85c1bf3eda2a392fff938b47580fb7712e5f8a5b8c9001bacfdd82bd3aa68124d715d1ef6e91f669a4ac737545fe792c2ac6257a31f089acf25140b1722ef86a251fb080f06ebf18e94bae1b6dcaf8ad2c2daa15d6c963891ea0ac9be1a05e4be706e6e84cf6f92c7017c7bc43a549bf498a2613eb0a5e5cc0a34084a8cbd5f937829cf0c92667700723bf7b68505a2dae8c0b68ed77fd569d7bdc775d9c1e7e104df46ab927e7d86df520b64b229ab93bb49f2eb97ee38567476287c2987d1542737d0d3f49f3c20c23f6e2b9233a60d5cf9496cec93ba6935dfb1f653d791002ebe378af',
salt: '1e3ce838e6e22837da61d5805cedd61e34d2ba8b033a1d16474887cdc33f9ad2',
Expand Down
1 change: 0 additions & 1 deletion client/utils/members/useMembers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export const useMembers = ({ members, updateMembers }) => {
pub: members.filter((mb) => mb.pubId),
collection: members.filter((mb) => mb.collectionId),
community: members.filter((mb) => mb.communityId),
organization: members.filter((mb) => mb.organizationId),
};

const addMember = (user) => {
Expand Down
21 changes: 1 addition & 20 deletions server/community/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,7 @@ import {
Unique,
} from 'sequelize-typescript';

import {
Collection,
DepositTarget,
Member,
Organization,
Page,
Pub,
ScopeSummary,
SpamTag,
} from '../models';
import { Collection, DepositTarget, Member, Page, Pub, ScopeSummary, SpamTag } from '../models';

@DefaultScope(() => ({ attributes: { exclude: ['searchVector'] } }))
@Table
Expand Down Expand Up @@ -240,19 +231,9 @@ export class Community extends Model<
@Column(DataType.TSVECTOR)
declare searchVector: any | null;

@Column(DataType.UUID)
declare organizationId: string | null;

@Column(DataType.UUID)
declare scopeSummaryId: string | null;

@BelongsTo(() => Organization, {
onDelete: 'CASCADE',
as: 'organization',
foreignKey: 'organizationId',
})
declare organization?: Organization;

@HasMany(() => Collection, {
onDelete: 'CASCADE',
as: 'collections',
Expand Down
34 changes: 0 additions & 34 deletions server/communityAdmin/model.ts
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions server/member/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ export class Member extends Model<InferAttributes<Member>, InferCreationAttribut
@Index
declare communityId: string | null;

@Column(DataType.UUID)
declare organizationId: string | null;

@BelongsTo(() => User, { onDelete: 'CASCADE', as: 'user', foreignKey: 'userId' })
declare user?: User;

Expand Down
43 changes: 0 additions & 43 deletions server/merge/model.ts
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions server/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { CollectionAttribution } from './collectionAttribution/model';
import { CollectionPub } from './collectionPub/model';
import { Commenter } from './commenter/model';
import { Community } from './community/model';
import { CommunityAdmin } from './communityAdmin/model';
import { CommunityBan } from './communityBan/model';
import { CrossrefDepositRecord } from './crossrefDepositRecord/model';
import { CustomScript } from './customScript/model';
Expand All @@ -29,15 +28,11 @@ import { FeatureFlagUser } from './featureFlagUser/model';
import { IntegrationDataOAuth1 } from './integrationDataOAuth1/model';
import { LandingPageFeature } from './landingPageFeature/model';
import { Member } from './member/model';
import { Merge } from './merge/model';
import { Organization } from './organization/model';
import { Page } from './page/model';
import { Pub } from './pub/model';
import { PubAttribution } from './pubAttribution/model';
import { PubEdge } from './pubEdge/model';
import { PublicPermissions } from './publicPermissions/model';
import { PubManager } from './pubManager/model';
import { PubVersion } from './pubVersion/model';
import { Release } from './release/model';
import { ReviewNew } from './review/model';
import { ReviewEvent } from './reviewEvent/model';
Expand Down Expand Up @@ -70,7 +65,6 @@ sequelize.addModels([
CollectionPub,
Commenter,
Community,
CommunityAdmin,
CrossrefDepositRecord,
CustomScript,
DepositTarget,
Expand All @@ -89,14 +83,10 @@ sequelize.addModels([
IntegrationDataOAuth1,
LandingPageFeature,
Member,
Merge,
Organization,
Page,
Pub,
PubAttribution,
PubEdge,
PubManager,
PubVersion,
PublicPermissions,
Release,
ReviewEvent,
Expand Down Expand Up @@ -165,7 +155,6 @@ export {
CollectionPub,
Commenter,
Community,
CommunityAdmin,
CrossrefDepositRecord,
CustomScript,
DepositTarget,
Expand All @@ -182,15 +171,11 @@ export {
IntegrationDataOAuth1,
LandingPageFeature,
Member,
Merge,
Organization,
Page,
Pub,
PubAttribution,
PubEdge,
PublicPermissions,
PubManager,
PubVersion,
Release,
Reviewer,
ReviewEvent,
Expand Down
66 changes: 0 additions & 66 deletions server/organization/model.ts
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions server/pub/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import {
Member,
PubAttribution,
PubEdge,
PubVersion,
Release,
ReviewNew,
ScopeSummary,
Expand Down Expand Up @@ -183,9 +182,6 @@ export class Pub extends Model<
@HasMany(() => Release, { onDelete: 'CASCADE', as: 'releases', foreignKey: 'pubId' })
declare releases?: Release[];

@HasMany(() => PubVersion, { onDelete: 'CASCADE', as: 'pubVersions', foreignKey: 'pubId' })
declare pubVersions?: PubVersion[];

@HasMany(() => PubEdge, { onDelete: 'CASCADE', as: 'outboundEdges', foreignKey: 'pubId' })
declare outboundEdges?: Omit<PubEdge, 'pub'>[];

Expand Down
Loading
Loading