Moved @tryghost/offers to core folder

fix https://linear.app/ghost/issue/ENG-2385/offers

- this commit moves the lib code and tests to the core folder so we can
  colocate code in one place rather than splitting it out across
  packages, which increases the cognitive load and overhead

Author: daniellockyer

.docker/Dockerfile

@@ -82,7 +82,6 @@ COPY ghost/job-manager/package.json ghost/job-manager/package.json
 COPY ghost/members-csv/package.json ghost/members-csv/package.json
 COPY ghost/mw-error-handler/package.json ghost/mw-error-handler/package.json
 COPY ghost/mw-vhost/package.json ghost/mw-vhost/package.json
-COPY ghost/offers/package.json ghost/offers/package.json
 COPY ghost/post-events/package.json ghost/post-events/package.json
 COPY ghost/post-revisions/package.json ghost/post-revisions/package.json
 COPY ghost/prometheus-metrics/package.json ghost/prometheus-metrics/package.json

compose.yml

@@ -47,7 +47,6 @@ services:
       - node_modules_ghost_members-csv:/home/ghost/ghost/members-csv/node_modules:delegated
       - node_modules_ghost_mw-error-handler:/home/ghost/ghost/mw-error-handler/node_modules:delegated
       - node_modules_ghost_mw-vhost:/home/ghost/ghost/mw-vhost/node_modules:delegated
-      - node_modules_ghost_offers:/home/ghost/ghost/offers/node_modules:delegated
       - node_modules_ghost_post-events:/home/ghost/ghost/post-events/node_modules:delegated
       - node_modules_ghost_post-revisions:/home/ghost/ghost/post-revisions/node_modules:delegated
       - node_modules_ghost_prometheus-metrics:/home/ghost/ghost/prometheus-metrics/node_modules:delegated
@@ -192,7 +191,6 @@ volumes:
   node_modules_ghost_members-csv: {}
   node_modules_ghost_mw-error-handler: {}
   node_modules_ghost_mw-vhost: {}
-  node_modules_ghost_offers: {}
   node_modules_ghost_post-events: {}
   node_modules_ghost_post-revisions: {}
   node_modules_ghost_prometheus-metrics: {}

ghost/core/core/server/services/members/members-api/services/PaymentsService.js

@@ -3,14 +3,14 @@ const DomainEvents = require('@tryghost/domain-events');
 const TierCreatedEvent = require('../../../../../../core/server/services/tiers/TierCreatedEvent');
 const TierPriceChangeEvent = require('../../../../../../core/server/services/tiers/TierPriceChangeEvent');
 const TierNameChangeEvent = require('../../../../../../core/server/services/tiers/TierNameChangeEvent');
