@winible/winible-typed 1.0.10 → 2.0.0

package/typed-model/credit-payment.ts

@@ -13,10 +13,9 @@ import sequelize from "./pb-sequelize";
 import PhoneOwner from "./phone-owner";
 import PhoneUser from "./phone-user";
 import PremiumContent from "./premium-content";
-import Message from "./message";
 import Subscription from "./subscription";
 import PurchasedContent from "./purchased-content";
-import Notification from "./notification";
+import Notification, { NotificationType } from "./notification";
 
 type InteractionType =
   | "subscription"
@@ -94,7 +93,6 @@ class CreditPayments extends Model<
   static logUnlockMessage: (
     user: PhoneUser,
     owner: PhoneOwner,
-    message: Message,
     alreadyPaid?: boolean,
     transaction?: Transaction,
     invoiceId?: string
@@ -247,11 +245,11 @@ CreditPayments.logContentPurchase = async (
   try {
     await Notification.create(
       {
-        ownerId: content.ownerId,
-        userId: user.id,
-        creditPaymentId: creditPayment.id,
-        type: "content",
-        purchasedContentId: purchasedContent.id,
+        recipientId: user.id,
+        senderId: content.ownerId,
+        transactionId: creditPayment.id,
+        type: NotificationType.PURCHASED_POST,
+        purchasedPostId: purchasedContent.id,
       },
       { transaction }
     );
@@ -280,57 +278,57 @@ CreditPayments.logContentPurchase = async (
   return creditPayment;
 };
 
-CreditPayments.logTip = async (
-  user: PhoneUser,
-  owner: PhoneOwner,
-  tipAmountInCents: number
-) => {
-  if (tipAmountInCents > user.creditsInCents!) {
-    let url = await getPaymentUrl(user, owner);
-    throw new Error(
-      `Sorry, it looks like you've run out of credits. To send a tip, add more credits here: ${url}`
-    );
-  }
-
-  if (tipAmountInCents < 0) {
-    throw new Error("Cannot be less than 0");
-  }
-
-  user.creditsInCents = user.creditsInCents! - tipAmountInCents;
-  await user.save();
-
-  let creditPayment = await CreditPayments.create({
-    userId: user.id,
-    ownerId: owner.id,
-    creditAmountInCents: tipAmountInCents,
-    earningAmountInCents: earningsAmount(
-      tipAmountInCents,
-      owner.serviceFeePercentage
-    ),
-    interactionType: INTERACTION_TYPES.TIP,
-  });
-
-  if (owner.referringOwnerId) {
-    await createReferralPayment(owner, creditPayment, tipAmountInCents);
-  }
-
-  if (user.referringOwnerId) {
-    await createUserReferralPayment(user, creditPayment, tipAmountInCents);
-  }
-
-  try {
-    await Notification.create({
-      ownerId: owner.id,
-      userId: user.id,
-      creditPaymentId: creditPayment.id,
-      type: "tip",
-    });
-  } catch (err) {
-    console.log(err);
-  }
-
-  return creditPayment;
-};
+// CreditPayments.logTip = async (
+//   user: PhoneUser,
+//   owner: PhoneOwner,
+//   tipAmountInCents: number
+// ) => {
+//   if (tipAmountInCents > user.creditsInCents!) {
+//     let url = await getPaymentUrl(user, owner);
+//     throw new Error(
+//       `Sorry, it looks like you've run out of credits. To send a tip, add more credits here: ${url}`
+//     );
+//   }
+
+//   if (tipAmountInCents < 0) {
+//     throw new Error("Cannot be less than 0");
+//   }
+
+//   user.creditsInCents = user.creditsInCents! - tipAmountInCents;
+//   await user.save();
+
+//   let creditPayment = await CreditPayments.create({
+//     userId: user.id,
+//     ownerId: owner.id,
+//     creditAmountInCents: tipAmountInCents,
+//     earningAmountInCents: earningsAmount(
+//       tipAmountInCents,
+//       owner.serviceFeePercentage
+//     ),
+//     interactionType: INTERACTION_TYPES.TIP,
+//   });
+
+//   if (owner.referringOwnerId) {
+//     await createReferralPayment(owner, creditPayment, tipAmountInCents);
+//   }
+
+//   if (user.referringOwnerId) {
+//     await createUserReferralPayment(user, creditPayment, tipAmountInCents);
+//   }
+
+//   try {
+//     await Notification.create({
+//       ownerId: owner.id,
+//       userId: user.id,
+//       creditPaymentId: creditPayment.id,
+//       type: "tip",
+//     });
+//   } catch (err) {
+//     console.log(err);
+//   }
+
+//   return creditPayment;
+// };
 
 CreditPayments.logMessage = async (
   user: PhoneUser,
@@ -438,72 +436,72 @@ CreditPayments.logVideoCall = async (
   return creditPayment;
 };
 
-CreditPayments.logUnlockMessage = async (
-  user: PhoneUser,
-  owner: PhoneOwner,
-  message: Message,
-  alreadyPaid?: boolean,
-  transaction?: Transaction,
-  invoiceId?: string
-) => {
-  if (message.amountInCents! > user.creditsInCents! && !alreadyPaid) {
-    throw new Error(`Sorry, it looks like you've run out of credits`);
-  }
-
-  if (!message.amountInCents) {
-    throw new Error("Must contain message amount");
-  }
-
-  if (message.amountInCents! < 0) {
-    throw new Error("Cannot be less than 0");
-  }
-
-  if (!alreadyPaid) {
-    user.creditsInCents = user.creditsInCents! - message.amountInCents!;
-    await user.save({ transaction });
-  }
-
-  let creditPayment = await CreditPayments.create(
-    {
-      userId: user.id,
-      ownerId: owner.id,
-      creditAmountInCents: message.amountInCents!,
-      earningAmountInCents: earningsAmount(
-        message.amountInCents!,
-        owner.serviceFeePercentage
-      ),
-      invoiceId,
-      interactionType: INTERACTION_TYPES.UNLOCK_MESSAGE,
-    },
-    { transaction }
-  );
-
-  try {
-    await Notification.create(
-      {
-        ownerId: owner.id,
-        userId: user.id,
-        creditPaymentId: creditPayment.id,
-        type: "unlock_message",
-        messageId: message.id,
-      },
-      { transaction }
-    );
-  } catch (err) {
-    console.log(err);
-  }
-
-  if (owner.referringOwnerId) {
-    await createReferralPayment(
-      owner,
-      creditPayment,
-      message.amountInCents!,
-      transaction
-    );
-  }
-
-  return creditPayment;
-};
+// CreditPayments.logUnlockMessage = async (
+//   user: PhoneUser,
+//   owner: PhoneOwner,
+//   message: Message,
+//   alreadyPaid?: boolean,
+//   transaction?: Transaction,
+//   invoiceId?: string
+// ) => {
+//   if (message.amountInCents! > user.creditsInCents! && !alreadyPaid) {
+//     throw new Error(`Sorry, it looks like you've run out of credits`);
+//   }
+
+//   if (!message.amountInCents) {
+//     throw new Error("Must contain message amount");
+//   }
+
+//   if (message.amountInCents! < 0) {
+//     throw new Error("Cannot be less than 0");
+//   }
+
+//   if (!alreadyPaid) {
+//     user.creditsInCents = user.creditsInCents! - message.amountInCents!;
+//     await user.save({ transaction });
+//   }
+
+//   let creditPayment = await CreditPayments.create(
+//     {
+//       userId: user.id,
+//       ownerId: owner.id,
+//       creditAmountInCents: message.amountInCents!,
+//       earningAmountInCents: earningsAmount(
+//         message.amountInCents!,
+//         owner.serviceFeePercentage
+//       ),
+//       invoiceId,
+//       interactionType: INTERACTION_TYPES.UNLOCK_MESSAGE,
+//     },
+//     { transaction }
+//   );
+
+//   try {
+//     await Notification.create(
+//       {
+//         ownerId: owner.id,
+//         userId: user.id,
+//         creditPaymentId: creditPayment.id,
+//         type: "unlock_message",
+//         messageId: message.id,
+//       },
+//       { transaction }
+//     );
+//   } catch (err) {
+//     console.log(err);
+//   }
+
+//   if (owner.referringOwnerId) {
+//     await createReferralPayment(
+//       owner,
+//       creditPayment,
+//       message.amountInCents!,
+//       transaction
+//     );
+//   }
+
+//   return creditPayment;
+// };
 
 CreditPayments.logUnlockedContent = async (
   user: PhoneUser,
@@ -675,7 +673,7 @@ CreditPayments.hasOne(PhoneUser, {
 });
 Notification.hasOne(CreditPayments, {
   foreignKey: "id",
-  sourceKey: "creditPaymentId",
+  sourceKey: "transactionId",
   constraints: false,
   onDelete: "NO ACTION",
 });

package/typed-model/index.ts

@@ -1,66 +1,16 @@
-// let models = {
-//   DashboardUserPermissions: require("./dashboard-user-permissions"),
-//   PhoneUser: require("./phone-user"),
-//   PhoneOwner: require("./phone-owner"),
-//   DashboardUser: require("./dashboard-user"),
-// };
-
-// export sequelize from "./pb-sequelize";
-
-// const sync = async () => {
-//   console.log("Syncing type models...");
-//   await sequelize.sync({ alter: true });
-//   console.log("Sync done");
-// };
-
-// if (process.env.SYNC_TABLES) {
-//   sync();
-// }
-
-export { default as AssetCategory } from "./asset-category";
-export { default as AssetConsentPerson } from "./asset-constent-person";
-export { default as PhoneChat } from "./phone-chat";
-export { default as PhoneChatParticipant } from "./phone-chat-participation";
-export { default as ConsentPerson } from "./consent-person";
 export { default as ContentLike } from "./content-like";
 export { default as CreditPayments } from "./credit-payment";
-export { default as CreditPurchase } from "./credit-purchase";
-export { default as BlockedIP } from "./blocked-ip";
-export { default as CustomerProfile, ProcessorId } from "./customer-profile";
-export { default as DashboardUserPermissions } from "./dashboard-user-permissions";
-export { default as DashboardUser } from "./dashboard-user";
-export { default as FanList } from "./fan-list";
-export { default as Fraud } from "./fraud";
-export { default as ListMember } from "./list-member";
-export { default as MassMessage } from "./mass-message";
 export { default as MediaAsset } from "./media-asset";
-export { default as MediaCategory } from "./media-category";
 export { default as Media } from "./media";
-export { default as MessageMedia } from "./message-media";
-export { default as Message } from "./message";
 export { default as Notification } from "./notification";
 export { default as pbSequelize } from "./pb-sequelize";
 export { default as PhoneOwner } from "./phone-owner";
 export { default as PhoneUser } from "./phone-user";
 export { default as PremiumContent } from "./premium-content";
 export { default as PurchasedContent } from "./purchased-content";
-export { default as SubscriptionBundle } from "./subscription-bundle";
 export { default as SubscriptionPlan } from "./subscription-plan";
-export { default as SubscriptionPromotion } from "./subscription-promotion";
 export { default as Subscription } from "./subscription";
-export { default as UserFollow } from "./user-follow";
-export { default as TwilioPhone } from "./twilio-phone";
 export { default as RecurlyAccount } from "./recurly-account";
-export { default as ShortUrl } from "./short-url";
 export { default as CreditPayout } from "./credit-payout";
-export { default as VerificationCode } from "./verification-code";
-export { default as CategoryTag } from "./category-tag";
-export { default as SubscriptionCategoryTag } from "./subscription-category-tags";
-export { default as ContentCategoryTag } from "./content-category-tag";
-export { default as Team } from "./team";
 export { default as League } from "./league";
-export { default as Game } from "./game";
-export { default as Odds } from "./odds";
-export { default as Bet } from "./bet";
-export { default as Parlay } from "./parlay";
-export { default as Player } from "./player";
+export { default as User } from "./user";

package/typed-model/media-asset.ts

@@ -8,7 +8,6 @@ import {
 } from "sequelize";
 
 import sequelize from "./pb-sequelize";
-import AssetCategory from "./asset-category";
 
 // order of InferAttributes & InferCreationAttributes is important.
 class MediaAsset extends Model<
@@ -87,13 +86,4 @@ Class functions
 ====================================================================
 */
 
-AssetCategory.hasOne(MediaAsset, {
-  foreignKey: "id",
-  sourceKey: "mediaAssetId",
-});
-MediaAsset.hasMany(AssetCategory, {
-  foreignKey: "media_asset_id",
-  sourceKey: "id",
-});
-
 export default MediaAsset;

package/typed-model/notification.ts

@@ -5,20 +5,19 @@ import {
   CreationOptional,
   DataTypes,
   fn,
-  NOW,
 } from "sequelize";
 
 import sequelize from "./pb-sequelize";
-import PhoneUser from "./phone-user";
 import ContentLike from "./content-like";
+import User from "./user";
 
-type NotificationType =
-  | "unlock_message"
-  | "follow"
-  | "like"
-  | "tip"
-  | "subscription"
-  | "content";
+export enum NotificationType {
+  VIEWED = "VIEWED",
+  PURCHASED_PLAN = "PURCHASED_PLAN",
+  PURCHASED_POST = "PURCHASED_POST",
+  SUBSCRIBED = "SUBSCRIBED",
+  VIEWED_PROFILE = "VIEWED_PROFILE",
+}
 
 // order of InferAttributes & InferCreationAttributes is important.
 class Notification extends Model<
@@ -28,15 +27,14 @@ class Notification extends Model<
   // 'CreationOptional' is a special type that marks the field as optional
   // when creating an instance of the model (such as using Model.create()).
   declare id: CreationOptional<string>;
-  declare ownerId: string;
-  declare userId?: string;
+  declare recipientId: string;
+  declare senderId?: string;
   declare isRead?: boolean;
   declare type: NotificationType;
-  declare creditPaymentId?: string;
-  declare purchasedContentId?: string;
-  declare userFollowId?: string;
-  declare contentLikeId?: string;
-  declare messageId?: string;
+  declare transactionId?: string;
+  declare purchasedPostId?: string;
+  declare postLikeId?: string;
+  declare subscriptionPlanId?: string;
   declare createdAt: CreationOptional<Date>;
   declare updatedAt: CreationOptional<Date>;
   static readNotifications: (
@@ -53,14 +51,14 @@ Notification.init(
       allowNull: false,
       primaryKey: true,
     },
-    ownerId: {
+    recipientId: {
       type: DataTypes.BIGINT,
-      field: "owner_id",
+      field: "recipient_id",
       allowNull: false,
     },
-    userId: {
+    senderId: {
       type: DataTypes.BIGINT,
-      field: "user_id",
+      field: "sender_id",
       allowNull: false,
     },
     isRead: {
@@ -70,26 +68,22 @@ Notification.init(
     },
     type: {
       field: "type",
-      type: DataTypes.STRING,
-    },
-    creditPaymentId: {
-      field: "credit_payment_id",
-      type: DataTypes.BIGINT,
+      type: DataTypes.ENUM(...Object.values(NotificationType)),
     },
-    purchasedContentId: {
-      field: "purchased_content_id",
+    transactionId: {
+      field: "transaction_id",
       type: DataTypes.BIGINT,
     },
-    userFollowId: {
-      field: "user_follow_id",
+    purchasedPostId: {
+      field: "purchased_post_id",
       type: DataTypes.BIGINT,
     },
-    contentLikeId: {
-      field: "content_like_id",
+    postLikeId: {
+      field: "post_like_id",
       type: DataTypes.BIGINT,
     },
-    messageId: {
-      field: "messageId",
+    subscriptionPlanId: {
+      field: "subscription_plan_id",
       type: DataTypes.BIGINT,
     },
     createdAt: DataTypes.DATE,
@@ -107,23 +101,24 @@ Class functions
 ====================================================================
 */
 
-Notification.readNotifications = async (
-  ownerId: string,
-  type: NotificationType
-) => {
-  await sequelize.query(
-    `UPDATE notifications SET is_read=true WHERE owner_id=${ownerId} AND type=${type}`
-  );
-};
+// Notification.readNotifications = async (
+//   ownerId: string,
+//   type: NotificationType
+// ) => {
+//   await sequelize.query(
+//     `UPDATE notifications SET is_read=true WHERE owner_id=${ownerId} AND type=${type}`
+//   );
+// };
 
-Notification.hasOne(PhoneUser, {
+Notification.hasOne(User, {
   foreignKey: "id",
-  sourceKey: "userId",
+  sourceKey: "recipientId",
   constraints: false,
 });
+
 Notification.hasOne(ContentLike, {
   foreignKey: "id",
-  sourceKey: "contentLikeId",
+  sourceKey: "postLikeId",
   constraints: false,
 });
 

package/typed-model/pb-sequelize.ts

@@ -13,13 +13,27 @@ const dbUrl =
   process.env.ENVIRONMENT === "test"
     ? process.env.TESTING_DATABASE_URL
     : process.env.DATABASE_URL;
-export default new Sequelize(dbUrl!, {
-  logging: false,
-  minifyAliases: true,
+// export default new Sequelize(dbUrl!, {
+//   logging: false,
+//   minifyAliases: true,
+//   dialectOptions: {
+//     ssl: {
+//       require: true,
+//       rejectUnauthorized: false, // <<<<<<< YOU NEED THIS
+//     },
+//   },
+// });
+export default new Sequelize({
+  username: "postgres",
+  password: "l5WFq6a50%m4",
+  database: "winible",
+  host: "winible-v2-staging.cd9ez5rrajpu.us-east-1.rds.amazonaws.com",
+  dialect: "postgres",
+  ssl: false,
   dialectOptions: {
     ssl: {
       require: true,
-      rejectUnauthorized: false, // <<<<<<< YOU NEED THIS
+      rejectUnauthorized: false,
     },
   },
 });

package/typed-model/subscription-plan.ts

@@ -12,7 +12,6 @@ import {
 import sequelize from "./pb-sequelize";
 import PhoneOwner from "./phone-owner";
 import Subscription from "./subscription";
-import SubscriptionPromotion from "./subscription-promotion";
 
 // order of InferAttributes & InferCreationAttributes is important.
 class SubscriptionPlan extends Model<
@@ -170,13 +169,4 @@ PhoneOwner.hasMany(SubscriptionPlan, {
   constraints: false,
 });
 
-SubscriptionPromotion.hasOne(SubscriptionPlan, {
-  foreignKey: "id",
-  sourceKey: "subscriptionPlanId",
-});
-SubscriptionPlan.hasMany(SubscriptionPromotion, {
-  foreignKey: "subscription_plan_id",
-  sourceKey: "id",
-});
-
 export default SubscriptionPlan;

package/typed-model/subscription.ts

@@ -7,12 +7,10 @@ import {
   fn,
   NOW,
 } from "sequelize";
-import { ProcessorId } from "./customer-profile";
 
 import sequelize from "./pb-sequelize";
 import PhoneOwner from "./phone-owner";
 import PhoneUser from "./phone-user";
-import SubscriptionPromotion from "./subscription-promotion";
 
 // order of InferAttributes & InferCreationAttributes is important.
 class Subscription extends Model<
@@ -24,7 +22,7 @@ class Subscription extends Model<
   declare id: CreationOptional<string>;
   declare userId: string;
   declare subscriptionPlanId: string;
-  declare processorId: ProcessorId;
+
   declare paypalSubscriptionId?: string;
   declare paypalOrderId?: string;
   declare paypalBillingToken?: string;
@@ -106,11 +104,6 @@ Subscription.init(
       type: DataTypes.BIGINT,
       field: "subscription_promotion_id",
     },
-    processorId: {
-      type: DataTypes.STRING,
-      field: "processor_id",
-      defaultValue: ProcessorId.HUMBOLDT,
-    },
     stale: {
       type: DataTypes.BOOLEAN,
       field: "stale",
@@ -175,13 +168,6 @@ Subscription.getByPaypalSubscriptionId = async (
   });
 };
 
-Subscription.hasOne(SubscriptionPromotion, {
-  foreignKey: "id",
-  sourceKey: "subscriptionPromotionId",
-});
-SubscriptionPromotion.hasMany(Subscription, {
-  foreignKey: "subscription_plan_id",
-});
 Subscription.hasOne(PhoneUser, { foreignKey: "id", sourceKey: "userId" });
 PhoneUser.hasMany(Subscription, { foreignKey: "user_id", sourceKey: "id" });