done

Author: victorzheng02

src/commandDetails/company/add.ts

@@ -15,12 +15,13 @@ const companyAddExecuteCommand: SapphireMessageExecuteType = async (
 ): Promise<SapphireMessageResponse> => {
   const company_id = args['company_id'];
   if (!company_id) {
-    throw new Error('please enter a valid user mention or ID for balance adjustment.');
+    throw new Error('please enter a valid crunchbase company id.');
   }
   const role = args['role'];
   if (!role) {
-    throw new Error('please enter a role.');
+    throw new Error('please enter your role at this company.');
   }
+  console.log(role);
   const company = await getCompanyInfo(<string>company_id);
   if (!company) {
     await insertCompany(<string>company_id);

src/commandDetails/company/find.ts

@@ -1,36 +1,69 @@
-import { container } from '@sapphire/framework';
+import { SapphireClient, container } from '@sapphire/framework';
+import { MessageEmbed } from 'discord.js';
+import { DEFAULT_EMBED_COLOUR } from '../../utils/embeds';
 import {
   CodeyCommandDetails,
   CodeyCommandOptionType,
   SapphireMessageExecuteType,
   SapphireMessageResponse,
 } from '../../codeyCommand';
-import { getEmployeesByCompanyId } from '../../components/company';
+import {
+  CompanyPersonDetails,
+  CrunchbaseCompanyProperties,
+  getCompanyInfo,
+  getEmployeesByCompanyId,
+} from '../../components/company';
 
 const CRUNCHBASE_IMAGE_CDN =
   'https://res.cloudinary.com/crunchbase-production/image/upload/c_lpad,h_170,w_170,f_auto,b_white,q_auto:eco,dpr_1';
+
+const getCompanyFindEmbed = async (
+  client: SapphireClient<boolean>,
+  companyId: string,
+  companyInfo: CrunchbaseCompanyProperties,
+  companyUsers: CompanyPersonDetails[],
+) => {
+  const formattedUsers = await Promise.all(
+    companyUsers.map(async (user) => {
+      return {
+        ...user,
+        tag: (await client.users.fetch(user.user_id)).tag,
+      };
+    }),
+  );
+  const companyEmbed = new MessageEmbed()
+    .setColor(DEFAULT_EMBED_COLOUR)
+    .setTitle(companyInfo.name)
+    .setDescription(companyInfo.description);
+  companyEmbed.setThumbnail(`${CRUNCHBASE_IMAGE_CDN}/${companyInfo.image_id}`);
+  companyEmbed.addField(
+    'Previous Employees',
+    formattedUsers.map((user) => `${user.tag} - ${user.role}`).join(', '),
+  );
+
+  return companyEmbed;
+};
+
 const companyFindExecuteCommand: SapphireMessageExecuteType = async (
   client,
   _messageFromUser,
   args,
 ): Promise<SapphireMessageResponse> => {
   const company_id = args['company_id'];
   if (!company_id) {
-    throw new Error('please enter a valid user mention or ID for balance adjustment.');
+    throw new Error('Please enter a company id.');
+  }
+  const companyInfo = await getCompanyInfo(<string>company_id);
+  if (!companyInfo) {
+    throw new Error('This company does not exist in the server!');
   }
   const companyUsers = await getEmployeesByCompanyId(<string>company_id);
   if (!companyUsers) {
-    return 'No one works at this company in the server!';
+    throw new Error('No one works at this company in the server!');
   }
-  const formattedUsers = await Promise.all(
-    companyUsers.map(async (user) => {
-      return {
-        ...user,
-        tag: (await client.users.fetch(user.user_id)).tag,
-      };
-    }),
-  );
-  return `employees are: ${JSON.stringify(formattedUsers)}`;
+  return {
+    embeds: [await getCompanyFindEmbed(client, <string>company_id, companyInfo, companyUsers)],
+  };
 };
 
 export const companyFindCommandDetails: CodeyCommandDetails = {
@@ -40,7 +73,7 @@ export const companyFindCommandDetails: CodeyCommandDetails = {
   detailedDescription: `**Examples:**
     \`${container.botPrefix}company find https://www.crunchbase.com/organization/microsoft\`
     \`${container.botPrefix}company f microsoft\``,
-  messageWhenExecutingCommand: 'Enrolling company...',
+  messageWhenExecutingCommand: 'Finding company...',
   executeCommand: companyFindExecuteCommand,
 
   options: [

src/components/company.ts

@@ -2,14 +2,10 @@ import _ from 'lodash';
 import { openDB } from './db';
 import { getCrunchbaseCompanyDetails } from '../utils/companyInfo';
 
-interface CompanyInfo {
+export interface CrunchbaseCompanyProperties {
   company_id: string;
-  description: string;
-}
-
-interface CrunchbaseCompanyProperties {
   name: string;
-  short_description: string;
+  description: string;
   image_id: string;
 }
 
@@ -18,21 +14,22 @@ export const insertCompany = async (companyId: string): Promise<void> => {
   const { name, short_description } = crunchbaseCompanyResponse;
   const companyImageId = crunchbaseCompanyResponse.identifier?.image_id;
   const crunchbaseCompanyInfo = {
+    company_id: companyId,
     name,
-    short_description,
+    description: short_description,
     image_id: <string>companyImageId,
   };
-  await insertCompanyDetails(<string>companyId, crunchbaseCompanyInfo);
+  await insertCompanyDetails(crunchbaseCompanyInfo);
 };
 
 export const insertCompanyDetails = async (
-  companyId: string,
   crunchbaseCompanyInfo: CrunchbaseCompanyProperties,
 ): Promise<void> => {
   const db = await openDB();
-  const { name, image_id, short_description } = crunchbaseCompanyInfo;
-  const insertCompanyCommand = `INSERT INTO companies (company_id, name, image_id, description) VALUES (?,?,?)`;
-  await db.run(insertCompanyCommand, companyId, name, image_id, short_description);
+  const { name, image_id, description, company_id } = crunchbaseCompanyInfo;
+  console.log(crunchbaseCompanyInfo);
+  const insertCompanyCommand = `INSERT INTO companies (company_id, name, image_id, description) VALUES (?,?,?,?)`;
+  await db.run(insertCompanyCommand, company_id, name, image_id, description);
 };
 
 export const addUserToCompany = async (
@@ -45,17 +42,20 @@ export const addUserToCompany = async (
   await db.run(insertCompanyCommand, userId, companyId, role);
 };
 
-export const getCompanyInfo = async (companyId: string): Promise<CompanyInfo> => {
+export const getCompanyInfo = async (companyId: string): Promise<CrunchbaseCompanyProperties> => {
   const db = await openDB();
-  return (await db.get('SELECT * FROM companies WHERE company_id = ?', companyId)) as CompanyInfo;
+  return (await db.get(
+    'SELECT * FROM companies WHERE company_id = ?',
+    companyId,
+  )) as CrunchbaseCompanyProperties;
 };
 
 export const getCompaniesByUserId = async (userId: string): Promise<CompanyPersonDetails[]> => {
   const db = await openDB();
   return await db.all('SELECT * FROM companies_people WHERE user_id = ?', userId);
 };
 
-interface CompanyPersonDetails {
+export interface CompanyPersonDetails {
   user_id: string;
   role: string;
 }