-const OfferCreatedEvent = require('@tryghost/members-offers').events.OfferCreatedEvent;
+const OfferCreatedEvent = require('../../../../../../core/server/services/offers/domain/events/OfferCreatedEvent');
 const {BadRequestError} = require('@tryghost/errors');
 
 class PaymentsService {
     /**
      * @param {object} deps
      * @param {import('bookshelf').Model} deps.Offer
-     * @param {import('@tryghost/members-offers/lib/application/OffersAPI')} deps.offersAPI
+     * @param {import('../../../offers/application/OffersAPI')} deps.offersAPI
      * @param {import('../../../stripe/StripeAPI')} deps.stripeAPIService
      * @param {{get(key: string): any}} deps.settingsCache
      */

ghost/core/core/server/services/offers/OfferBookshelfRepository.js

@@ -1,7 +1,7 @@
 const {flowRight} = require('lodash');
 const {mapKeyValues, mapQuery} = require('@tryghost/mongo-utils');
 const DomainEvents = require('@tryghost/domain-events');
-const {Offer} = require('@tryghost/members-offers');
+const Offer = require('./domain/models/Offer');
 const sentry = require('../../../shared/sentry');
 const logger = require('@tryghost/logging');
 
@@ -93,7 +93,7 @@ class OfferBookshelfRepository {
      * @private
      * @param {import('bookshelf').Model<any>} model
      * @param {BaseOptions} options
-     * @returns {Promise<import('@tryghost/members-offers').Offer>}
+     * @returns {Promise<import('./domain/models/Offer')>}
      */
     async mapToOffer(model, options) {
         const json = model.toJSON();
@@ -140,7 +140,7 @@ class OfferBookshelfRepository {
     /**
      * @param {string} id
      * @param {BaseOptions} [options]
-     * @returns {Promise<import('@tryghost/members-offers').Offer>}
+     * @returns {Promise<import('./domain/models/Offer')>}
      */
     async getById(id, options) {
         const model = await this.OfferModel.findOne({id}, {
@@ -158,7 +158,7 @@ class OfferBookshelfRepository {
     /**
      * @param {string} id stripe_coupon_id
      * @param {BaseOptions} [options]
-     * @returns {Promise<import('@tryghost/members-offers').Offer>}
+     * @returns {Promise<import('./domain/models/Offer')>}
      */
     async getByStripeCouponId(id, options) {
         const model = await this.OfferModel.findOne({stripe_coupon_id: id}, {
@@ -175,7 +175,7 @@ class OfferBookshelfRepository {
 
     /**
      * @param {ListOptions} options
-     * @returns {Promise<import('@tryghost/members-offers').Offer[]>}
+     * @returns {Promise<import('./domain/models/Offer')[]>}
      */
     async getAll(options) {
         const models = await this.OfferModel.findAll({
@@ -194,7 +194,7 @@ class OfferBookshelfRepository {
     }
 
     /**
-     * @param {import('@tryghost/members-offers').Offer} offer
+     * @param {import('./domain/models/Offer')} offer
      * @param {BaseOptions} [options]
      * @returns {Promise<void>}
      */

ghost/offers/lib/OffersModule.js renamed to ghost/core/core/server/services/offers/OffersModule.js

@@ -1,10 +1,9 @@
-const OffersModule = require('@tryghost/members-offers');
-
 const DynamicRedirectManager = require('../lib/DynamicRedirectManager');
 const config = require('../../../shared/config');
 const urlUtils = require('../../../shared/url-utils');
 const models = require('../../models');
 const OfferBookshelfRepository = require('./OfferBookshelfRepository');
+const OffersModule = require('./OffersModule');
 
 let redirectManager;
 

ghost/offers/lib/application/OfferMapper.js renamed to ghost/core/core/server/services/offers/application/OfferMapper.js

@@ -100,7 +100,6 @@
     "@tryghost/limit-service": "1.2.15",
     "@tryghost/logging": "2.4.21",
     "@tryghost/members-csv": "0.0.0",
-    "@tryghost/members-offers": "0.0.0",
     "@tryghost/metrics": "1.0.37",
     "@tryghost/mw-error-handler": "0.0.0",
     "@tryghost/mw-vhost": "0.0.0",

ghost/offers/lib/application/OffersAPI.js renamed to ghost/core/core/server/services/offers/application/OffersAPI.js

@@ -1,6 +1,6 @@
 const sinon = require('sinon');
 const should = require('should');
-const UniqueChecker = require('../../../lib/application/UniqueChecker');
+const UniqueChecker = require('../../../../../../core/server/services/offers/application/UniqueChecker');
 
 describe('UniqueChecker', function () {
     describe('#isUniqueCode', function () {

ghost/offers/lib/application/UniqueChecker.js renamed to ghost/core/core/server/services/offers/application/UniqueChecker.js

@@ -1,9 +1,9 @@
 const should = require('should');
 const ObjectID = require('bson-objectid').default;
-const errors = require('../../../../lib/domain/errors');
-const Offer = require('../../../../lib/domain/models/Offer');
-const OfferName = require('../../../../lib/domain/models/OfferName');
-const OfferCode = require('../../../../lib/domain/models/OfferCode');
+const errors = require('../../../../../../../core/server/services/offers/domain/errors');
+const Offer = require('../../../../../../../core/server/services/offers/domain/models/Offer');
+const OfferName = require('../../../../../../../core/server/services/offers/domain/models/OfferName');
+const OfferCode = require('../../../../../../../core/server/services/offers/domain/models/OfferCode');
 
 function createUniqueChecker(dupe) {
     return {

ghost/offers/lib/domain/errors/index.js renamed to ghost/core/core/server/services/offers/domain/errors/index.js

@@ -1,4 +1,6 @@
-const {OfferPercentageAmount, OfferFixedAmount, OfferTrialAmount} = require('../../../../lib/domain/models/OfferAmount');
+const should = require('should');
+
+const {OfferPercentageAmount, OfferFixedAmount, OfferTrialAmount} = require('../../../../../../../core/server/services/offers/domain/models/OfferAmount');
 
 describe('OfferAmount', function () {
     describe('OfferPercentageAmount', function () {

ghost/offers/lib/domain/events/OfferCodeChangeEvent.js renamed to ghost/core/core/server/services/offers/domain/events/OfferCodeChangeEvent.js

@@ -1,4 +1,6 @@
-const OfferCadence = require('../../../../lib/domain/models/OfferCadence');
+const should = require('should');
+
+const OfferCadence = require('../../../../../../../core/server/services/offers/domain/models/OfferCadence');
 
 describe('OfferCadence', function () {
     describe('OfferCadence.create factory', function () {

ghost/offers/lib/domain/events/OfferCreatedEvent.js renamed to ghost/core/core/server/services/offers/domain/events/OfferCreatedEvent.js

@@ -1,4 +1,6 @@
-const OfferCode = require('../../../../lib/domain/models/OfferCode');
+const should = require('should');
+
+const OfferCode = require('../../../../../../../core/server/services/offers/domain/models/OfferCode');
 
 describe('OfferCode', function () {
     describe('OfferCode.create factory', function () {

ghost/offers/lib/domain/models/Offer.js renamed to ghost/core/core/server/services/offers/domain/models/Offer.js

@@ -1,4 +1,6 @@
-const OfferCurrency = require('../../../../lib/domain/models/OfferCurrency');
+const should = require('should');
+
+const OfferCurrency = require('../../../../../../../core/server/services/offers/domain/models/OfferCurrency');
 
 describe('OfferCurrency', function () {
     describe('OfferCurrency.create factory', function () {

ghost/offers/lib/domain/models/OfferAmount.js renamed to ghost/core/core/server/services/offers/domain/models/OfferAmount.js

@@ -1,4 +1,6 @@
-const OfferDescription = require('../../../../lib/domain/models/OfferDescription');
+const should = require('should');
+
+const OfferDescription = require('../../../../../../../core/server/services/offers/domain/models/OfferDescription');
 
 describe('OfferDescription', function () {
     describe('OfferDescription.create factory', function () {

ghost/offers/lib/domain/models/OfferCadence.js renamed to ghost/core/core/server/services/offers/domain/models/OfferCadence.js

@@ -1,4 +1,6 @@
-const OfferDuration = require('../../../../lib/domain/models/OfferDuration');
+const should = require('should');
+
+const OfferDuration = require('../../../../../../../core/server/services/offers/domain/models/OfferDuration');
 
 describe('OfferDuration', function () {
     describe('OfferDuration.create factory', function () {

ghost/offers/lib/domain/models/OfferCode.js renamed to ghost/core/core/server/services/offers/domain/models/OfferCode.js

@@ -1,4 +1,6 @@
-const OfferName = require('../../../../lib/domain/models/OfferName');
+const should = require('should');
+
+const OfferName = require('../../../../../../../core/server/services/offers/domain/models/OfferName');
 
 describe('OfferName', function () {
     describe('OfferName.create factory', function () {

ghost/offers/lib/domain/models/OfferCreatedAt.js renamed to ghost/core/core/server/services/offers/domain/models/OfferCreatedAt.js

@@ -1,4 +1,6 @@
-const OfferStatus = require('../../../../lib/domain/models/OfferStatus');
+const should = require('should');
+
+const OfferStatus = require('../../../../../../../core/server/services/offers/domain/models/OfferStatus');
 
 describe('OfferStatus', function () {
     describe('OfferStatus.create factory', function () {

ghost/offers/lib/domain/models/OfferCurrency.js renamed to ghost/core/core/server/services/offers/domain/models/OfferCurrency.js

@@ -1,4 +1,6 @@
-const OfferTitle = require('../../../../lib/domain/models/OfferTitle');
+const should = require('should');
+
+const OfferTitle = require('../../../../../../../core/server/services/offers/domain/models/OfferTitle');
 
 describe('OfferTitle', function () {
     describe('OfferTitle.create factory', function () {

ghost/offers/lib/domain/models/OfferDescription.js renamed to ghost/core/core/server/services/offers/domain/models/OfferDescription.js

@@ -1,4 +1,6 @@
-const OfferType = require('../../../../lib/domain/models/OfferType');
+const should = require('should');
+
+const OfferType = require('../../../../../../../core/server/services/offers/domain/models/OfferType');
 
 describe('OfferType', function () {
     describe('OfferType.create factory', function () {

ghost/offers/lib/domain/models/OfferDuration.js renamed to ghost/core/core/server/services/offers/domain/models/OfferDuration.js

@@ -7501,7 +7501,7 @@
     debug "^4.3.3"
     lodash "^4.17.21"
 
-"@tryghost/mongo-utils@0.6.2", "@tryghost/mongo-utils@^0.6.2":
+"@tryghost/mongo-utils@^0.6.2":
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/@tryghost/mongo-utils/-/mongo-utils-0.6.2.tgz#18af1e057aad6876cb7ff61f817df4e90d8055bf"
   integrity sha512-ewXYg2/EOYNc/ko5zwfvxskYfyLOVjMOPGgRLODJf3jLp9iXK9nfLHOrnAO4Jeh9CLzHm84aWUMaRIFH/XQULg==