Merge pull request #9 from sahrohit/develop

Develop

apps/admin/src/generated/graphql.ts

@@ -72,7 +72,20 @@ export type Cart = {
 export type CreateOrderInput = {
 	addressId: Scalars["Float"];
 	promoCode: Scalars["String"];
-	shippingMethod: Scalars["String"];
+	shippingId: Scalars["Float"];
+};
+
+export type CreatePaymentResponse = {
+	__typename?: "CreatePaymentResponse";
+	amt?: Maybe<Scalars["Int"]>;
+	paymentUrl?: Maybe<Scalars["String"]>;
+	pdc?: Maybe<Scalars["Int"]>;
+	pid?: Maybe<Scalars["String"]>;
+	provider: Scalars["String"];
+	psc?: Maybe<Scalars["Int"]>;
+	scd?: Maybe<Scalars["String"]>;
+	tAmt?: Maybe<Scalars["Int"]>;
+	txAmt?: Maybe<Scalars["Int"]>;
 };
 
 export type Discount = {
@@ -121,8 +134,8 @@ export type Mutation = {
 	addToFavourite: Favourite;
 	changePassword: UserResponse;
 	clearCart: Scalars["Boolean"];
-	createOrder: Scalars["String"];
-	createPayment: Scalars["String"];
+	createOrder: OrderDetail;
+	createPayment: CreatePaymentResponse;
 	deleteAddress: Scalars["Boolean"];
 	deleteCategory: Scalars["Boolean"];
 	deleteDiscount?: Maybe<Scalars["Boolean"]>;
@@ -187,6 +200,7 @@ export type MutationCreateOrderArgs = {
 
 export type MutationCreatePaymentArgs = {
 	orderId: Scalars["String"];
+	provider: Scalars["String"];
 };
 
 export type MutationDeleteAddressArgs = {
@@ -271,7 +285,8 @@ export type MutationUpdateReviewArgs = {
 
 export type MutationUpdateStatusArgs = {
 	orderId: Scalars["String"];
-	pidx: Scalars["String"];
+	pidx?: InputMaybe<Scalars["String"]>;
+	refId?: InputMaybe<Scalars["String"]>;
 };
 
 export type MutationVerifyEmailArgs = {
@@ -289,6 +304,8 @@ export type OrderDetail = {
 	paymentdetails?: Maybe<Array<PaymentDetail>>;
 	promo?: Maybe<Promo>;
 	promoId?: Maybe<Scalars["Int"]>;
+	shipping: ShippingMethod;
+	shippingId: Scalars["Int"];
 	status: Scalars["String"];
 	updated_at: Scalars["String"];
 	userId: Scalars["Int"];
@@ -456,6 +473,7 @@ export type Query = {
 	fetchCartItems?: Maybe<Array<Cart>>;
 	hello: Scalars["String"];
 	me?: Maybe<User>;
+	meWithAccount?: Maybe<User>;
 	orderById?: Maybe<OrderDetail>;
 	orders?: Maybe<Array<OrderDetail>>;
 	product?: Maybe<Product>;
@@ -468,6 +486,7 @@ export type Query = {
 	reviews?: Maybe<Array<ProductReview>>;
 	roles: Array<UserRole>;
 	searchProducts?: Maybe<Array<Product>>;
+	shippingmethods: Array<ShippingMethod>;
 	variants: Array<Variant>;
 };
 
@@ -524,6 +543,16 @@ export type ReviewSummaryResponse = {
 	rating?: Maybe<Scalars["Float"]>;
 };
 
+export type ShippingMethod = {
+	__typename?: "ShippingMethod";
+	created_at: Scalars["String"];
+	dispatch_in: Scalars["Int"];
+	id: Scalars["Int"];
+	name: Scalars["String"];
+	price: Scalars["Int"];
+	updated_at: Scalars["String"];
+};
+
 export type UpdateCategoryInput = {
 	desc?: InputMaybe<Scalars["String"]>;
 	identifier?: InputMaybe<Scalars["String"]>;

apps/api/package.json

@@ -56,6 +56,7 @@
 		"ioredis": "^4.28.5",
 		"joi": "^17.9.2",
 		"jsonwebtoken": "^9.0.2",
+		"nanoid": "3.3.4",
 		"nodemailer": "^6.9.4",
 		"pg": "^8.11.2",
 		"reflect-metadata": "^0.1.13",

apps/api/src/constants.ts

@@ -12,3 +12,4 @@ export const COMPANY = {
 	country: "Nepal",
 };
 export const GOOGLE_OAUTH_REDIRECT_URL = `${process.env.API_URL}/auth/google/callback`;
+export const ESEWA_MERCHANT_CODE = "EPAYTEST";

apps/api/src/data-source.ts

@@ -21,6 +21,8 @@ import { Promo } from "./entities/Promo";
 import { Favourite } from "./entities/Favourite";
 import { ProductReview } from "./entities/ProductReview";
 import { Account } from "./entities/Account";
+import { ShippingMethod } from "./entities/ShippingMethod";
+import { Tenant } from "./entities/Tenant";
 
 export const AppDataSource = new DataSource({
 	type: "postgres",
@@ -48,6 +50,8 @@ export const AppDataSource = new DataSource({
 		Favourite,
 		ProductReview,
 		Account,
+		ShippingMethod,
+		Tenant,
 	],
 	migrations: ["dist/migration/**/*.js"],
 	subscribers: [],

apps/api/src/entities/OrderDetail.ts

@@ -15,6 +15,7 @@ import { PaymentDetail } from "./PaymentDetail";
 import { User } from "./User";
 import { Promo } from "./Promo";
 import { Address } from "./Address";
+import { ShippingMethod } from "./ShippingMethod";
 
 export type OrderStatus =
 	| "PENDING"
@@ -51,6 +52,14 @@ export class OrderDetail extends BaseEntity {
 	@ManyToOne(() => Address, (address) => address.orderdetails)
 	address!: Address;
 
+	@Field(() => Int)
+	@Column()
+	shippingId!: number;
+
+	@Field(() => ShippingMethod)
+	@ManyToOne(() => ShippingMethod, (shipping) => shipping.orderdetails)
+	shipping!: ShippingMethod;
+
 	@Field(() => Int, { nullable: true })
 	@Column({ nullable: true })
 	promoId!: number;

apps/api/src/entities/ShippingMethod.ts

@@ -0,0 +1,42 @@
+import { Field, Int, ObjectType } from "type-graphql";
+import {
+	Entity,
+	PrimaryGeneratedColumn,
+	CreateDateColumn,
+	UpdateDateColumn,
+	BaseEntity,
+	Column,
+	OneToMany,
+} from "typeorm";
+import { OrderDetail } from "./OrderDetail";
+
+@ObjectType()
+@Entity()
+export class ShippingMethod extends BaseEntity {
+	@Field(() => Int)
+	@PrimaryGeneratedColumn()
+	id!: number;
+
+	@Field()
+	@Column()
+	name!: string;
+
+	@Field(() => Int)
+	@Column()
+	price!: number;
+
+	@Field(() => Int)
+	@Column()
+	dispatch_in!: number;
+
+	@OneToMany(() => OrderDetail, (orderdetails) => orderdetails.address)
+	orderdetails!: OrderDetail[];
+
+	@Field(() => String)
+	@CreateDateColumn()
+	created_at = new Date();
+
+	@Field(() => String)
+	@UpdateDateColumn()
+	updated_at = new Date();
+}

apps/api/src/entities/Tenant.ts

@@ -0,0 +1,71 @@
+import { Field, Int, ObjectType } from "type-graphql";
+import {
+	Entity,
+	PrimaryGeneratedColumn,
+	Column,
+	CreateDateColumn,
+	UpdateDateColumn,
+	BaseEntity,
+	ManyToOne,
+} from "typeorm";
+import { User } from "./User";
+
+@ObjectType()
+@Entity()
+export class Tenant extends BaseEntity {
+	@Field(() => Int)
+	@PrimaryGeneratedColumn()
+	id!: number;
+
+	@Field()
+	@Column()
+	name!: string;
+
+	@Field()
+	@Column()
+	desc!: string;
+
+	@Field()
+	@Column({
+		nullable: true,
+		default:
+			"https://tailwindcss.com/_next/static/media/tailwindcss-mark.3c5441fc7a190fb1800d4a5c7f07ba4b1345a9c8.svg",
+	})
+	logo?: string;
+
+	@Field()
+	@Column({
+		nullable: true,
+		default: "Popins",
+	})
+	font?: string;
+
+	@Field()
+	@Column()
+	subdomain!: string;
+
+	@Field()
+	@Column({ nullable: true })
+	customDomain?: string;
+
+	@Field()
+	@Column({
+		default: false,
+	})
+	defaultForPreview!: boolean;
+
+	@Field()
+	@Column()
+	userId!: number;
+
+	@ManyToOne(() => User, (user) => user.addresses)
+	user!: User;
+
+	@Field(() => String)
+	@CreateDateColumn()
+	created_at = new Date();
+
+	@Field(() => String)
+	@UpdateDateColumn()
+	updated_at = new Date();
+}

apps/api/src/entities/User.ts

@@ -16,6 +16,7 @@ import { UserPayment } from "./UserPayment";
 import { UserRole } from "./UserRole";
 import { ProductReview } from "./ProductReview";
 import { Account } from "./Account";
+import { Tenant } from "./Tenant";
 
 @ObjectType()
 @Entity()
@@ -71,6 +72,9 @@ export class User extends BaseEntity {
 	@OneToMany(() => Address, (address) => address.user)
 	addresses!: Address[];
 
+	@OneToMany(() => Tenant, (tenant) => tenant.user)
+	tenants!: Tenant[];
+
 	@OneToMany(() => OrderDetail, (orderdetails) => orderdetails.user)
 	orderdetails!: OrderDetail[];
 

apps/api/src/index.ts

@@ -29,6 +29,8 @@ import Redis from "ioredis";
 import { Product } from "./entities/Product";
 import { InvoiceResolver } from "./resolvers/invoice";
 import authRouter from "./routers/auth";
+import tenantRouter from "./routers/tenant";
+import { ShippingMethodResolver } from "./resolvers/shipping";
 
 const Server = async () => {
 	AppDataSource.initialize()
@@ -81,6 +83,7 @@ const Server = async () => {
 	});
 
 	app.use("/auth", authRouter);
+	app.use("/tenant", tenantRouter);
 
 	app.get("/products", async (_req, res) => {
 		res.json(
@@ -123,6 +126,7 @@ const Server = async () => {
 				FavouriteResolver,
 				ReviewResolver,
 				InvoiceResolver,
+				ShippingMethodResolver,
 			],
 			validate: false,
 		}),

apps/api/src/resolvers/GqlObjets/OrderInput.ts

@@ -1,4 +1,4 @@
-import { InputType, Field, ObjectType } from "type-graphql";
+import { InputType, Field, ObjectType, Int } from "type-graphql";
 
 @InputType()
 export class CreateOrderInput {
@@ -9,7 +9,7 @@ export class CreateOrderInput {
 	addressId!: number;
 
 	@Field()
-	shippingMethod!: string;
+	shippingId!: number;
 }
 
 @ObjectType()
@@ -26,3 +26,33 @@ export class CreateOrderResponse {
 	@Field()
 	provider!: string;
 }
+
+@ObjectType()
+export class CreatePaymentResponse {
+	@Field()
+	provider!: string;
+
+	@Field(() => Int, { nullable: true })
+	amt?: number;
+
+	@Field(() => Int, { nullable: true })
+	psc?: number;
+
+	@Field(() => Int, { nullable: true })
+	pdc?: number;
+
+	@Field(() => Int, { nullable: true })
+	txAmt?: number;
+
+	@Field(() => Int, { nullable: true })
+	tAmt?: number;
+
+	@Field(() => String, { nullable: true })
+	pid?: string;
+
+	@Field(() => String, { nullable: true })
+	scd?: string;
+
+	@Field(() => String, { nullable: true })
+	paymentUrl?: string;
+}