chore: update mongoose dep

This commit is contained in:
tdurieux
2022-07-22 13:18:40 +02:00
parent ac52999841
commit 7c326143f5
15 changed files with 1143 additions and 810 deletions
+1111 -763
View File
File diff suppressed because it is too large Load Diff
+5 -5
View File
@@ -24,8 +24,8 @@
}, },
"homepage": "https://github.com/tdurieux/anonymous_github#readme", "homepage": "https://github.com/tdurieux/anonymous_github#readme",
"dependencies": { "dependencies": {
"@octokit/oauth-app": "^3.3.2", "@octokit/oauth-app": "^4.0.6",
"@octokit/rest": "^18.5.3", "@octokit/rest": "^19.0.3",
"@pm2/io": "^5.0.0", "@pm2/io": "^5.0.0",
"archiver": "^5.3.1", "archiver": "^5.3.1",
"aws-sdk": "^2.1180.0", "aws-sdk": "^2.1180.0",
@@ -40,7 +40,7 @@
"got": "^11.8.5", "got": "^11.8.5",
"istextorbinary": "^6.0.0", "istextorbinary": "^6.0.0",
"mime-types": "^2.1.35", "mime-types": "^2.1.35",
"mongoose": "^5.13.5", "mongoose": "^6.4.6",
"node-schedule": "^2.1.0", "node-schedule": "^2.1.0",
"parse-github-url": "^1.0.2", "parse-github-url": "^1.0.2",
"passport": "^0.6.0", "passport": "^0.6.0",
@@ -68,8 +68,8 @@
"@types/tar-fs": "^2.0.1", "@types/tar-fs": "^2.0.1",
"@types/unzip-stream": "^0.3.1", "@types/unzip-stream": "^0.3.1",
"@types/xml-flow": "^1.0.1", "@types/xml-flow": "^1.0.1",
"chai": "^4.3.4", "chai": "^4.3.6",
"mocha": "^9.0.3", "mocha": "^10.0.0",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typescript": "^4.7.4" "typescript": "^4.7.4"
}, },
@@ -1,5 +1,4 @@
import * as mongoose from "mongoose"; import { model } from "mongoose";
const { model } = mongoose;
import { import {
IAnonymizedRepositoryDocument, IAnonymizedRepositoryDocument,
@@ -1,5 +1,4 @@
import * as mongoose from "mongoose"; import { Schema } from "mongoose";
const { Schema } = mongoose;
const AnonymizedRepositorySchema = new Schema({ const AnonymizedRepositorySchema = new Schema({
repoId: { repoId: {
@@ -16,7 +15,7 @@ const AnonymizedRepositorySchema = new Schema({
lastView: Date, lastView: Date,
pageView: Number, pageView: Number,
accessToken: String, accessToken: String,
owner: mongoose.Schema.Types.ObjectId, owner: Schema.Types.ObjectId,
conference: String, conference: String,
source: { source: {
type: { type: String }, type: { type: String },
@@ -26,7 +25,7 @@ const AnonymizedRepositorySchema = new Schema({
repositoryName: String, repositoryName: String,
accessToken: String, accessToken: String,
}, },
originalFiles: mongoose.Schema.Types.Mixed, originalFiles: Schema.Types.Mixed,
options: { options: {
terms: [String], terms: [String],
expirationMode: { type: String }, expirationMode: { type: String },
@@ -1,4 +1,4 @@
import * as mongoose from "mongoose"; import { Document, Model } from "mongoose";
import { RepositoryStatus, Tree } from "../../types"; import { RepositoryStatus, Tree } from "../../types";
export interface IAnonymizedRepository { export interface IAnonymizedRepository {
@@ -43,8 +43,8 @@ export interface IAnonymizedRepository {
export interface IAnonymizedRepositoryDocument export interface IAnonymizedRepositoryDocument
extends IAnonymizedRepository, extends IAnonymizedRepository,
mongoose.Document { Document {
setLastUpdated: (this: IAnonymizedRepositoryDocument) => Promise<void>; setLastUpdated: (this: IAnonymizedRepositoryDocument) => Promise<void>;
} }
export interface IAnonymizedRepositoryModel export interface IAnonymizedRepositoryModel
extends mongoose.Model<IAnonymizedRepositoryDocument> {} extends Model<IAnonymizedRepositoryDocument> {}
+1 -2
View File
@@ -1,5 +1,4 @@
import * as mongoose from "mongoose"; import { model } from "mongoose";
const { model } = mongoose;
import { IConferenceDocument, IConferenceModel } from "./conferences.types"; import { IConferenceDocument, IConferenceModel } from "./conferences.types";
import ConferenceSchema from "./conferences.schema"; import ConferenceSchema from "./conferences.schema";
@@ -1,5 +1,4 @@
import * as mongoose from "mongoose"; import { Schema } from "mongoose";
const { Schema } = mongoose;
const RepositorySchema = new Schema({ const RepositorySchema = new Schema({
name: String, name: String,
@@ -11,11 +10,11 @@ const RepositorySchema = new Schema({
startDate: Date, startDate: Date,
endDate: Date, endDate: Date,
status: String, status: String,
owners: { type: [mongoose.Schema.Types.ObjectId] }, owners: { type: [Schema.Types.ObjectId] },
repositories: { repositories: {
type: [ type: [
{ {
id: { type: mongoose.Schema.Types.ObjectId }, id: { type: Schema.Types.ObjectId },
addDate: { type: Date }, addDate: { type: Date },
removeDate: { type: Date }, removeDate: { type: Date },
}, },
+3 -3
View File
@@ -1,4 +1,4 @@
import * as mongoose from "mongoose"; import { Document, Model } from "mongoose";
import { ConferenceStatus } from "../../types"; import { ConferenceStatus } from "../../types";
export interface IConference { export interface IConference {
@@ -45,5 +45,5 @@ export interface IConference {
}; };
} }
export interface IConferenceDocument extends IConference, mongoose.Document {} export interface IConferenceDocument extends IConference, Document {}
export interface IConferenceModel extends mongoose.Model<IConferenceDocument> {} export interface IConferenceModel extends Model<IConferenceDocument> {}
+2 -8
View File
@@ -1,4 +1,4 @@
import * as mongoose from "mongoose"; import mongoose, { ConnectOptions } from "mongoose";
import Repository from "../Repository"; import Repository from "../Repository";
import config from "../../config"; import config from "../../config";
import AnonymizedRepositoryModel from "./anonymizedRepositories/anonymizedRepositories.model"; import AnonymizedRepositoryModel from "./anonymizedRepositories/anonymizedRepositories.model";
@@ -9,15 +9,9 @@ const MONGO_URL = `mongodb://${config.DB_USERNAME}:${config.DB_PASSWORD}@${confi
export const database = mongoose.connection; export const database = mongoose.connection;
export async function connect() { export async function connect() {
mongoose.set("useNewUrlParser", true);
mongoose.set("useFindAndModify", true);
mongoose.set("useUnifiedTopology", true);
await mongoose.connect(MONGO_URL + "production", { await mongoose.connect(MONGO_URL + "production", {
authSource: "admin", authSource: "admin",
useCreateIndex: true, } as ConnectOptions);
useFindAndModify: true,
});
return database; return database;
} }
@@ -1,5 +1,4 @@
import * as mongoose from "mongoose"; import { model } from "mongoose";
const { model } = mongoose;
import { IRepositoryDocument, IRepositoryModel } from "./repositories.types"; import { IRepositoryDocument, IRepositoryModel } from "./repositories.types";
import RepositorySchema from "./repositories.schema"; import RepositorySchema from "./repositories.schema";
@@ -1,5 +1,4 @@
import * as mongoose from "mongoose"; import { Schema } from "mongoose";
const { Schema } = mongoose;
const RepositorySchema = new Schema({ const RepositorySchema = new Schema({
externalId: { externalId: {
@@ -1,4 +1,4 @@
import * as mongoose from "mongoose"; import { Document, Model } from "mongoose";
export interface IRepository { export interface IRepository {
externalId: string; externalId: string;
@@ -19,7 +19,7 @@ export interface IRepository {
}[]; }[];
} }
export interface IRepositoryDocument extends IRepository, mongoose.Document { export interface IRepositoryDocument extends IRepository, Document {
setLastUpdated: (this: IRepositoryDocument) => Promise<void>; setLastUpdated: (this: IRepositoryDocument) => Promise<void>;
} }
export interface IRepositoryModel extends mongoose.Model<IRepositoryDocument> {} export interface IRepositoryModel extends Model<IRepositoryDocument> {}
+2 -4
View File
@@ -1,10 +1,8 @@
import * as mongoose from "mongoose"; import { model } from "mongoose";
const { model } = mongoose;
import { IUserDocument, IUserModel } from "./users.types"; import { IUserDocument, IUserModel } from "./users.types";
import UserSchema from "./users.schema"; import UserSchema from "./users.schema";
const UserModel = model<IUserDocument>("user", UserSchema) as IUserModel; const UserModel = model<IUserDocument>("user", UserSchema) as IUserModel;
export default UserModel export default UserModel;
+1 -2
View File
@@ -1,5 +1,4 @@
import * as mongoose from "mongoose"; import { Schema } from "mongoose";
const { Schema } = mongoose;
const UserSchema = new Schema({ const UserSchema = new Schema({
accessTokens: { accessTokens: {
+3 -3
View File
@@ -1,4 +1,4 @@
import * as mongoose from "mongoose"; import { Document, Model } from "mongoose";
export interface IUser { export interface IUser {
accessTokens: { accessTokens: {
@@ -33,7 +33,7 @@ export interface IUser {
lastUpdated?: Date; lastUpdated?: Date;
} }
export interface IUserDocument extends IUser, mongoose.Document { export interface IUserDocument extends IUser, Document {
setLastUpdated: (this: IUserDocument) => Promise<void>; setLastUpdated: (this: IUserDocument) => Promise<void>;
} }
export interface IUserModel extends mongoose.Model<IUserDocument> {} export interface IUserModel extends Model<IUserDocument> {}