cleanup: models

oguzhalit · Feb 17, 2022 · 6a19362 · 6a19362
1 parent 19edb5e
commit 6a19362
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 431 deletions.
diff --git a/models/basket.ts b/models/basket.ts
@@ -11,9 +11,6 @@ import {
  InferCreationAttributes,
  DataTypes,
  CreationOptional,
- HasManyCreateAssociationMixin,
- HasManyGetAssociationsMixin,
- Association,
  NonAttribute,
 } from "sequelize";
 import { sequelize } from "./index";
@@ -28,7 +25,7 @@ class BasketModel extends Model<
  declare UserId: number;
  declare id: CreationOptional<number>;
  declare coupon: CreationOptional<string> | null;
- declare Products?: NonAttribute<ProductModel[]>; // Note this is optional since it's only populated when explicitly requested in code
+ declare Products?: NonAttribute<ProductModel[]>;
 }
 
 BasketModel.init(
@@ -60,16 +57,3 @@ BasketModel.belongsToMany(ProductModel, {
 });
 
 export default BasketModel;
-
-// export = (sequelize, { STRING }) => {
-// const Basket = sequelize.define('Basket', {
-// coupon: STRING
-// })
-
-// Basket.associate = ({ User, Product, BasketItem }) => {
-// Basket.belongsTo(User, { constraints: true, foreignKeyConstraint: true })
-// Basket.belongsToMany(Product, { through: BasketItem, foreignKey: { name: 'BasketId', noUpdate: true } })
-// }
-
-// return Basket
-// }
diff --git a/models/basketitem.ts b/models/basketitem.ts
@@ -10,7 +10,6 @@ import {
  InferCreationAttributes,
  DataTypes,
  CreationOptional,
- NonAttribute,
 } from "sequelize";
 import { sequelize } from "./index";
 
@@ -41,16 +40,3 @@ BasketItemModel.init(
 );
 
 export default BasketItemModel;
-
-// export = (sequelize, { INTEGER }) => {
-// const BasketItem = sequelize.define("BasketItem", {
-// id: {
-// type: INTEGER,
-// primaryKey: true,
-// autoIncrement: true,
-// allowNull: false,
-// },
-// quantity: INTEGER,
-// });
-// return BasketItem;
-// };
diff --git a/models/captcha.ts b/models/captcha.ts
@@ -8,7 +8,6 @@ import {
  InferAttributes,
  InferCreationAttributes,
  DataTypes,
- CreationOptional,
 } from "sequelize";
 import { sequelize } from "./index";
 
@@ -38,12 +37,3 @@ CaptchaModel.init(
 );
 
 export default CaptchaModel;
-
-// export = (sequelize, { INTEGER, STRING }) => {
-// const Captcha = sequelize.define("Captcha", {
-// captchaId: INTEGER,
-// captcha: STRING,
-// answer: STRING,
-// });
-// return Captcha;
-// };
diff --git a/models/card.ts b/models/card.ts
@@ -10,7 +10,6 @@ import {
  InferCreationAttributes,
  DataTypes,
  CreationOptional,
- NonAttribute,
 } from "sequelize";
 import { sequelize } from "./index";
 import UserModel from "./user";
@@ -72,39 +71,3 @@ CardModel.belongsTo(UserModel, {
 });
 
 export default CardModel;
-
-// export = (sequelize, { STRING, INTEGER }) => {
-// const Card = sequelize.define("Card", {
-// fullName: STRING,
-// cardNum: {
-// type: INTEGER,
-// validate: {
-// isInt: true,
-// min: 1000000000000000,
-// max: 9999999999999998,
-// },
-// },
-// expMonth: {
-// type: INTEGER,
-// validate: {
-// isInt: true,
-// min: 1,
-// max: 12,
-// },
-// },
-// expYear: {
-// type: INTEGER,
-// validate: {
-// isInt: true,
-// min: 2080,
-// max: 2099,
-// },
-// },
-// });
-
-// Card.associate = ({ User }) => {
-// Card.belongsTo(User, { constraints: true, foreignKeyConstraint: true });
-// };
-
-// return Card;
-// };
diff --git a/models/challenge.ts b/models/challenge.ts
@@ -60,22 +60,3 @@ ChallengeModel.init(
 );
 
 export default ChallengeModel;
-
-// export = (sequelize, { STRING, INTEGER, BOOLEAN, NUMBER }) => {
-// const Challenge = sequelize.define("Challenge", {
-// key: STRING,
-// name: STRING,
-// category: STRING,
-// tags: STRING,
-// description: STRING,
-// difficulty: INTEGER,
-// hint: STRING,
-// hintUrl: STRING,
-// mitigationUrl: STRING,
-// solved: BOOLEAN,
-// disabledEnv: STRING,
-// tutorialOrder: NUMBER,
-// codingChallengeStatus: NUMBER,
-// });
-// return Challenge;
-// };
diff --git a/models/complaint.ts b/models/complaint.ts
@@ -11,7 +11,6 @@ import {
  InferCreationAttributes,
  DataTypes,
  CreationOptional,
- NonAttribute,
 } from "sequelize";
 import { sequelize } from "./index";
 import UserModel from "./user";
@@ -49,19 +48,3 @@ ComplaintModel.belongsTo(UserModel, {
 });
 
 export default ComplaintModel;
-
-// export = (sequelize, { STRING }) => {
-// const Complaint = sequelize.define("Complaint", {
-// message: STRING,
-// file: STRING,
-// });
-
-// Complaint.associate = ({ User }) => {
-// Complaint.belongsTo(User, {
-// constraints: true,
-// foreignKeyConstraint: true,
-// });
-// };
-
-// return Complaint;
-// };
diff --git a/models/delivery.ts b/models/delivery.ts
@@ -44,15 +44,3 @@ DeliveryModel.init(
 );
 
 export default DeliveryModel;
-
-// export = (sequelize, { FLOAT, STRING }) => {
-// const Delivery = sequelize.define("Delivery", {
-// name: STRING,
-// price: FLOAT,
-// deluxePrice: FLOAT,
-// eta: FLOAT,
-// icon: STRING,
-// });
-
-// return Delivery;
-// };
diff --git a/models/feedback.ts b/models/feedback.ts
@@ -14,7 +14,6 @@ import {
  InferCreationAttributes,
  DataTypes,
  CreationOptional,
- NonAttribute,
 } from "sequelize";
 import { sequelize } from "./index";
 import UserModel from "./user";
@@ -74,44 +73,3 @@ FeedbackModel.init(
 FeedbackModel.belongsTo(UserModel); // no FK constraint to allow anonymous feedback posts
 
 export default FeedbackModel;
-// module.exports = (sequelize, { STRING, INTEGER }) => {
-// const Feedback = sequelize.define("Feedback", {
-// comment: {
-// type: STRING,
-// set(comment) {
-// let sanitizedComment;
-// if (!utils.disableOnContainerEnv()) {
-// sanitizedComment = security.sanitizeHtml(comment);
-// utils.solveIf(
-// challenges.persistedXssFeedbackChallenge,
-// () => {
-// return utils.contains(
-// sanitizedComment,
-// '<iframe src="javascript:alert(`xss`)">'
-// );
-// }
-// );
-// } else {
-// sanitizedComment = security.sanitizeSecure(comment);
-// }
-// this.setDataValue("comment", sanitizedComment);
-// },
-// },
-// rating: {
-// type: INTEGER,
-// allowNull: false,
-// set(rating) {
-// this.setDataValue("rating", rating);
-// utils.solveIf(challenges.zeroStarsChallenge, () => {
-// return rating === 0;
-// });
-// },
-// },
-// });
-
-// Feedback.associate = ({ User }) => {
-// Feedback.belongsTo(User); // no FK constraint to allow anonymous feedback posts
-// };
-
-// return Feedback;
-// };
diff --git a/models/imageCaptcha.ts b/models/imageCaptcha.ts
@@ -45,17 +45,3 @@ ImageCaptchaModel.init(
 ImageCaptchaModel.belongsTo(UserModel);
 
 export default ImageCaptchaModel;
-
-// export = (sequelize, { INTEGER, STRING }) => {
-// const ImageCaptcha = sequelize.define("ImageCaptcha", {
-// image: STRING,
-// answer: STRING,
-// UserId: { type: INTEGER },
-// });
-
-// ImageCaptcha.associate = ({ User }) => {
-// ImageCaptcha.belongsTo(User);
-// };
-
-// return ImageCaptcha;
-// };
diff --git a/models/memory.ts b/models/memory.ts
@@ -11,7 +11,6 @@ import {
  InferCreationAttributes,
  DataTypes,
  CreationOptional,
- NonAttribute,
 } from "sequelize";
 import { sequelize } from "./index";
 import UserModel from "./user";
@@ -49,18 +48,3 @@ MemoryModel.belongsTo(UserModel, {
 });
 
 export default MemoryModel;
-// export = (sequelize, { STRING, INTEGER }) => {
-// const Memory = sequelize.define("Memory", {
-// caption: STRING,
-// imagePath: STRING,
-// });
-
-// Memory.associate = ({ User }) => {
-// Memory.belongsTo(User, {
-// constraints: true,
-// foreignKeyConstraint: true,
-// });
-// };
-
-// return Memory;
-// };
diff --git a/models/privacyRequests.ts b/models/privacyRequests.ts
@@ -51,19 +51,3 @@ PrivacyRequestModel.belongsTo(UserModel, {
 });
 
 export default PrivacyRequestModel;
-
-// export = (sequelize, { INTEGER, BOOLEAN }) => {
-// const PrivacyRequest = sequelize.define("PrivacyRequest", {
-// UserId: { type: INTEGER },
-// deletionRequested: { type: BOOLEAN, defaultValue: false },
-// });
-
-// PrivacyRequest.associate = ({ User }) => {
-// PrivacyRequest.belongsTo(User, {
-// constraints: true,
-// foreignKeyConstraint: true,
-// });
-// };
-
-// return PrivacyRequest;
-// };
diff --git a/models/product.ts b/models/product.ts
@@ -13,7 +13,6 @@ import {
  InferCreationAttributes,
  DataTypes,
  CreationOptional,
- HasManyCreateAssociationMixin,
  NonAttribute,
 } from "sequelize";
 import { sequelize } from "./index";
@@ -30,7 +29,7 @@ class ProductModel extends Model<
  declare price: number;
  declare deluxePrice: number;
  declare image: string;
- declare BasketItem?: NonAttribute<BasketItemModel>; // Note this is optional since it's only populated when explicitly requested in code
+ declare BasketItem?: CreationOptional<BasketItemModel>; // Note this is optional since it's only populated when explicitly requested in code
 
 }
 
@@ -78,41 +77,3 @@ ProductModel.belongsToMany(BasketModel, {
 });
 
 export default ProductModel;
-
-// module.exports = (sequelize, { STRING, DECIMAL }) => {
-// const Product = sequelize.define(
-// "Product",
-// {
-// name: STRING,
-// description: {
-// type: STRING,
-// set(description) {
-// if (!utils.disableOnContainerEnv()) {
-// utils.solveIf(challenges.restfulXssChallenge, () => {
-// return utils.contains(
-// description,
-// '<iframe src="javascript:alert(`xss`)">'
-// );
-// });
-// } else {
-// description = security.sanitizeSecure(description);
-// }
-// this.setDataValue("description", description);
-// },
-// },
-// price: DECIMAL,
-// deluxePrice: DECIMAL,
-// image: STRING,
-// },
-// { paranoid: true }
-// );
-
-// Product.associate = ({ Basket, BasketItem }) => {
-// Product.belongsToMany(Basket, {
-// through: BasketItem,
-// foreignKey: { name: "ProductId", noUpdate: true },
-// });
-// };
-
-// return Product;
-// };