Fix office occupancy stats to count confirmed visits only

paritytech · May 29, 2024 · 00745ba · 00745ba
1 parent 206d9dd
commit 00745ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/modules/visits/server/router.ts b/src/modules/visits/server/router.ts
@@ -733,6 +733,7 @@ const adminRouter: FastifyPluginCallback = async (fastify, opts) => {
 
  result.visitsTotal = await fastify.db.Visit.count({
  where: {
+ status: 'confirmed',
  officeId: office.id,
  date: {
  [Op.gte]: startDate,
@@ -742,6 +743,7 @@ const adminRouter: FastifyPluginCallback = async (fastify, opts) => {
  })
  result.visitsToday = await fastify.db.Visit.count({
  where: {
+ status: 'confirmed',
  officeId: office.id,
  date: {
  [Op.gte]: dayjs().startOf('day').toDate(),
@@ -752,6 +754,7 @@ const adminRouter: FastifyPluginCallback = async (fastify, opts) => {
 
  result.topVisitors = (await fastify.db.Visit.findAll({
  where: {
+ status: 'confirmed',
  officeId: office.id,
  date: {
  [Op.gte]: startDate,
@@ -783,6 +786,7 @@ const adminRouter: FastifyPluginCallback = async (fastify, opts) => {
 
  result.topDesks = (await fastify.db.Visit.findAll({
  where: {
+ status: 'confirmed',
  officeId: office.id,
  date: {
  [Op.gte]: startDate,
@@ -808,6 +812,7 @@ const adminRouter: FastifyPluginCallback = async (fastify, opts) => {
  // TODO: check if startdate and enddate contains a year
  result.annualVisits = (await fastify.db.Visit.findAll({
  where: {
+ status: 'confirmed',
  officeId: office.id,
  date: {
  [Op.gte]: startDate,
@@ -856,7 +861,10 @@ const adminRouter: FastifyPluginCallback = async (fastify, opts) => {
  FROM
  visits v
  WHERE
- v."officeId" = :officeId AND v."date" BETWEEN :startDate AND :endDate
+ 1=1 AND
+ v."status" = 'confirmed' AND
+ v."officeId" = :officeId AND
+ v."date" BETWEEN :startDate AND :endDate
  GROUP BY
  to_char(v."date", :dateFormat)
  ) AS daily_stats

diff --git a/src/server/app-config/index.ts b/src/server/app-config/index.ts
@@ -230,7 +230,7 @@ export class AppConfig {
  try {
  this.unsafeLoad()
  } catch (err) {
- if (err instanceof AppError) {
+ if (config.env !== 'production' && err instanceof AppError) {
  log.error(err)
  this.error = err
  } else {